aura: Allow delegated frames to be used by more than one impl layer.

ui/compositor/layer_unittest.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "cc/layers/delegated_frame_provider.h"
+#include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/layer.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/test/pixel_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/test/test_compositor_host.h"
 #include "ui/compositor/test/test_layers.h"
@@ skipping 1280 matching lines @@
 TEST_F(LayerWithDelegateTest, DelegatedLayer) {
   scoped_ptr<Layer> root(CreateNoTextureLayer(gfx::Rect(0, 0, 1000, 1000)));
 
   scoped_ptr<Layer> child(CreateLayer(LAYER_TEXTURED));
 
   child->SetBounds(gfx::Rect(0, 0, 10, 10));
   child->SetVisible(true);
   root->Add(child.get());
   DrawTree(root.get());
 
+  scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection =
+      new cc::DelegatedFrameResourceCollection;
+  scoped_refptr<cc::DelegatedFrameProvider> frame_provider;
+
   // Content matches layer size.
-  child->SetDelegatedFrame(MakeFrameData(gfx::Size(10, 10)), gfx::Size(10, 10));
+  frame_provider = new cc::DelegatedFrameProvider(
+      resource_collection.get(), MakeFrameData(gfx::Size(10, 10)));
+  child->SetShowDelegatedContent(frame_provider, gfx::Size(10, 10));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(10, 10).ToString());
 
   // Content larger than layer.
   child->SetBounds(gfx::Rect(0, 0, 5, 5));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(5, 5).ToString());
 
   // Content smaller than layer.
   child->SetBounds(gfx::Rect(0, 0, 10, 10));
-  child->SetDelegatedFrame(MakeFrameData(gfx::Size(5, 5)), gfx::Size(5, 5));
-  EXPECT_EQ(child->cc_layer()->bounds().ToString(),
-            gfx::Size(5, 5).ToString());
+  frame_provider = new cc::DelegatedFrameProvider(
+      resource_collection.get(), MakeFrameData(gfx::Size(5, 5)));
+  child->SetShowDelegatedContent(frame_provider, gfx::Size(5, 5));
+  EXPECT_EQ(child->cc_layer()->bounds().ToString(), gfx::Size(5, 5).ToString());
 
   // Hi-DPI content on low-DPI layer.
-  child->SetDelegatedFrame(MakeFrameData(gfx::Size(20, 20)), gfx::Size(10, 10));
+  frame_provider = new cc::DelegatedFrameProvider(
+      resource_collection.get(), MakeFrameData(gfx::Size(20, 20)));
+  child->SetShowDelegatedContent(frame_provider, gfx::Size(10, 10));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(10, 10).ToString());
 
   // Hi-DPI content on hi-DPI layer.
   compositor()->SetScaleAndSize(2.f, gfx::Size(1000, 1000));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(20, 20).ToString());
 
   // Low-DPI content on hi-DPI layer.
-  child->SetDelegatedFrame(MakeFrameData(gfx::Size(10, 10)), gfx::Size(10, 10));
+  frame_provider = new cc::DelegatedFrameProvider(
+      resource_collection.get(), MakeFrameData(gfx::Size(10, 10)));
+  child->SetShowDelegatedContent(frame_provider, gfx::Size(10, 10));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(20, 20).ToString());
 }
 
 TEST_F(LayerWithDelegateTest, ExternalContent) {
   scoped_ptr<Layer> root(CreateNoTextureLayer(gfx::Rect(0, 0, 1000, 1000)));
   scoped_ptr<Layer> child(CreateLayer(LAYER_TEXTURED));
 
   child->SetBounds(gfx::Rect(0, 0, 10, 10));
   child->SetVisible(true);
   root->Add(child.get());
 
   // The layer is already showing painted content, so the cc layer won't change.
   scoped_refptr<cc::Layer> before = child->cc_layer();
   child->SetShowPaintedContent();
   EXPECT_TRUE(child->cc_layer());
   EXPECT_EQ(before, child->cc_layer());
 
+  scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection =
+      new cc::DelegatedFrameResourceCollection;
+  scoped_refptr<cc::DelegatedFrameProvider> frame_provider =
+      new cc::DelegatedFrameProvider(resource_collection.get(),
+                                     MakeFrameData(gfx::Size(10, 10)));
+
   // Showing delegated content changes the underlying cc layer.
   before = child->cc_layer();
-  child->SetDelegatedFrame(MakeFrameData(gfx::Size(10, 10)), gfx::Size(10, 10));
+  child->SetShowDelegatedContent(frame_provider, gfx::Size(10, 10));
   EXPECT_TRUE(child->cc_layer());
   EXPECT_NE(before, child->cc_layer());
 
   // Changing to painted content should change the underlying cc layer.
   before = child->cc_layer();
   child->SetShowPaintedContent();
   EXPECT_TRUE(child->cc_layer());
   EXPECT_NE(before, child->cc_layer());
 }
 
@@ skipping 59 matching lines @@
   l1->SetOpacity(0.5f);
 
   // Change l1's cc::Layer.
   l1->SwitchCCLayerForTest();
 
   // Ensure that the opacity animation completed.
   EXPECT_FLOAT_EQ(l1->opacity(), 0.5f);
 }
 
 }  // namespace ui