Index: Source/testing/runner/EventSender.cpp |
diff --git a/Source/testing/runner/EventSender.cpp b/Source/testing/runner/EventSender.cpp |
index b56a6e10349d26bc1c54be26108cb8571b9efb1b..019cfdc57fb5813390f723e97cc39a4e8b94e917 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()->setInitialPageScaleOverride(-1); |
aelias_OOO_until_Jul13
2013/08/06 17:17:46
Could you change this to webview()->setPageScaleFa
wjmaclean
2013/08/07 00:41:11
Done.
|
webview()->setPageScaleFactor(scaleFactor, WebPoint(x, y)); |
result->setNull(); |
} |