Move viz::SharedBitmap header to viz/common/resources

It was placed in viz/common/quads/ because it is used with quads, but
fits better in resources/ with things like TransferableResource where
it actually appears.

R=piman@chromium.org
TBR=sky

Bug: 722935
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;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I39ada3a3fbefd22bfd819d4c10ecfceb59fc1d68
Reviewed-on: https://chromium-review.googlesource.com/1079384
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563649}

cc/layers/texture_layer_unittest.cc

@@ -39,9 +39,9 @@
 #include "cc/trees/single_thread_proxy.h"
 #include "components/viz/common/gpu/context_provider.h"
 #include "components/viz/common/gpu/raster_context_provider.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/bitmap_allocation.h"
 #include "components/viz/common/resources/returned_resource.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/common/resources/transferable_resource.h"
 #include "components/viz/service/display/software_output_device.h"
 #include "components/viz/test/fake_output_surface.h"

cc/resources/cross_thread_shared_bitmap.h

@@ -10,8 +10,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "cc/cc_export.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/resource_format.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {

cc/resources/resource_pool.h

@@ -20,9 +20,9 @@
 #include "base/trace_event/memory_dump_provider.h"
 #include "base/unguessable_token.h"
 #include "cc/cc_export.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/resource_format.h"
 #include "components/viz/common/resources/resource_id.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/color_space.h"

cc/resources/shared_bitmap_id_registrar.h

