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

Unified Diff: Source/testing/runner/EventSender.cpp

Issue 18546003: Fix tests to avoid page scale reset when setting page scale. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use setPageScaleFactorLimits(). Created 7 years, 4 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 | « Source/testing/runner/EventSender.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/testing/runner/EventSender.cpp
diff --git a/Source/testing/runner/EventSender.cpp b/Source/testing/runner/EventSender.cpp
index b56a6e10349d26bc1c54be26108cb8571b9efb1b..d7e9c2b622b63c814744bcdd6cb3282f74840051 100644
--- a/Source/testing/runner/EventSender.cpp
+++ b/Source/testing/runner/EventSender.cpp
@@ -301,7 +301,7 @@ EventSender::EventSender()
bindMethod("gestureTwoFingerTap", &EventSender::gestureTwoFingerTap);
bindMethod("zoomPageIn", &EventSender::zoomPageIn);
bindMethod("zoomPageOut", &EventSender::zoomPageOut);
- bindMethod("scalePageBy", &EventSender::scalePageBy);
+ bindMethod("setPageScaleFactor", &EventSender::setPageScaleFactor);
bindProperty("forceLayoutOnEvents", &forceLayoutOnEvents);
@@ -777,7 +777,7 @@ void EventSender::zoomPageOut(const CppArgumentList&, CppVariant* result)
result->setNull();
}
-void EventSender::scalePageBy(const CppArgumentList& arguments, CppVariant* result)
+void EventSender::setPageScaleFactor(const CppArgumentList& arguments, CppVariant* result)
{
if (arguments.size() < 3 || !arguments[0].isNumber() || !arguments[1].isNumber() || !arguments[2].isNumber())
return;
@@ -785,6 +785,7 @@ void EventSender::scalePageBy(const CppArgumentList& arguments, CppVariant* resu
float scaleFactor = static_cast<float>(arguments[0].toDouble());
int x = arguments[1].toInt32();
int y = arguments[2].toInt32();
+ webview()->setPageScaleFactorLimits(scaleFactor, scaleFactor);
webview()->setPageScaleFactor(scaleFactor, WebPoint(x, y));
result->setNull();
}
« no previous file with comments | « Source/testing/runner/EventSender.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698