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

Unified Diff: Tools/DumpRenderTree/chromium/TestRunner/src/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: Remove internals.setPageScaleFactor, rename eventSender.scalePageBy. Created 7 years, 5 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: Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp
diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp b/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp
index ff1897e68bede54111d86895c917c48bf0d2bf80..4387c995c891b3a03f113494d20d7bd8e66d35f3 100644
--- a/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp
+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp
@@ -301,7 +301,8 @@ EventSender::EventSender()
bindMethod("gestureTwoFingerTap", &EventSender::gestureTwoFingerTap);
bindMethod("zoomPageIn", &EventSender::zoomPageIn);
bindMethod("zoomPageOut", &EventSender::zoomPageOut);
- bindMethod("scalePageBy", &EventSender::scalePageBy);
+ bindMethod("setInitialPageScaleOverride", &EventSender::setInitialPageScaleOverride);
+ bindMethod("setPageScaleFactor", &EventSender::setPageScaleFactor);
bindProperty("forceLayoutOnEvents", &forceLayoutOnEvents);
@@ -777,7 +778,17 @@ void EventSender::zoomPageOut(const CppArgumentList&, CppVariant* result)
result->setNull();
}
-void EventSender::scalePageBy(const CppArgumentList& arguments, CppVariant* result)
+void EventSender::setInitialPageScaleOverride(const CppArgumentList& arguments, CppVariant* result)
+{
+ if (arguments.size() != 1 || !arguments[0].isNumber())
+ return;
+
+ float pageScaleOverride = static_cast<float>(arguments[0].toDouble());
+ webview()->setInitialPageScaleOverride(pageScaleOverride);
+ result->setNull();
+}
+
+void EventSender::setPageScaleFactor(const CppArgumentList& arguments, CppVariant* result)
{
if (arguments.size() < 3 || !arguments[0].isNumber() || !arguments[1].isNumber() || !arguments[2].isNumber())
return;

Powered by Google App Engine
This is Rietveld 408576698