diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.h b/shell/platform/darwin/ios/ios_external_texture_gl.h index 09220a3d3564b..b7ad8b4daefd5 100644 --- a/shell/platform/darwin/ios/ios_external_texture_gl.h +++ b/shell/platform/darwin/ios/ios_external_texture_gl.h @@ -60,9 +60,9 @@ class IOSExternalTextureGL final : public Texture { void CreateRGBATextureFromPixelBuffer(); - sk_sp CreateImageFromYUVTextures(GrContext* context, const SkRect& bounds); + sk_sp CreateImageFromYUVTextures(GrDirectContext* context, const SkRect& bounds); - sk_sp CreateImageFromRGBATexture(GrContext* context, const SkRect& bounds); + sk_sp CreateImageFromRGBATexture(GrDirectContext* context, const SkRect& bounds); FML_DISALLOW_COPY_AND_ASSIGN(IOSExternalTextureGL); }; diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.mm b/shell/platform/darwin/ios/ios_external_texture_gl.mm index 688e3072ed130..1429add5f283e 100644 --- a/shell/platform/darwin/ios/ios_external_texture_gl.mm +++ b/shell/platform/darwin/ios/ios_external_texture_gl.mm @@ -95,7 +95,7 @@ } } -sk_sp IOSExternalTextureGL::CreateImageFromRGBATexture(GrContext* context, +sk_sp IOSExternalTextureGL::CreateImageFromRGBATexture(GrDirectContext* context, const SkRect& bounds) { GrGLTextureInfo textureInfo = {CVOpenGLESTextureGetTarget(texture_ref_), CVOpenGLESTextureGetName(texture_ref_), GL_RGBA8_OES}; @@ -106,7 +106,7 @@ return image; } -sk_sp IOSExternalTextureGL::CreateImageFromYUVTextures(GrContext* context, +sk_sp IOSExternalTextureGL::CreateImageFromYUVTextures(GrDirectContext* context, const SkRect& bounds) { GrGLTextureInfo yTextureInfo = {CVOpenGLESTextureGetTarget(y_texture_ref_), CVOpenGLESTextureGetName(y_texture_ref_), GR_GL_LUMINANCE8}; diff --git a/shell/platform/fuchsia/flutter/compositor_context.cc b/shell/platform/fuchsia/flutter/compositor_context.cc index 599ebf77b0dd2..005a9cca0705b 100644 --- a/shell/platform/fuchsia/flutter/compositor_context.cc +++ b/shell/platform/fuchsia/flutter/compositor_context.cc @@ -14,7 +14,7 @@ namespace flutter_runner { class ScopedFrame final : public flutter::CompositorContext::ScopedFrame { public: ScopedFrame(CompositorContext& context, - GrContext* gr_context, + GrDirectContext* gr_context, SkCanvas* canvas, flutter::ExternalViewEmbedder* view_embedder, const SkMatrix& root_surface_transformation, diff --git a/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc b/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc index 36eeadd85afa3..ed69ce441eac5 100644 --- a/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc +++ b/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc @@ -160,7 +160,7 @@ void VulkanSurfaceProducer::OnSurfacesPresented( // Do a single flush for all canvases derived from the context. { - TRACE_EVENT0("flutter", "GrContext::flushAndSignalSemaphores"); + TRACE_EVENT0("flutter", "GrDirectContext::flushAndSignalSemaphores"); context_->flushAndSubmit(); }