Move logic from ImageTransportSurfaceOverlayMac into ui/

ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 
 #include "base/mac/sdk_forward_declarations.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/accelerated_widget_mac/ca_layer_tree_mac.h"
+#include "ui/accelerated_widget_mac/ca_renderer_layer_tree.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/mac/io_surface.h"
 
 namespace gpu {
 
 class CALayerTreeTest : public testing::Test {
  protected:
   void SetUp() override {
     superlayer_.reset([[CALayer alloc] init]);
   }
@@ skipping 11 matching lines @@
   gfx::Transform transform;
   transform.Translate(10, 20);
   gfx::RectF contents_rect(0.0f, 0.25f, 0.5f, 0.75f);
   gfx::Rect rect(16, 32, 64, 128);
   unsigned background_color = SkColorSetARGB(0xFF, 0xFF, 0, 0);
   unsigned edge_aa_mask = GL_CA_LAYER_EDGE_LEFT_CHROMIUM;
   float opacity = 0.5f;
   float scale_factor = 1.0f;
   bool result = false;
 
-  std::unique_ptr<ui::CALayerTree> ca_layer_tree;
+  std::unique_ptr<ui::CARendererLayerTree> ca_layer_tree;
   CALayer* root_layer = nil;
   CALayer* clip_and_sorting_layer = nil;
   CALayer* transform_layer = nil;
   CALayer* content_layer = nil;
 
   // Validate the initial values.
   {
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 38 matching lines @@
     EXPECT_EQ(gfx::Rect(rect.size()), gfx::Rect([content_layer bounds]));
     EXPECT_EQ(kCALayerLeftEdge, [content_layer edgeAntialiasingMask]);
     EXPECT_EQ(opacity, [content_layer opacity]);
     if ([content_layer respondsToSelector:(@selector(contentsScale))])
       EXPECT_EQ(scale_factor, [content_layer contentsScale]);
   }
 
   // Update just the clip rect and re-commit.
   {
     clip_rect = gfx::Rect(4, 8, 16, 32);
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 21 matching lines @@
               gfx::Point([clip_and_sorting_layer position]));
     EXPECT_EQ(-clip_rect.origin().x(),
               [clip_and_sorting_layer sublayerTransform].m41);
     EXPECT_EQ(-clip_rect.origin().y(),
               [clip_and_sorting_layer sublayerTransform].m42);
   }
 
   // Disable clipping and re-commit.
   {
     is_clipped = false;
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 18 matching lines @@
     EXPECT_EQ(gfx::Rect(), gfx::Rect([clip_and_sorting_layer bounds]));
     EXPECT_EQ(gfx::Point(), gfx::Point([clip_and_sorting_layer position]));
     EXPECT_EQ(0.0, [clip_and_sorting_layer sublayerTransform].m41);
     EXPECT_EQ(0.0, [clip_and_sorting_layer sublayerTransform].m42);
     EXPECT_EQ(1u, [[clip_and_sorting_layer sublayers] count]);
   }
 
   // Change the transform and re-commit.
   {
     transform.Translate(5, 5);
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 16 matching lines @@
     // Validate the transform layer.
     EXPECT_EQ(transform.matrix().get(3, 0),
               [transform_layer sublayerTransform].m41);
     EXPECT_EQ(transform.matrix().get(3, 1),
               [transform_layer sublayerTransform].m42);
   }
 
   // Change the edge antialiasing mask and commit.
   {
     edge_aa_mask = GL_CA_LAYER_EDGE_TOP_CHROMIUM;
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 14 matching lines @@
               [[clip_and_sorting_layer sublayers] objectAtIndex:0]);
     EXPECT_EQ(1u, [[transform_layer sublayers] count]);
     EXPECT_EQ(content_layer, [[transform_layer sublayers] objectAtIndex:0]);
 
     // Validate the content layer. Note that top and bottom edges flip.
     EXPECT_EQ(kCALayerBottomEdge, [content_layer edgeAntialiasingMask]);
   }
 
   // Change the contents and commit.
   {
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         nullptr,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 16 matching lines @@
     EXPECT_EQ(content_layer, [[transform_layer sublayers] objectAtIndex:0]);
 
     // Validate the content layer. Note that edge anti-aliasing no longer flips.
     EXPECT_EQ(nil, [content_layer contents]);
     EXPECT_EQ(kCALayerTopEdge, [content_layer edgeAntialiasingMask]);
   }
 
   // Change the rect size.
   {
     rect = gfx::Rect(rect.origin(), gfx::Size(32, 16));
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         nullptr,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 16 matching lines @@
     EXPECT_EQ(content_layer, [[transform_layer sublayers] objectAtIndex:0]);
 
     // Validate the content layer.
     EXPECT_EQ(rect.origin(), gfx::Point([content_layer position]));
     EXPECT_EQ(gfx::Rect(rect.size()), gfx::Rect([content_layer bounds]));
   }
 
   // Change the rect position.
   {
     rect = gfx::Rect(gfx::Point(16, 4), rect.size());
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         nullptr,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 16 matching lines @@
     EXPECT_EQ(content_layer, [[transform_layer sublayers] objectAtIndex:0]);
 
     // Validate the content layer.
     EXPECT_EQ(rect.origin(), gfx::Point([content_layer position]));
     EXPECT_EQ(gfx::Rect(rect.size()), gfx::Rect([content_layer bounds]));
   }
 
   // Change the opacity.
   {
     opacity = 1.0f;
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         nullptr,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 15 matching lines @@
     EXPECT_EQ(1u, [[transform_layer sublayers] count]);
     EXPECT_EQ(content_layer, [[transform_layer sublayers] objectAtIndex:0]);
 
     // Validate the content layer.
     EXPECT_EQ(opacity, [content_layer opacity]);
   }
 
   // Add the clipping and IOSurface contents back.
   {
     is_clipped = true;
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 16 matching lines @@
     EXPECT_EQ(content_layer, [[transform_layer sublayers] objectAtIndex:0]);
 
     // Validate the content layer.
     EXPECT_EQ(static_cast<id>(io_surface.get()), [content_layer contents]);
     EXPECT_EQ(kCALayerBottomEdge, [content_layer edgeAntialiasingMask]);
   }
 
   // Change the scale factor. This should result in a new tree being created.
   {
     scale_factor = 2.0f;
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 74 matching lines @@
   // * 1 non-flat (new sorting context layer)
   // * 2 flat and the same (new sorting context layer, 1 transform layer)
   gfx::Transform transforms[5];
   transforms[0].Translate(10, 10);
   transforms[1].RotateAboutZAxis(45.0f);
   transforms[2].RotateAboutYAxis(45.0f);
   transforms[3].Translate(10, 10);
   transforms[4].Translate(10, 10);
 
   // Schedule and commit the layers.
-  std::unique_ptr<ui::CALayerTree> ca_layer_tree(new ui::CALayerTree);
+  std::unique_ptr<ui::CARendererLayerTree> ca_layer_tree(
+      new ui::CARendererLayerTree);
   for (size_t i = 0; i < 5; ++i) {
     bool result = ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transforms[i],
         io_surfaces[i],
         nullptr,
         contents_rect,
         rect,
@@ skipping 65 matching lines @@
   float scale_factor = 1.0f;
 
   // We'll use the IOSurface contents to identify the content layers.
   base::ScopedCFTypeRef<IOSurfaceRef> io_surfaces[3];
   for (size_t i = 0; i < 3; ++i) {
     io_surfaces[i].reset(gfx::CreateIOSurface(
         gfx::Size(256, 256), gfx::BufferFormat::BGRA_8888));
   }
 
   // Schedule and commit the layers.
-  std::unique_ptr<ui::CALayerTree> ca_layer_tree(new ui::CALayerTree);
+  std::unique_ptr<ui::CARendererLayerTree> ca_layer_tree(
+      new ui::CARendererLayerTree);
   for (size_t i = 0; i < 3; ++i) {
     bool result = ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_ids[i],
         transform,
         io_surfaces[i],
         nullptr,
         contents_rect,
         rect,
@@ skipping 50 matching lines @@
   float opacity = 1.0f;
 
   // Vary the clipping parameters within sorting contexts.
   bool is_clippeds[3] = { true, true, false};
   gfx::Rect clip_rects[3] = {
       gfx::Rect(0, 0, 16, 16),
       gfx::Rect(4, 8, 16, 32),
       gfx::Rect(0, 0, 16, 16)
   };
 
-  std::unique_ptr<ui::CALayerTree> ca_layer_tree(new ui::CALayerTree);
+  std::unique_ptr<ui::CARendererLayerTree> ca_layer_tree(
+      new ui::CARendererLayerTree);
   // First send the various clip parameters to sorting context zero. This is
   // legitimate.
   for (size_t i = 0; i < 3; ++i) {
     int sorting_context_id = 0;
     bool result = ca_layer_tree->ScheduleCALayer(
         is_clippeds[i],
         clip_rects[i],
         sorting_context_id,
         transform,
         io_surface,
@@ skipping 55 matching lines @@
   int sorting_context_id = 0;
   gfx::Transform transform;
   gfx::RectF contents_rect(0.0f, 0.0f, 1.0f, 1.0f);
   gfx::Rect rect(16, 32, 64, 128);
   unsigned background_color = SkColorSetARGB(0xFF, 0xFF, 0, 0);
   unsigned edge_aa_mask = GL_CA_LAYER_EDGE_LEFT_CHROMIUM;
   float opacity = 0.5f;
   float scale_factor = 1.0f;
   bool result = false;
 
-  std::unique_ptr<ui::CALayerTree> ca_layer_tree;
+  std::unique_ptr<ui::CARendererLayerTree> ca_layer_tree;
   CALayer* root_layer = nil;
   CALayer* clip_and_sorting_layer = nil;
   CALayer* transform_layer = nil;
   CALayer* content_layer1 = nil;
   CALayer* content_layer2 = nil;
   CALayer* content_layer3 = nil;
 
   // Validate the initial values.
   {
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect, background_color,
         edge_aa_mask,
@@ skipping 16 matching lines @@
     // Validate the content layer.
     EXPECT_FALSE([content_layer1
         isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
   }
 
   io_surface.reset(gfx::CreateIOSurface(gfx::Size(256, 256),
                                         gfx::BufferFormat::YUV_420_BIPLANAR));
 
   // Pass another frame.
   {
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 21 matching lines @@
   }
 
   io_surface.reset(gfx::CreateIOSurface(gfx::Size(256, 256),
                                         gfx::BufferFormat::YUV_420_BIPLANAR));
   base::ScopedCFTypeRef<CVPixelBufferRef> cv_pixel_buffer;
   CVPixelBufferCreateWithIOSurface(
       nullptr, io_surface, nullptr, cv_pixel_buffer.InitializeInto());
 
   // Pass a frame with a CVPixelBuffer
   {
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         cv_pixel_buffer,
         contents_rect,
         rect,
         background_color,
@@ skipping 20 matching lines @@
     EXPECT_NE(content_layer2, content_layer1);
   }
 
   io_surface.reset(gfx::CreateIOSurface(gfx::Size(256, 256),
                                         gfx::BufferFormat::YUV_420_BIPLANAR));
   cv_pixel_buffer.reset();
 
   // Pass a frame that is clipped.
   contents_rect = gfx::RectF(0, 0, 1, 0.9);
   {
-    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    std::unique_ptr<ui::CARendererLayerTree> new_ca_layer_tree(
+        new ui::CARendererLayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
         nullptr,
         contents_rect,
         rect,
         background_color,
@@ skipping 15 matching lines @@
     content_layer3 = [[transform_layer sublayers] objectAtIndex:0];
 
     // Validate the content layer.
     EXPECT_FALSE([content_layer3
         isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
     EXPECT_NE(content_layer3, content_layer2);
   }
 }
 
 }  // namespace gpu