@@ -8,7 +8,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/cc_export.h"
-#include "components/viz/common/quads/shared_bitmap.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 
 namespace cc {
 class CrossThreadSharedBitmap;

cc/test/pixel_test.cc

@@ -22,8 +22,8 @@
 #include "components/viz/common/frame_sinks/copy_output_request.h"
 #include "components/viz/common/frame_sinks/copy_output_result.h"
 #include "components/viz/common/quads/compositor_frame_metadata.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/bitmap_allocation.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/service/display/display_resource_provider.h"
 #include "components/viz/service/display/gl_renderer.h"
 #include "components/viz/service/display/output_surface_client.h"

cc/test/pixel_test.h

@@ -11,7 +11,7 @@
 #include "cc/trees/layer_tree_settings.h"
 #include "components/viz/client/client_resource_provider.h"
 #include "components/viz/common/quads/render_pass.h"
-#include "components/viz/common/quads/shared_bitmap.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/service/display/gl_renderer.h"
 #include "components/viz/service/display/output_surface.h"
 #include "components/viz/service/display/skia_renderer.h"

components/viz/client/shared_bitmap_reporter.h

@@ -6,7 +6,7 @@
 #define COMPONENTS_VIZ_CLIENT_SHARED_BITMAP_REPORTER_H_
 
 #include "components/viz/client/viz_client_export.h"
-#include "components/viz/common/quads/shared_bitmap.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "mojo/public/cpp/system/buffer.h"
 
 namespace viz {

components/viz/common/BUILD.gn

@@ -89,8 +89,6 @@ viz_component("common") {
     "quads/render_pass_draw_quad.cc",
     "quads/render_pass_draw_quad.h",
     "quads/selection.h",
-    "quads/shared_bitmap.cc",
-    "quads/shared_bitmap.h",
     "quads/shared_quad_state.cc",
     "quads/shared_quad_state.h",
     "quads/solid_color_draw_quad.cc",
@@ -115,6 +113,8 @@ viz_component("common") {
     "resources/resource_sizes.h",
     "resources/return_callback.h",
     "resources/returned_resource.h",
+    "resources/shared_bitmap.cc",
+    "resources/shared_bitmap.h",
     "resources/single_release_callback.cc",
     "resources/single_release_callback.h",
     "resources/transferable_resource.cc",

components/viz/common/quads/shared_bitmap.cc → components/viz/common/resources/shared_bitmap.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/viz/common/quads/shared_bitmap.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 
 #include <stddef.h>
 #include <stdint.h>

components/viz/common/quads/shared_bitmap.h → components/viz/common/resources/shared_bitmap.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_VIZ_COMMON_QUADS_SHARED_BITMAP_H_
-#define COMPONENTS_VIZ_COMMON_QUADS_SHARED_BITMAP_H_
+#ifndef COMPONENTS_VIZ_COMMON_RESOURCES_SHARED_BITMAP_H_
+#define COMPONENTS_VIZ_COMMON_RESOURCES_SHARED_BITMAP_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -47,4 +47,4 @@ class VIZ_COMMON_EXPORT SharedBitmap {
 
 }  // namespace viz
 
-#endif  // COMPONENTS_VIZ_COMMON_QUADS_SHARED_BITMAP_H_
+#endif  // COMPONENTS_VIZ_COMMON_RESOURCES_SHARED_BITMAP_H_

components/viz/common/resources/transferable_resource.h

@@ -10,9 +10,9 @@
 #include <vector>
 
 #include "build/build_config.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/resource_format.h"
 #include "components/viz/common/resources/resource_id.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/common/viz_common_export.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "ui/gfx/buffer_types.h"

components/viz/service/display/display_resource_provider.h

@@ -16,9 +16,9 @@
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "build/build_config.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/resource_id.h"
 #include "components/viz/common/resources/return_callback.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/common/resources/transferable_resource.h"
 #include "components/viz/service/display/overlay_candidate.h"
 #include "components/viz/service/display/resource_fence.h"

components/viz/service/display/display_resource_provider_unittest.cc

@@ -23,10 +23,10 @@
 #include "build/build_config.h"
 #include "cc/test/render_pass_test_utils.h"
 #include "cc/test/resource_provider_test_utils.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/bitmap_allocation.h"
 #include "components/viz/common/resources/resource_format_utils.h"
 #include "components/viz/common/resources/returned_resource.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/common/resources/single_release_callback.h"
 #include "components/viz/service/display/shared_bitmap_manager.h"
 #include "components/viz/test/test_context_provider.h"

components/viz/service/display/shared_bitmap_manager.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "components/viz/common/quads/shared_bitmap.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "mojo/public/cpp/system/buffer.h"
 
 namespace gfx {

components/viz/service/display/software_renderer_unittest.cc

@@ -22,10 +22,10 @@
 #include "components/viz/common/quads/compositor_frame_metadata.h"
 #include "components/viz/common/quads/render_pass.h"
 #include "components/viz/common/quads/render_pass_draw_quad.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/quads/solid_color_draw_quad.h"
 #include "components/viz/common/quads/tile_draw_quad.h"
 #include "components/viz/common/resources/bitmap_allocation.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/service/display/display_resource_provider.h"
 #include "components/viz/service/display/software_output_device.h"
 #include "components/viz/test/fake_output_surface.h"

content/browser/renderer_host/render_widget_host_impl.h

@@ -30,7 +30,7 @@
 #include "base/time/time.h"
 #include "base/timer/elapsed_timer.h"
 #include "build/build_config.h"
-#include "components/viz/common/quads/shared_bitmap.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/common/surfaces/frame_sink_id.h"
 #include "content/browser/renderer_host/event_with_latency_info.h"
 #include "content/browser/renderer_host/frame_token_message_queue.h"

content/common/view_messages.h

@@ -22,7 +22,7 @@
 #include "cc/input/touch_action.h"
 #include "components/viz/common/frame_sinks/begin_frame_args.h"
 #include "components/viz/common/quads/compositor_frame.h"
-#include "components/viz/common/quads/shared_bitmap.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
 #include "content/common/date_time_suggestion.h"

content/renderer/pepper/pepper_graphics_2d_host.cc

@@ -19,9 +19,9 @@
 #include "cc/paint/paint_flags.h"
 #include "cc/resources/cross_thread_shared_bitmap.h"
 #include "components/viz/common/gpu/context_provider.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/bitmap_allocation.h"
 #include "components/viz/common/resources/resource_sizes.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "content/renderer/pepper/gfx_conversion.h"

third_party/blink/renderer/platform/graphics/gpu/drawing_buffer.cc

@@ -36,8 +36,8 @@
 
 #include "build/build_config.h"
 #include "cc/layers/texture_layer.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/bitmap_allocation.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/common/resources/transferable_resource.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"

third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc

@@ -6,8 +6,8 @@
 
 #include "cc/layers/texture_layer.h"
 #include "cc/resources/cross_thread_shared_bitmap.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/bitmap_allocation.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/common/resources/transferable_resource.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/blink/public/platform/platform.h"

third_party/blink/renderer/platform/graphics/offscreen_canvas_resource_provider.cc

@@ -6,8 +6,8 @@
 
 #include "base/memory/shared_memory.h"
 #include "base/numerics/checked_math.h"
-#include "components/viz/common/quads/shared_bitmap.h"
 #include "components/viz/common/resources/bitmap_allocation.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/common/resources/single_release_callback.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/capabilities.h"

third_party/blink/renderer/platform/graphics/video_frame_submitter.h

@@ -9,7 +9,7 @@
 #include "base/threading/thread_checker.h"
 #include "components/viz/client/shared_bitmap_reporter.h"
 #include "components/viz/common/gpu/context_provider.h"
-#include "components/viz/common/quads/shared_bitmap.h"
+#include "components/viz/common/resources/shared_bitmap.h"
 #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/system/buffer.h"