Move common graphics utils to //flutter/shell/common/graphics

This change creates a new source set //flutter/shell/common/graphics
with minimal dependencies.

The intention with this target is to be later consumed in a
darwin common graphics target across the desktop boundary.

Also unifies some of the graphics utilities under the same folder.

Author: iskakaushik

ci/licenses_golden/licenses_flutter

@@ -33,8 +33,6 @@ FILE: ../../../flutter/flow/embedded_views.h
 FILE: ../../../flutter/flow/flow_run_all_unittests.cc
 FILE: ../../../flutter/flow/flow_test_utils.cc
 FILE: ../../../flutter/flow/flow_test_utils.h
-FILE: ../../../flutter/flow/gl_context_switch.cc
-FILE: ../../../flutter/flow/gl_context_switch.h
 FILE: ../../../flutter/flow/gl_context_switch_unittests.cc
 FILE: ../../../flutter/flow/instrumentation.cc
 FILE: ../../../flutter/flow/instrumentation.h
@@ -115,8 +113,6 @@ FILE: ../../../flutter/flow/surface.cc
 FILE: ../../../flutter/flow/surface.h
 FILE: ../../../flutter/flow/surface_frame.cc
 FILE: ../../../flutter/flow/surface_frame.h
-FILE: ../../../flutter/flow/texture.cc
-FILE: ../../../flutter/flow/texture.h
 FILE: ../../../flutter/flow/texture_unittests.cc
 FILE: ../../../flutter/flow/view_holder.cc
 FILE: ../../../flutter/flow/view_holder.h
@@ -619,9 +615,13 @@ FILE: ../../../flutter/shell/common/engine.h
 FILE: ../../../flutter/shell/common/engine_unittests.cc
 FILE: ../../../flutter/shell/common/fixtures/shell_test.dart
 FILE: ../../../flutter/shell/common/fixtures/shelltest_screenshot.png
+FILE: ../../../flutter/shell/common/graphics/gl_context_switch.cc
+FILE: ../../../flutter/shell/common/graphics/gl_context_switch.h
+FILE: ../../../flutter/shell/common/graphics/persistent_cache.cc
+FILE: ../../../flutter/shell/common/graphics/persistent_cache.h
+FILE: ../../../flutter/shell/common/graphics/texture.cc
+FILE: ../../../flutter/shell/common/graphics/texture.h
 FILE: ../../../flutter/shell/common/input_events_unittests.cc
-FILE: ../../../flutter/shell/common/persistent_cache.cc
-FILE: ../../../flutter/shell/common/persistent_cache.h
 FILE: ../../../flutter/shell/common/persistent_cache_unittests.cc
 FILE: ../../../flutter/shell/common/pipeline.cc
 FILE: ../../../flutter/shell/common/pipeline.h

flow/BUILD.gn

@@ -12,8 +12,6 @@ source_set("flow") {
     "compositor_context.h",
     "embedded_views.cc",
     "embedded_views.h",
-    "gl_context_switch.cc",
-    "gl_context_switch.h",
     "instrumentation.cc",
     "instrumentation.h",
     "layers/backdrop_filter_layer.cc",
@@ -66,15 +64,14 @@ source_set("flow") {
     "surface.h",
     "surface_frame.cc",
     "surface_frame.h",
-    "texture.cc",
-    "texture.h",
   ]
 
   public_configs = [ "//flutter:config" ]
 
   deps = [
     "//flutter/common",
     "//flutter/fml",
+    "//flutter/shell/common/graphics",
     "//third_party/skia",
   ]
 
@@ -124,7 +121,10 @@ if (enable_unittests) {
       "//third_party/googletest:gtest",
     ]
 
-    deps = [ ":flow" ]
+    deps = [
+      ":flow",
+      "//flutter/shell/common/graphics",
+    ]
   }
 
   executable("flow_unittests") {
@@ -168,6 +168,7 @@ if (enable_unittests) {
       ":flow_fixtures",
       ":flow_testing",
       "//flutter/fml",
+      "//flutter/shell/common/graphics",
       "//flutter/testing:skia",
       "//flutter/testing:testing_lib",
       "//third_party/dart/runtime:libdart_jit",  # for tracing

flow/compositor_context.h

@@ -11,9 +11,9 @@
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/instrumentation.h"
 #include "flutter/flow/raster_cache.h"
-#include "flutter/flow/texture.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/raster_thread_merger.h"
+#include "flutter/shell/common/graphics/texture.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 

flow/gl_context_switch_unittests.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 #define FML_USED_ON_EMBEDDER
 
-#include "flutter/flow/gl_context_switch.h"
+#include "flutter/shell/common/graphics/gl_context_switch.h"
 
 #include <functional>
 #include <future>

flow/layers/layer.h

@@ -11,12 +11,12 @@
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/instrumentation.h"
 #include "flutter/flow/raster_cache.h"
-#include "flutter/flow/texture.h"
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/trace_event.h"
+#include "flutter/shell/common/graphics/texture.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkColorFilter.h"

flow/layers/texture_layer.cc

@@ -4,7 +4,7 @@
 
 #include "flutter/flow/layers/texture_layer.h"
 
-#include "flutter/flow/texture.h"
+#include "flutter/shell/common/graphics/texture.h"
 
 namespace flutter {
 

flow/surface.h

@@ -8,9 +8,9 @@
 #include <memory>
 
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/gl_context_switch.h"
 #include "flutter/flow/surface_frame.h"
 #include "flutter/fml/macros.h"
+#include "flutter/shell/common/graphics/gl_context_switch.h"
 
 namespace flutter {
 

flow/surface_frame.h

@@ -7,8 +7,8 @@
 
 #include <memory>
 
-#include "flutter/flow/gl_context_switch.h"
 #include "flutter/fml/macros.h"
+#include "flutter/shell/common/graphics/gl_context_switch.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 

flow/testing/gl_context_switch_test.h

@@ -5,7 +5,7 @@
 #ifndef FLUTTER_SHELL_RENDERER_CONTEXT_TEST_H_
 #define FLUTTER_SHELL_RENDERER_CONTEXT_TEST_H_
 
-#include "flutter/flow/gl_context_switch.h"
+#include "flutter/shell/common/graphics/gl_context_switch.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

flow/testing/mock_texture.h

@@ -5,7 +5,7 @@
 #include <ostream>
 #include <vector>
 
-#include "flutter/flow/texture.h"
+#include "flutter/shell/common/graphics/texture.h"
 #include "flutter/testing/assertions_skia.h"
 
 namespace flutter {