Merge branch 'main' into main

Author: zijiehe-google-com

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': '18e4408592757a6e70355ecd6cec7dc68f97d670',
+  'skia_revision': 'f3b9e80d262aa6724bcdbe15dde3650f284f35dd',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

shell/platform/android/android_shell_holder_unittests.cc

@@ -35,10 +35,6 @@ class MockPlatformViewAndroidJNI : public PlatformViewAndroidJNI {
               SurfaceTextureAttachToGLContext,
               (JavaLocalRef surface_texture, int textureId),
               (override));
-  MOCK_METHOD(bool,
-              SurfaceTextureShouldUpdate,
-              (JavaLocalRef surface_texture),
-              (override));
   MOCK_METHOD(void,
               SurfaceTextureUpdateTexImage,
               (JavaLocalRef surface_texture),

shell/platform/android/image_external_texture.cc

@@ -26,9 +26,11 @@ void ImageExternalTexture::Paint(PaintContext& context,
     return;
   }
   Attach(context);
-  const bool should_process_frame = !freeze;
+  const bool should_process_frame =
+      (!freeze && new_frame_ready_) || dl_image_ == nullptr;
   if (should_process_frame) {
     ProcessFrame(context, bounds);
+    new_frame_ready_ = false;
   }
   if (dl_image_) {
     context.canvas->DrawImageRect(
@@ -46,7 +48,7 @@ void ImageExternalTexture::Paint(PaintContext& context,
 
 // Implementing flutter::Texture.
 void ImageExternalTexture::MarkNewFrameAvailable() {
-  // NOOP.
+  new_frame_ready_ = true;
 }
 
 // Implementing flutter::Texture.

shell/platform/android/image_external_texture.h

@@ -61,6 +61,7 @@ class ImageExternalTexture : public flutter::Texture {
 
   enum class AttachmentState { kUninitialized, kAttached, kDetached };
   AttachmentState state_ = AttachmentState::kUninitialized;
+  bool new_frame_ready_ = false;
 
   sk_sp<flutter::DlImage> dl_image_;
 

shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java

@@ -951,16 +951,6 @@ public void markTextureFrameAvailable(long textureId) {
 
   private native void nativeMarkTextureFrameAvailable(long nativeShellHolderId, long textureId);
 
-  /** Schedule the engine to draw a frame but does not invalidate the layout tree. */
-  @UiThread
-  public void scheduleFrame() {
-    ensureRunningOnMainThread();
-    ensureAttachedToNative();
-    nativeScheduleFrame(nativeShellHolderId);
-  }
-
-  private native void nativeScheduleFrame(long nativeShellHolderId);
-
   /**
    * Unregisters a texture that was registered with {@link #registerTexture(long,
    * SurfaceTextureWrapper)}.