cc/layers/scrollbar_layer_unittest.cc - Issue 12927003: cc: Chromify FakeWebScrollbarThemeGeometry

Unified Diff: cc/layers/scrollbar_layer_unittest.cc

Issue 12927003: cc: Chromify FakeWebScrollbarThemeGeometry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/layers/scrollbar_layer_unittest.cc

diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc

index eba1d524a53b4a7dcfd8cfcb7b72cae02ddae396..d972d7b23f6dfd520d117d54ce04b66c4c5f3912 100644

--- a/cc/layers/scrollbar_layer_unittest.cc

+++ b/cc/layers/scrollbar_layer_unittest.cc

@@ -39,7 +39,7 @@ scoped_ptr<LayerImpl> layerImplForScrollAreaAndScrollbar(

{

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());

@@ -109,7 +109,7 @@ TEST(ScrollbarLayerTest, scrollOffsetSynchronization)

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);

@@ -222,7 +222,7 @@ public:

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);

@@ -289,7 +289,7 @@ public:

scoped_ptr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::Create());

scoped_refptr<Layer> layerTreeRoot = Layer::Create();

scoped_refptr<Layer> contentLayer = Layer::Create();

layerTreeRoot->AddChild(contentLayer);

layerTreeRoot->AddChild(scrollbarLayer);

@@ -355,13 +355,13 @@ TEST(ScrollbarLayerTest, pinchZoomScrollbarUpdates)

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);

« no previous file with comments | « cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc ('k') | cc/test/fake_scrollbar_layer.cc » ('j') | no next file with comments »