Clean up

Adlai-Holler · Adlai-Holler · commit ba0e3f05faa1 · 2020-07-24T10:41:11.000-04:00
diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.mm b/shell/platform/darwin/ios/ios_external_texture_gl.mm
@@ -11,6 +11,7 @@
 #include "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
 
diff --git a/shell/platform/embedder/embedder_external_texture_gl.cc b/shell/platform/embedder/embedder_external_texture_gl.cc
@@ -25,7 +25,7 @@ void EmbedderExternalTextureGL::Paint(SkCanvas& canvas,
                                       SkFilterQuality filter_quality) {
   if (auto image = external_texture_callback_(
           Id(),                                           //
-          canvas.getGrContext(),                          //
+          context,                                        //
           SkISize::Make(bounds.width(), bounds.height())  //
           )) {
     last_image_ = image;
diff --git a/testing/test_gl_surface.cc b/testing/test_gl_surface.cc
@@ -253,9 +253,7 @@ sk_sp<GrDirectContext> TestGLSurface::GetGrContext() {
     return context_;
   }
 
-  context_ = CreateGrContext();
-
-  return context_;
+  return CreateGrContext();
 }
 
 sk_sp<GrDirectContext> TestGLSurface::CreateGrContext() {

Original file line number	Diff line number	Diff line change
`@@ -253,9 +253,7 @@ sk_sp<GrDirectContext> TestGLSurface::GetGrContext() {`
`253`	`253`	`return context_;`
`254`	`254`	`}`
`255`	`255`
`256`		`- context_ = CreateGrContext();`
`257`		`-`
`258`		`- return context_;`
	`256`	`+ return CreateGrContext();`
`259`	`257`	`}`
`260`	`258`
`261`	`259`	`sk_sp<GrDirectContext> TestGLSurface::CreateGrContext() {`