[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 13:20:39 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f884d98bcf21b2508843d92ea6194b6055a8f702
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Sep 12 02:15:59 2010 +0000
Fix zoom related tests when testing WebKit2.
Reviewed by Maciej Stachowiak.
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
(WTR::EventSendingController::zoomPageIn): Zoom in and zoom out are not the same.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67314 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 558022c..ccd6868 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,14 @@
2010-09-11 Sam Weinig <sam at webkit.org>
+ Reviewed by Maciej Stachowiak.
+
+ Fix zoom related tests when testing WebKit2.
+
+ * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+ (WTR::EventSendingController::zoomPageIn): Zoom in and zoom out are not the same.
+
+2010-09-11 Sam Weinig <sam at webkit.org>
+
Reviewed by Dan Bernstein.
Implement WebKit2 callback equivalent to - [WebUIDelegate webView:setStatusText:]
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp
index 9e8fc63..73de45b 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp
@@ -114,7 +114,7 @@ void EventSendingController::zoomPageIn()
WKBundlePageSetTextZoomFactor(InjectedBundle::shared().page()->page(), 1);
double zoomFactor = WKBundlePageGetPageZoomFactor(InjectedBundle::shared().page()->page());
- WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor / ZoomMultiplierRatio);
+ WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor * ZoomMultiplierRatio);
}
void EventSendingController::zoomPageOut()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list