Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1035)

Unified Diff: cc/layer_tree_host_unittest.cc

Issue 12093015: Move page scale ownership to LayerTreeImpl. (Closed) Base URL: http://git.chromium.org/chromium/src.git@coordchange3
Patch Set: Rebase to 179503 Created 7 years, 11 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
« no previous file with comments | « cc/layer_tree_host_impl_unittest.cc ('k') | cc/layer_tree_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host_unittest.cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index 620d1bd856ad62ebbfa83b866b9f79187eee3ad7..bcad5b6993a690cb22622f5841700c92ba34dffc 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -648,7 +648,7 @@ public:
{
EXPECT_EQ(gfx::Size(20, 20), impl->layoutViewportSize());
EXPECT_EQ(SK_ColorGRAY, impl->activeTree()->background_color());
- EXPECT_EQ(5, impl->pageScaleFactor());
+ EXPECT_EQ(5, impl->activeTree()->page_scale_factor());
endTest();
}
@@ -688,7 +688,7 @@ public:
{
impl->rootLayer()->setScrollable(true);
impl->rootLayer()->setScrollOffset(gfx::Vector2d());
- impl->setPageScaleFactorAndLimits(impl->pageScaleFactor(), 0.5, 2);
+ impl->activeTree()->SetPageScaleFactorAndLimits(impl->activeTree()->page_scale_factor(), 0.5, 2);
// We request animation only once.
if (!m_animationRequested) {
@@ -709,7 +709,7 @@ public:
impl->processScrollDeltas();
// We get one commit before the first draw, and the animation doesn't happen until the second draw.
if (impl->activeTree()->source_frame_number() == 1) {
- EXPECT_EQ(1.25, impl->pageScaleFactor());
+ EXPECT_EQ(1.25, impl->activeTree()->page_scale_factor());
endTest();
} else
postSetNeedsRedrawToMainThread();
« no previous file with comments | « cc/layer_tree_host_impl_unittest.cc ('k') | cc/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698