Title: [110553] trunk/Source/WebKit2
- Revision
- 110553
- Author
- [email protected]
- Date
- 2012-03-13 05:24:56 -0700 (Tue, 13 Mar 2012)
Log Message
[Qt] Set correct device width and height.
https://bugs.webkit.org/show_bug.cgi?id=80980
Patch by Allan Sandfeld Jensen <[email protected]> on 2012-03-13
Reviewed by Tor Arne Vestbø.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::computeViewportConstraints):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (110552 => 110553)
--- trunk/Source/WebKit2/ChangeLog 2012-03-13 10:00:50 UTC (rev 110552)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-13 12:24:56 UTC (rev 110553)
@@ -1,3 +1,13 @@
+2012-03-13 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Set correct device width and height.
+ https://bugs.webkit.org/show_bug.cgi?id=80980
+
+ Reviewed by Tor Arne Vestbø.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewFlickablePrivate::computeViewportConstraints):
+
2012-03-12 Sam Weinig <[email protected]>
Fix typo in PageClientImpl where we were overriding viewLayerHostingMode with
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (110552 => 110553)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-03-13 10:00:50 UTC (rev 110552)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-03-13 12:24:56 UTC (rev 110553)
@@ -735,11 +735,12 @@
WebPreferences* wkPrefs = webPageProxy->pageGroup()->preferences();
- // FIXME: Remove later; Hardcode some values for now to make sure the DPI adjustment is being tested.
+ // FIXME: Remove later; Hardcode a value for now to make sure the DPI adjustment is being tested.
wkPrefs->setDeviceDPI(240);
- wkPrefs->setDeviceWidth(480);
- wkPrefs->setDeviceHeight(720);
+ wkPrefs->setDeviceWidth(availableSize.width());
+ wkPrefs->setDeviceHeight(availableSize.height());
+
int minimumLayoutFallbackWidth = qMax<int>(wkPrefs->layoutFallbackWidth(), availableSize.width());
WebCore::ViewportAttributes attr = WebCore::computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, wkPrefs->deviceWidth(), wkPrefs->deviceHeight(), wkPrefs->deviceDPI(), availableSize);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
