cc: Chromify FakeWebScrollbarThemeGeometry

cc/layers/scrollbar_layer_unittest.cc

 // Copyright 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 "cc/layers/scrollbar_layer.h"
 
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/quads/solid_color_draw_quad.h"
@@ skipping 21 matching lines @@
 namespace cc {
 namespace {
 
 scoped_ptr<LayerImpl> layerImplForScrollAreaAndScrollbar(
     FakeLayerTreeHostImpl* host_impl,
     scoped_ptr<WebKit::WebScrollbar> scrollbar,
     bool reverse_order)
 {
     scoped_refptr<Layer> layerTreeRoot = Layer::Create();
     scoped_refptr<Layer> child1 = Layer::Create();
-    scoped_refptr<Layer> child2 = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::create(true), child1->id());
+    scoped_refptr<Layer> child2 = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::Create(true), child1->id());
     layerTreeRoot->AddChild(child1);
     layerTreeRoot->InsertChild(child2, reverse_order ? 0 : 1);
     scoped_ptr<LayerImpl> layerImpl = TreeSynchronizer::SynchronizeTrees(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), host_impl->active_tree());
     TreeSynchronizer::PushProperties(layerTreeRoot.get(), layerImpl.get());
     return layerImpl.Pass();
 }
 
 TEST(ScrollbarLayerTest, resolveScrollLayerPointer)
 {
     FakeImplProxy proxy;
@@ skipping 49 matching lines @@
 }
 
 TEST(ScrollbarLayerTest, scrollOffsetSynchronization)
 {
     FakeImplProxy proxy;
     FakeLayerTreeHostImpl hostImpl(&proxy);
 
     scoped_ptr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::Create());
     scoped_refptr<Layer> layerTreeRoot = Layer::Create();
     scoped_refptr<Layer> contentLayer = Layer::Create();
-    scoped_refptr<Layer> scrollbarLayer = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::create(true), layerTreeRoot->id());
+    scoped_refptr<Layer> scrollbarLayer = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::Create(true), layerTreeRoot->id());
     layerTreeRoot->AddChild(contentLayer);
     layerTreeRoot->AddChild(scrollbarLayer);
 
     layerTreeRoot->SetScrollOffset(gfx::Vector2d(10, 20));
     layerTreeRoot->SetMaxScrollOffset(gfx::Vector2d(30, 50));
     layerTreeRoot->SetBounds(gfx::Size(100, 200));
     contentLayer->SetBounds(gfx::Size(100, 200));
 
     scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::SynchronizeTrees(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.active_tree());
     TreeSynchronizer::PushProperties(layerTreeRoot.get(), layerImplTreeRoot.get());
@@ skipping 92 matching lines @@
 
     void setScrollbarBounds(gfx::Size bounds) {
         bounds_ = bounds;
     }
 
     virtual void BeginTest() OVERRIDE
     {
         layer_tree_host()->InitializeRendererIfNeeded();
 
         scoped_ptr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::Create());
-        m_scrollbarLayer = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::create(true), 1);
+        m_scrollbarLayer = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::Create(true), 1);
         m_scrollbarLayer->SetLayerTreeHost(layer_tree_host());
         m_scrollbarLayer->SetBounds(bounds_);
         layer_tree_host()->root_layer()->AddChild(m_scrollbarLayer);
 
         m_scrollLayer = Layer::Create();
         m_scrollbarLayer->SetScrollLayerId(m_scrollLayer->id());
         layer_tree_host()->root_layer()->AddChild(m_scrollLayer);
 
         PostSetNeedsCommitToMainThread();
     }
@@ skipping 46 matching lines @@
     {
     }
 
     void testResourceUpload(int expectedResources)
     {
         m_layerTreeHost.reset(new MockLayerTreeHost(&m_fakeClient, m_layerTreeSettings));
 
         scoped_ptr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::Create());
         scoped_refptr<Layer> layerTreeRoot = Layer::Create();
         scoped_refptr<Layer> contentLayer = Layer::Create();
-        scoped_refptr<Layer> scrollbarLayer = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::create(true), layerTreeRoot->id());
+        scoped_refptr<Layer> scrollbarLayer = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::Create(true), layerTreeRoot->id());
         layerTreeRoot->AddChild(contentLayer);
         layerTreeRoot->AddChild(scrollbarLayer);
 
         m_layerTreeHost->InitializeRendererIfNeeded();
         m_layerTreeHost->contents_texture_manager()->SetMaxMemoryLimitBytes(1024 * 1024);
         m_layerTreeHost->SetRootLayer(layerTreeRoot);
 
         scrollbarLayer->SetIsDrawable(true);
         scrollbarLayer->SetBounds(gfx::Size(100, 100));
         layerTreeRoot->SetScrollOffset(gfx::Vector2d(10, 20));
@@ skipping 45 matching lines @@
     FakeLayerTreeHostImpl hostImpl(&proxy);
 
     scoped_refptr<Layer> layerTreeRoot = Layer::Create();
     layerTreeRoot->SetScrollable(true);
 
     scoped_refptr<Layer> contentLayer = Layer::Create();
     scoped_ptr<WebKit::WebScrollbar> scrollbar1(FakeWebScrollbar::Create());
     scoped_refptr<Layer> scrollbarLayerHorizontal =
         ScrollbarLayer::Create(scrollbar1.Pass(),
         FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(),
-        FakeWebScrollbarThemeGeometry::create(true),
+        FakeWebScrollbarThemeGeometry::Create(true),
         Layer::PINCH_ZOOM_ROOT_SCROLL_LAYER_ID);
     scoped_ptr<WebKit::WebScrollbar> scrollbar2(FakeWebScrollbar::Create());
     scoped_refptr<Layer> scrollbarLayerVertical =
         ScrollbarLayer::Create(scrollbar2.Pass(),
         FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(),
-        FakeWebScrollbarThemeGeometry::create(true),
+        FakeWebScrollbarThemeGeometry::Create(true),
         Layer::PINCH_ZOOM_ROOT_SCROLL_LAYER_ID);
 
     layerTreeRoot->AddChild(contentLayer);
     layerTreeRoot->AddChild(scrollbarLayerHorizontal);
     layerTreeRoot->AddChild(scrollbarLayerVertical);
 
     layerTreeRoot->SetScrollOffset(gfx::Vector2d(10, 20));
     layerTreeRoot->SetMaxScrollOffset(gfx::Vector2d(30, 50));
     layerTreeRoot->SetBounds(gfx::Size(100, 200));
     contentLayer->SetBounds(gfx::Size(100, 200));
@@ skipping 26 matching lines @@
     EXPECT_EQ(10, pinchZoomHorizontal->CurrentPos());
     EXPECT_EQ(100, pinchZoomHorizontal->TotalSize());
     EXPECT_EQ(30, pinchZoomHorizontal->Maximum());
     EXPECT_EQ(20, pinchZoomVertical->CurrentPos());
     EXPECT_EQ(200, pinchZoomVertical->TotalSize());
     EXPECT_EQ(50, pinchZoomVertical->Maximum());
 }
 
 }  // namespace
 }  // namespace cc