Composite Embedded Views with the correct GrContext

Qxyat · iskakaushik · commit 28a46d51a072 · 2019-04-16T14:13:34.000-07:00
PaintRecorder Canvases are not associated with GrContexts.
diff --git a/flow/layers/layer.h b/flow/layers/layer.h
@@ -80,6 +80,7 @@ class Layer {
     // layers.
     SkCanvas* internal_nodes_canvas;
     SkCanvas* leaf_nodes_canvas;
+    GrContext* gr_context;
     ExternalViewEmbedder* view_embedder;
     const Stopwatch& frame_time;
     const Stopwatch& engine_time;
diff --git a/flow/layers/layer_tree.cc b/flow/layers/layer_tree.cc
@@ -81,6 +81,7 @@ void LayerTree::Paint(CompositorContext::ScopedFrame& frame,
   Layer::PaintContext context = {
       (SkCanvas*)&internal_nodes_canvas,
       frame.canvas(),
+      frame.gr_context(),
       frame.view_embedder(),
       frame.context().frame_time(),
       frame.context().engine_time(),
@@ -128,6 +129,7 @@ sk_sp<SkPicture> LayerTree::Flatten(const SkRect& bounds) {
       (SkCanvas*)&internal_nodes_canvas,
       canvas,  // canvas
       nullptr,
+      nullptr,
       unused_stopwatch,         // frame time (dont care)
       unused_stopwatch,         // engine time (dont care)
       unused_texture_registry,  // texture registry (not supported)
diff --git a/flow/layers/performance_overlay_layer_unittests.cc b/flow/layers/performance_overlay_layer_unittests.cc
@@ -48,7 +48,7 @@ TEST(PerformanceOverlayLayer, Gold) {
   flow::TextureRegistry unused_texture_registry;
 
   flow::Layer::PaintContext paintContext = {
-      nullptr,        surface->getCanvas(),    nullptr, mock_stopwatch,
+      nullptr,        surface->getCanvas(),    nullptr, nullptr, mock_stopwatch,
       mock_stopwatch, unused_texture_registry, nullptr, false};
 
   // Specify font file to ensure the same font across different operation
diff --git a/flow/layers/texture_layer.cc b/flow/layers/texture_layer.cc
@@ -23,7 +23,8 @@ void TextureLayer::Paint(PaintContext& context) const {
   if (!texture) {
     return;
   }
-  texture->Paint(*context.leaf_nodes_canvas, paint_bounds(), freeze_);
+  texture->Paint(*context.leaf_nodes_canvas, paint_bounds(), freeze_,
+                 context.gr_context);
 }
 
 }  // namespace flow
diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
@@ -166,6 +166,7 @@ void RasterCache::Prepare(PrerollContext* context,
                               Layer::PaintContext paintContext = {
                                   (SkCanvas*)&internal_nodes_canvas,
                                   canvas,
+                                  context->gr_context,
                                   nullptr,
                                   context->frame_time,
                                   context->engine_time,
diff --git a/flow/texture.h b/flow/texture.h
@@ -22,7 +22,10 @@ class Texture {
   virtual ~Texture();
 
   // Called from GPU thread.
-  virtual void Paint(SkCanvas& canvas, const SkRect& bounds, bool freeze) = 0;
+  virtual void Paint(SkCanvas& canvas,
+                     const SkRect& bounds,
+                     bool freeze,
+                     GrContext* context) = 0;
 
   // Called from GPU thread.
   virtual void OnGrContextCreated() = 0;
diff --git a/shell/platform/android/android_external_texture_gl.cc b/shell/platform/android/android_external_texture_gl.cc
@@ -32,7 +32,8 @@ void AndroidExternalTextureGL::MarkNewFrameAvailable() {
 
 void AndroidExternalTextureGL::Paint(SkCanvas& canvas,
                                      const SkRect& bounds,
-                                     bool freeze) {
+                                     bool freeze,
+                                     GrContext* context) {
   if (state_ == AttachmentState::detached) {
     return;
   }
diff --git a/shell/platform/android/android_external_texture_gl.h b/shell/platform/android/android_external_texture_gl.h
@@ -19,7 +19,10 @@ class AndroidExternalTextureGL : public flow::Texture {
 
   ~AndroidExternalTextureGL() override;
 
-  void Paint(SkCanvas& canvas, const SkRect& bounds, bool freeze) override;
+  void Paint(SkCanvas& canvas,
+             const SkRect& bounds,
+             bool freeze,
+             GrContext* context) override;
 
   void OnGrContextCreated() override;
 
diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.h b/shell/platform/darwin/ios/ios_external_texture_gl.h
@@ -18,7 +18,7 @@ class IOSExternalTextureGL : public flow::Texture {
   ~IOSExternalTextureGL() override;
 
   // Called from GPU thread.
-  void Paint(SkCanvas& canvas, const SkRect& bounds, bool freeze) override;
+  void Paint(SkCanvas& canvas, const SkRect& bounds, bool freeze, GrContext* context) override;
 
   void OnGrContextCreated() override;
 
diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.mm b/shell/platform/darwin/ios/ios_external_texture_gl.mm
@@ -22,7 +22,10 @@
 
 IOSExternalTextureGL::~IOSExternalTextureGL() = default;
 
-void IOSExternalTextureGL::Paint(SkCanvas& canvas, const SkRect& bounds, bool freeze) {
+void IOSExternalTextureGL::Paint(SkCanvas& canvas,
+                                 const SkRect& bounds,
+                                 bool freeze,
+                                 GrContext* context) {
   if (!cache_ref_) {
     CVOpenGLESTextureCacheRef cache;
     CVReturn err = CVOpenGLESTextureCacheCreate(kCFAllocatorDefault, NULL,
@@ -58,8 +61,9 @@
                                  CVOpenGLESTextureGetName(texture_ref_), GL_RGBA8_OES};
   GrBackendTexture backendTexture(bounds.width(), bounds.height(), GrMipMapped::kNo, textureInfo);
   sk_sp<SkImage> image =
-      SkImage::MakeFromTexture(canvas.getGrContext(), backendTexture, kTopLeft_GrSurfaceOrigin,
+      SkImage::MakeFromTexture(context, backendTexture, kTopLeft_GrSurfaceOrigin,
                                kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr);
+  FML_DCHECK(image) << "Failed to create SkImage from Texture.";
   if (image) {
     canvas.drawImage(image, bounds.x(), bounds.y());
   }
diff --git a/shell/platform/embedder/embedder_external_texture_gl.cc b/shell/platform/embedder/embedder_external_texture_gl.cc
@@ -20,7 +20,8 @@ EmbedderExternalTextureGL::~EmbedderExternalTextureGL() = default;
 // |flow::Texture|
 void EmbedderExternalTextureGL::Paint(SkCanvas& canvas,
                                       const SkRect& bounds,
-                                      bool freeze) {
+                                      bool freeze,
+                                      GrContext* context) {
   if (auto image = external_texture_callback_(
           Id(),                                           //
           canvas.getGrContext(),                          //
diff --git a/shell/platform/embedder/embedder_external_texture_gl.h b/shell/platform/embedder/embedder_external_texture_gl.h
@@ -27,7 +27,10 @@ class EmbedderExternalTextureGL : public flow::Texture {
   sk_sp<SkImage> last_image_;
 
   // |flow::Texture|
-  void Paint(SkCanvas& canvas, const SkRect& bounds, bool freeze) override;
+  void Paint(SkCanvas& canvas,
+             const SkRect& bounds,
+             bool freeze,
+             GrContext* context) override;
 
   // |flow::Texture|
   void OnGrContextCreated() override;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ void TextureLayer::Paint(PaintContext& context) const {`
`23`	`23`	`if (!texture) {`
`24`	`24`	`return;`
`25`	`25`	`}`
`26`		`- texture->Paint(*context.leaf_nodes_canvas, paint_bounds(), freeze_);`
	`26`	`+ texture->Paint(*context.leaf_nodes_canvas, paint_bounds(), freeze_,`
	`27`	`+ context.gr_context);`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`} // namespace flow`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ void AndroidExternalTextureGL::MarkNewFrameAvailable() {`
`32`	`32`
`33`	`33`	`void AndroidExternalTextureGL::Paint(SkCanvas& canvas,`
`34`	`34`	`const SkRect& bounds,`
`35`		`- bool freeze) {`
	`35`	`+ bool freeze,`
	`36`	`+ GrContext* context) {`
`36`	`37`	`if (state_ == AttachmentState::detached) {`
`37`	`38`	`return;`
`38`	`39`	`}`