gpu: Move skia_utils to raster_sources in gpu/command_buffer/common.

R=piman@chromium.org

Bug: 844207
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I5b324498db07afdb342d555982781f922a3e3b94
Reviewed-on: https://chromium-review.googlesource.com/1101458Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Khushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567499}

cc/test/test_in_process_context_provider.cc

@@ -148,8 +148,8 @@ class GrContext* TestInProcessContextProvider::GrContext() {
 
   size_t max_resource_cache_bytes;
   size_t max_glyph_cache_texture_bytes;
-  gpu::DefaultGrCacheLimitsForTests(&max_resource_cache_bytes,
-                                    &max_glyph_cache_texture_bytes);
+  gpu::raster::DefaultGrCacheLimitsForTests(&max_resource_cache_bytes,
+                                            &max_glyph_cache_texture_bytes);
   gr_context_.reset(new skia_bindings::GrContextForGLES2Interface(
       ContextGL(), ContextSupport(), ContextCapabilities(),
       max_resource_cache_bytes, max_glyph_cache_texture_bytes));

components/viz/service/display_embedder/viz_process_context_provider.cc

@@ -102,7 +102,7 @@ class GrContext* VizProcessContextProvider::GrContext() {
 
   size_t max_resource_cache_bytes;
   size_t max_glyph_cache_texture_bytes;
-  gpu::DetermineGrCacheLimitsFromAvailableMemory(
+  gpu::raster::DetermineGrCacheLimitsFromAvailableMemory(
       &max_resource_cache_bytes, &max_glyph_cache_texture_bytes);
 
   gr_context_.reset(new skia_bindings::GrContextForGLES2Interface(

components/viz/test/test_context_provider.cc

@@ -257,8 +257,8 @@ class GrContext* TestContextProvider::GrContext() {
 
   size_t max_resource_cache_bytes;
   size_t max_glyph_cache_texture_bytes;
-  gpu::DefaultGrCacheLimitsForTests(&max_resource_cache_bytes,
-                                    &max_glyph_cache_texture_bytes);
+  gpu::raster::DefaultGrCacheLimitsForTests(&max_resource_cache_bytes,
+                                            &max_glyph_cache_texture_bytes);
   gr_context_ = std::make_unique<skia_bindings::GrContextForGLES2Interface>(
       context_gl_.get(), support_.get(), context_gl_->test_capabilities(),
       max_resource_cache_bytes, max_glyph_cache_texture_bytes);

gpu/command_buffer/common/BUILD.gn

@@ -79,8 +79,6 @@ source_set("common_sources") {
     "mailbox_holder.h",
     "scheduling_priority.cc",
     "scheduling_priority.h",
-    "skia_utils.cc",
-    "skia_utils.h",
     "swap_buffers_complete_params.cc",
     "swap_buffers_complete_params.h",
     "swap_buffers_flags.h",
@@ -139,6 +137,8 @@ source_set("raster_sources") {
     "raster_cmd_format_autogen.h",
     "raster_cmd_ids.h",
     "raster_cmd_ids_autogen.h",
+    "skia_utils.cc",
+    "skia_utils.h",
   ]
 
   configs += [ "//gpu:raster_implementation" ]

gpu/command_buffer/common/skia_utils.cc

@@ -8,6 +8,7 @@
 #include "build/build_config.h"
 
 namespace gpu {
+namespace raster {
 
 void DetermineGrCacheLimitsFromAvailableMemory(
     size_t* max_resource_cache_bytes,
@@ -49,4 +50,5 @@ void DefaultGrCacheLimitsForTests(size_t* max_resource_cache_bytes,
   *max_glyph_cache_texture_bytes = kDefaultGlyphCacheTextureBytes;
 }
 
+}  // namespace raster
 }  // namespace gpu

gpu/command_buffer/common/skia_utils.h

@@ -6,18 +6,20 @@
 #define GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_
 
 #include <memory>
-#include "gpu/gpu_export.h"
+#include "gpu/raster_export.h"
 
 namespace gpu {
+namespace raster {
 
-GPU_EXPORT void DetermineGrCacheLimitsFromAvailableMemory(
+RASTER_EXPORT void DetermineGrCacheLimitsFromAvailableMemory(
     size_t* max_resource_cache_bytes,
     size_t* max_glyph_cache_texture_bytes);
 
-GPU_EXPORT void DefaultGrCacheLimitsForTests(
+RASTER_EXPORT void DefaultGrCacheLimitsForTests(
     size_t* max_resource_cache_bytes,
     size_t* max_glyph_cache_texture_bytes);
 
+}  // namespace raster
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_

gpu/command_buffer/service/BUILD.gn

@@ -224,6 +224,7 @@ target(link_target_type, "gles2_sources") {
   configs += [
     "//build/config:precompiled_headers",
     "//gpu:gpu_gles2_implementation",
+    "//gpu:raster_implementation",
     "//third_party/khronos:khronos_headers",
   ]
 

services/ui/public/cpp/gpu/BUILD.gn

@@ -46,6 +46,7 @@ source_set("internal") {
     "//gpu/command_buffer/client:gles2_cmd_helper",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:raster",
+    "//gpu/command_buffer/common:raster",
     "//gpu/skia_bindings",
     "//mojo/public/cpp/system",
     "//services/service_manager/public/cpp",

services/ui/public/cpp/gpu/context_provider_command_buffer.cc

@@ -439,7 +439,7 @@ class GrContext* ContextProviderCommandBuffer::GrContext() {
 
   size_t max_resource_cache_bytes;
   size_t max_glyph_cache_texture_bytes;
-  gpu::DetermineGrCacheLimitsFromAvailableMemory(
+  gpu::raster::DetermineGrCacheLimitsFromAvailableMemory(
       &max_resource_cache_bytes, &max_glyph_cache_texture_bytes);
 
   gpu::gles2::GLES2Interface* gl_interface;

ui/compositor/test/in_process_context_provider.cc

@@ -159,8 +159,8 @@ class GrContext* InProcessContextProvider::GrContext() {
 
   size_t max_resource_cache_bytes;
   size_t max_glyph_cache_texture_bytes;
-  gpu::DefaultGrCacheLimitsForTests(&max_resource_cache_bytes,
-                                    &max_glyph_cache_texture_bytes);
+  gpu::raster::DefaultGrCacheLimitsForTests(&max_resource_cache_bytes,
+                                            &max_glyph_cache_texture_bytes);
   gr_context_.reset(new skia_bindings::GrContextForGLES2Interface(
       ContextGL(), ContextSupport(), ContextCapabilities(),
       max_resource_cache_bytes, max_glyph_cache_texture_bytes));