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

Unified Diff: cc/CCLayerTreeHostTest.cpp

Issue 10916279: Chromium compositor change implementing page-scale driven pinch-zoom. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebaselined to 160422. Created 8 years, 2 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/CCLayerTreeHostImplTest.cpp ('k') | cc/CCSettings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCLayerTreeHostTest.cpp
===================================================================
--- cc/CCLayerTreeHostTest.cpp (revision 160422)
+++ cc/CCLayerTreeHostTest.cpp (working copy)
@@ -1049,7 +1049,7 @@
{
EXPECT_EQ(IntSize(20, 20), impl->layoutViewportSize());
EXPECT_EQ(SK_ColorGRAY, impl->backgroundColor());
- EXPECT_EQ(5, impl->pageScale());
+ EXPECT_EQ(5, impl->pageScaleFactor());
endTest();
}
@@ -1088,7 +1088,7 @@
{
impl->rootLayer()->setScrollable(true);
impl->rootLayer()->setScrollPosition(IntPoint());
- impl->setPageScaleFactorAndLimits(impl->pageScale(), 0.5, 2);
+ impl->setPageScaleFactorAndLimits(impl->pageScaleFactor(), 0.5, 2);
// We request animation only once.
if (!m_animationRequested) {
@@ -1109,7 +1109,7 @@
impl->processScrollDeltas();
// We get one commit before the first draw, and the animation doesn't happen until the second draw.
if (impl->sourceFrameNumber() == 1) {
- EXPECT_EQ(1.25, impl->pageScale());
+ EXPECT_EQ(1.25, impl->pageScaleFactor());
endTest();
} else
postSetNeedsRedrawToMainThread();
« no previous file with comments | « cc/CCLayerTreeHostImplTest.cpp ('k') | cc/CCSettings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698