Move DrawQuads to components/viz/

These classes are part of the CompositorFrame shipped over IPC to the viz service and
should be in components/viz/common. This moves all subclasses of viz::DrawQuad from
cc/quads to components/viz/common/quads, and updates headers and namespaces throughout
chromium.

TBR=jam

Bug: 722935
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_site_isolation
Change-Id: Ib7ce371cc78304b9147c319987d2d582f3b56978
Reviewed-on: https://chromium-review.googlesource.com/667539
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: Vladimir Levin <vmpstr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502329}

android_webview/browser/surfaces_instance.cc

@@ -12,10 +12,10 @@
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/parent_output_surface.h"
 #include "base/memory/ptr_util.h"
-#include "cc/quads/solid_color_draw_quad.h"
-#include "cc/quads/surface_draw_quad.h"
 #include "components/viz/common/display/renderer_settings.h"
 #include "components/viz/common/frame_sinks/begin_frame_source.h"
+#include "components/viz/common/quads/solid_color_draw_quad.h"
+#include "components/viz/common/quads/surface_draw_quad.h"
 #include "components/viz/common/surfaces/local_surface_id_allocator.h"
 #include "components/viz/service/display/display.h"
 #include "components/viz/service/display/display_scheduler.h"
@@ -126,7 +126,7 @@ void SurfacesInstance::DrawAndSwap(const gfx::Size& viewport,
 
   // Create a frame with a single SurfaceDrawQuad referencing the child
   // Surface and transformed using the given transform.
-  std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
+  std::unique_ptr<viz::RenderPass> render_pass = viz::RenderPass::Create();
   render_pass->SetNew(1, gfx::Rect(viewport), clip, gfx::Transform());
   render_pass->has_transparent_background = false;
 
@@ -139,11 +139,11 @@ void SurfacesInstance::DrawAndSwap(const gfx::Size& viewport,
   quad_state->is_clipped = true;
   quad_state->opacity = 1.f;
 
-  cc::SurfaceDrawQuad* surface_quad =
-      render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
+  viz::SurfaceDrawQuad* surface_quad =
+      render_pass->CreateAndAppendDrawQuad<viz::SurfaceDrawQuad>();
   surface_quad->SetNew(quad_state, gfx::Rect(quad_state->quad_layer_rect),
                        gfx::Rect(quad_state->quad_layer_rect), child_id,
-                       cc::SurfaceDrawQuadType::PRIMARY, nullptr);
+                       viz::SurfaceDrawQuadType::PRIMARY, nullptr);
 
   cc::CompositorFrame frame;
   // We draw synchronously, so acknowledge a manual BeginFrame.
@@ -186,14 +186,14 @@ void SurfacesInstance::SetSolidColorRootFrame() {
   gfx::Rect rect(surface_size_);
   bool is_clipped = false;
   bool are_contents_opaque = true;
-  std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
+  std::unique_ptr<viz::RenderPass> render_pass = viz::RenderPass::Create();
   render_pass->SetNew(1, rect, rect, gfx::Transform());
   viz::SharedQuadState* quad_state =
       render_pass->CreateAndAppendSharedQuadState();
   quad_state->SetAll(gfx::Transform(), rect, rect, rect, is_clipped,
                      are_contents_opaque, 1.f, SkBlendMode::kSrcOver, 0);
-  cc::SolidColorDrawQuad* solid_quad =
-      render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>();
+  viz::SolidColorDrawQuad* solid_quad =
+      render_pass->CreateAndAppendDrawQuad<viz::SolidColorDrawQuad>();
   solid_quad->SetNew(quad_state, rect, rect, SK_ColorBLACK, false);
   cc::CompositorFrame frame;
   frame.render_pass_list.push_back(std::move(render_pass));

android_webview/browser/surfaces_instance.h

@@ -61,7 +61,7 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
   void DisplayOutputSurfaceLost() override;
   void DisplayWillDrawAndSwap(
       bool will_draw_and_swap,
-      const cc::RenderPassList& render_passes) override {}
+      const viz::RenderPassList& render_passes) override {}
   void DisplayDidDrawAndSwap() override {}
 
   // viz::mojom::CompositorFrameSinkClient implementation.

android_webview/browser/test/rendering_test.cc

@@ -120,7 +120,7 @@ content::SynchronousCompositor* RenderingTest::ActiveCompositor() const {
 std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructEmptyFrame() {
   auto compositor_frame = base::MakeUnique<cc::CompositorFrame>(
       viz::test::MakeEmptyCompositorFrame());
-  std::unique_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create());
+  std::unique_ptr<viz::RenderPass> root_pass(viz::RenderPass::Create());
   gfx::Rect viewport(browser_view_renderer_->size());
   root_pass->SetNew(1, viewport, viewport, gfx::Transform());
   compositor_frame->render_pass_list.push_back(std::move(root_pass));

ash/fast_ink/fast_ink_view.cc

@@ -15,8 +15,8 @@
 #include "cc/output/compositor_frame.h"
 #include "cc/output/layer_tree_frame_sink.h"
 #include "cc/output/layer_tree_frame_sink_client.h"
-#include "cc/quads/texture_draw_quad.h"
 #include "components/viz/common/gpu/context_provider.h"
+#include "components/viz/common/quads/texture_draw_quad.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "ui/aura/env.h"
@@ -360,7 +360,7 @@ void FastInkView::UpdateSurface() {
   bool needs_blending = true;
 
   const int kRenderPassId = 1;
-  std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
+  std::unique_ptr<viz::RenderPass> render_pass = viz::RenderPass::Create();
   render_pass->SetNew(kRenderPassId, output_rect, surface_damage_rect_,
                       buffer_to_target_transform);
   surface_damage_rect_ = gfx::Rect();
@@ -381,8 +381,8 @@ void FastInkView::UpdateSurface() {
   frame.metadata.begin_frame_ack =
       viz::BeginFrameAck::CreateManualAckWithDamage();
   frame.metadata.device_scale_factor = device_scale_factor;
-  cc::TextureDrawQuad* texture_quad =
-      render_pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>();
+  viz::TextureDrawQuad* texture_quad =
+      render_pass->CreateAndAppendDrawQuad<viz::TextureDrawQuad>();
   float vertex_opacity[4] = {1.0, 1.0, 1.0, 1.0};
   gfx::PointF uv_top_left(0.f, 0.f);
   gfx::PointF uv_bottom_right(1.f, 1.f);

ash/mus/non_client_frame_controller_unittest.cc

@@ -11,8 +11,8 @@
 #include "ash/test/ash_test_helper.h"
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame.h"
-#include "cc/quads/solid_color_draw_quad.h"
 #include "cc/trees/layer_tree_settings.h"
+#include "components/viz/common/quads/solid_color_draw_quad.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
@@ -34,7 +34,7 @@ gfx::Rect GetQuadBoundsInScreen(const viz::DrawQuad* quad) {
 bool FindAnyQuad(const cc::CompositorFrame& frame,
                  const gfx::Rect& screen_rect) {
   DCHECK_EQ(1u, frame.render_pass_list.size());
-  const cc::QuadList& quad_list = frame.render_pass_list[0]->quad_list;
+  const auto& quad_list = frame.render_pass_list[0]->quad_list;
   for (const auto* quad : quad_list) {
     if (GetQuadBoundsInScreen(quad) == screen_rect)
       return true;
@@ -46,12 +46,12 @@ bool FindColorQuad(const cc::CompositorFrame& frame,
                    const gfx::Rect& screen_rect,
                    SkColor color) {
   DCHECK_EQ(1u, frame.render_pass_list.size());
-  const cc::QuadList& quad_list = frame.render_pass_list[0]->quad_list;
+  const auto& quad_list = frame.render_pass_list[0]->quad_list;
   for (const auto* quad : quad_list) {
     if (quad->material != viz::DrawQuad::Material::SOLID_COLOR)
       continue;
 
-    auto* color_quad = cc::SolidColorDrawQuad::MaterialCast(quad);
+    auto* color_quad = viz::SolidColorDrawQuad::MaterialCast(quad);
     if (color_quad->color != color)
       continue;
     if (GetQuadBoundsInScreen(quad) == screen_rect)
@@ -63,7 +63,7 @@ bool FindColorQuad(const cc::CompositorFrame& frame,
 bool FindTiledContentQuad(const cc::CompositorFrame& frame,
                           const gfx::Rect& screen_rect) {
   DCHECK_EQ(1u, frame.render_pass_list.size());
-  const cc::QuadList& quad_list = frame.render_pass_list[0]->quad_list;
+  const auto& quad_list = frame.render_pass_list[0]->quad_list;
   for (const auto* quad : quad_list) {
     if (quad->material == viz::DrawQuad::Material::TILED_CONTENT &&
         GetQuadBoundsInScreen(quad) == screen_rect)

ash/test/ash_test_suite.cc

@@ -47,7 +47,7 @@ class FrameSinkClient : public viz::TestLayerTreeFrameSinkClient {
       const cc::CompositorFrame& frame) override {}
   void DisplayWillDrawAndSwap(
       bool will_draw_and_swap,
-      const cc::RenderPassList& render_passes) override {}
+      const viz::RenderPassList& render_passes) override {}
   void DisplayDidDrawAndSwap() override {}
 
  private:

cc/BUILD.gn

@@ -176,34 +176,10 @@ cc_component("cc") {
     "output/software_renderer.cc",
     "output/software_renderer.h",
     "output/swap_promise.h",
-    "quads/content_draw_quad_base.cc",
-    "quads/content_draw_quad_base.h",
-    "quads/debug_border_draw_quad.cc",
-    "quads/debug_border_draw_quad.h",
     "quads/draw_polygon.cc",
     "quads/draw_polygon.h",
-    "quads/largest_draw_quad.cc",
-    "quads/largest_draw_quad.h",
     "quads/nine_patch_generator.cc",
     "quads/nine_patch_generator.h",
-    "quads/picture_draw_quad.cc",
-    "quads/picture_draw_quad.h",
-    "quads/render_pass.cc",
-    "quads/render_pass.h",
-    "quads/render_pass_draw_quad.cc",
-    "quads/render_pass_draw_quad.h",
-    "quads/solid_color_draw_quad.cc",
-    "quads/solid_color_draw_quad.h",
-    "quads/stream_video_draw_quad.cc",
-    "quads/stream_video_draw_quad.h",
-    "quads/surface_draw_quad.cc",
-    "quads/surface_draw_quad.h",
-    "quads/texture_draw_quad.cc",
-    "quads/texture_draw_quad.h",
-    "quads/tile_draw_quad.cc",
-    "quads/tile_draw_quad.h",
-    "quads/yuv_video_draw_quad.cc",
-    "quads/yuv_video_draw_quad.h",
     "raster/bitmap_raster_buffer_provider.cc",
     "raster/bitmap_raster_buffer_provider.h",
     "raster/gpu_raster_buffer_provider.cc",