Title: [100835] trunk/Tools
- Revision
- 100835
- Author
- [email protected]
- Date
- 2011-11-18 18:25:54 -0800 (Fri, 18 Nov 2011)
Log Message
[chromium] Set min/max page scale factors when calling eventSender.scalePageBy to avoid clamping
https://bugs.webkit.org/show_bug.cgi?id=72778
Reviewed by Kenneth Russell.
Set the min/max page scale clamps when a test calls eventSender.scalePageBy() so that the scale isn't clamped.
* DumpRenderTree/chromium/EventSender.cpp:
(EventSender::scalePageBy):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100834 => 100835)
--- trunk/Tools/ChangeLog 2011-11-19 02:23:32 UTC (rev 100834)
+++ trunk/Tools/ChangeLog 2011-11-19 02:25:54 UTC (rev 100835)
@@ -1,3 +1,15 @@
+2011-11-18 James Robinson <[email protected]>
+
+ [chromium] Set min/max page scale factors when calling eventSender.scalePageBy to avoid clamping
+ https://bugs.webkit.org/show_bug.cgi?id=72778
+
+ Reviewed by Kenneth Russell.
+
+ Set the min/max page scale clamps when a test calls eventSender.scalePageBy() so that the scale isn't clamped.
+
+ * DumpRenderTree/chromium/EventSender.cpp:
+ (EventSender::scalePageBy):
+
2011-11-18 Scott Graham <[email protected]>
IDL changes for gamepad support
Modified: trunk/Tools/DumpRenderTree/chromium/EventSender.cpp (100834 => 100835)
--- trunk/Tools/DumpRenderTree/chromium/EventSender.cpp 2011-11-19 02:23:32 UTC (rev 100834)
+++ trunk/Tools/DumpRenderTree/chromium/EventSender.cpp 2011-11-19 02:25:54 UTC (rev 100835)
@@ -716,6 +716,9 @@
float scaleFactor = static_cast<float>(arguments[0].toDouble());
int x = arguments[1].toInt32();
int y = arguments[2].toInt32();
+ float minimumPageScaleFactor = min(webview()->minimumPageScaleFactor(), scaleFactor);
+ float maximumPageScaleFactor = max(webview()->maximumPageScaleFactor(), scaleFactor);
+ webview()->setPageScaleFactorLimits(minimumPageScaleFactor, maximumPageScaleFactor);
webview()->setPageScaleFactor(scaleFactor, WebPoint(x, y));
result->setNull();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
