[webkit-changes] [119578] trunk

Wed, 06 Jun 2012 03:13:04 -0700

Title: [119578] trunk
Revision
119578
Author
commit-qu...@webkit.org
Date
2012-06-06 03:12:40 -0700 (Wed, 06 Jun 2012)

Log Message

[Qt][WK2] Add preferredMinimumContentsWidth to the viewport info in MiniBrowser.
https://bugs.webkit.org/show_bug.cgi?id=88327

Patch by Michael Brüning <michael.brun...@nokia.com> on 2012-06-06
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewExperimental::setPreferredMinimumContentsWidth):
* UIProcess/API/qt/qquickwebview_p.h:

Tools:

* MiniBrowser/qt/MiniBrowser.qrc: Added contents_width.png.
* MiniBrowser/qt/icons/contents_width.png: Added.
* MiniBrowser/qt/qml/BrowserWindow.qml: Added button for toggling preferredMinimumContentsWidth.
* MiniBrowser/qt/qml/ViewportInfoItem.qml: Added display of preferredMinimumContentsWidth.

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (119577 => 119578)


--- trunk/Source/WebKit2/ChangeLog	2012-06-06 10:04:20 UTC (rev 119577)
+++ trunk/Source/WebKit2/ChangeLog	2012-06-06 10:12:40 UTC (rev 119578)
@@ -1,3 +1,14 @@
+2012-06-06  Michael Brüning  <michael.brun...@nokia.com>
+
+        [Qt][WK2] Add preferredMinimumContentsWidth to the viewport info in MiniBrowser.
+        https://bugs.webkit.org/show_bug.cgi?id=88327
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewExperimental::setPreferredMinimumContentsWidth):
+        * UIProcess/API/qt/qquickwebview_p.h:
+
 2012-06-06  Tim Horton  <timothy_hor...@apple.com>
 
         WebPage::windowIsVisible is incorrect during resumePainting

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (119577 => 119578)


--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-06-06 10:04:20 UTC (rev 119577)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-06-06 10:12:40 UTC (rev 119578)
@@ -961,7 +961,13 @@
 void QQuickWebViewExperimental::setPreferredMinimumContentsWidth(int width)
 {
     Q_D(QQuickWebView);
-    d->webPageProxy->pageGroup()->preferences()->setLayoutFallbackWidth(width);
+    WebPreferences* webPreferences = d->webPageProxy->pageGroup()->preferences();
+
+    if (width == webPreferences->layoutFallbackWidth())
+        return;
+
+    webPreferences->setLayoutFallbackWidth(width);
+    emit preferredMinimumContentsWidthChanged();
 }
 
 void QQuickWebViewExperimental::setFlickableViewportEnabled(bool enable)

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (119577 => 119578)


--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-06-06 10:04:20 UTC (rev 119577)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-06-06 10:12:40 UTC (rev 119578)
@@ -248,7 +248,7 @@
 
     Q_PROPERTY(bool transparentBackground WRITE setTransparentBackground READ transparentBackground)
     Q_PROPERTY(bool useDefaultContentItemSize WRITE setUseDefaultContentItemSize READ useDefaultContentItemSize)
-    Q_PROPERTY(int preferredMinimumContentsWidth WRITE setPreferredMinimumContentsWidth READ preferredMinimumContentsWidth)
+    Q_PROPERTY(int preferredMinimumContentsWidth WRITE setPreferredMinimumContentsWidth READ preferredMinimumContentsWidth NOTIFY preferredMinimumContentsWidthChanged)
 
     Q_PROPERTY(QWebNavigationHistory* navigationHistory READ navigationHistory CONSTANT FINAL)
     Q_PROPERTY(QQmlComponent* alertDialog READ alertDialog WRITE setAlertDialog NOTIFY alertDialogChanged)
@@ -354,6 +354,7 @@
     void enterFullScreenRequested();
     void exitFullScreenRequested();
     void userScriptsChanged();
+    void preferredMinimumContentsWidthChanged();
 
 private:
     QQuickWebView* q_ptr;

Modified: trunk/Tools/ChangeLog (119577 => 119578)


--- trunk/Tools/ChangeLog	2012-06-06 10:04:20 UTC (rev 119577)
+++ trunk/Tools/ChangeLog	2012-06-06 10:12:40 UTC (rev 119578)
@@ -1,3 +1,15 @@
+2012-06-06  Michael Brüning  <michael.brun...@nokia.com>
+
+        [Qt][WK2] Add preferredMinimumContentsWidth to the viewport info in MiniBrowser.
+        https://bugs.webkit.org/show_bug.cgi?id=88327
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * MiniBrowser/qt/MiniBrowser.qrc: Added contents_width.png.
+        * MiniBrowser/qt/icons/contents_width.png: Added.
+        * MiniBrowser/qt/qml/BrowserWindow.qml: Added button for toggling preferredMinimumContentsWidth.
+        * MiniBrowser/qt/qml/ViewportInfoItem.qml: Added display of preferredMinimumContentsWidth.
+
 2012-06-05  Jon Lee  <jon...@apple.com>
 
         Buildbot fix.

Modified: trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc (119577 => 119578)


--- trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc	2012-06-06 10:04:20 UTC (rev 119577)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc	2012-06-06 10:12:40 UTC (rev 119578)
@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>icons/checkbox_checked.png</file>
         <file>icons/checkbox_unchecked.png</file>
+        <file>icons/contents_width.png</file>
         <file>icons/favicon.png</file>
         <file>icons/folder.png</file>
         <file>icons/info.png</file>

Added: trunk/Tools/MiniBrowser/qt/icons/contents_width.png (0 => 119578)


--- trunk/Tools/MiniBrowser/qt/icons/contents_width.png	                        (rev 0)
+++ trunk/Tools/MiniBrowser/qt/icons/contents_width.png	2012-06-06 10:12:40 UTC (rev 119578)
@@ -0,0 +1,6 @@
+\x89PNG
+
+
+IHDRĴl;sRGB\xAE\xCE\xE9bKGD\xFF\xFF\xFF\xA0\xBD\xA7\x93	pHYs\x9A\x9CtIME\xDC
+\xCE\xED9\xB1IDAT8\xA6Y\xF8\xFF\xFF\xFF\xFF\xFF\xF8\xAA\xAA\xFF\xEF==\xFF\xF2__\xFF\xFC\xDA\xDA\xFF\xF9\xB8\xB8\xFF\xF0FF\xFF\xF0FF\xFF\xF9\xB9\xB9\xFF\xFC\xD8\xD8\xFF\xF1ZZ\xFF\xF1ZZ\xFF\xFC\xD8\xD8\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xEE99\xFF\xF9\xC3\xC3\xFF\xFA\xC4\xC4\xFF\xF2oo\xFF\xFF\xFF\xFF\xEE??\xFF\xF9\xC3\xC3\xFF\xF9\xC3\xC3\xFF\xEE@@\xFF\xFF\xFF\xFF\xF2ll\xFF\xF7\xA2\xA2\xFF\xF7\xA2\xA2\xFF\xF2mm\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFFbb\xF4qq11\xFD\xD5\xD5\xFC\xCD\xCD\x80\x80\xF7\x97\x97\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xF8\xB3\xB3\xFF\xEFDD\xFF\xFF\xFF\xFF\xFA\xC5\xC5\xFF\xEC''\xFF\xEC''\xFF\xFA\xC7\xC7\xFF\xFF\xFF\xFF\xEE99\xFF\xFD\xEC\xEC\xFF\xFD\xEC\xEC\xFF\xEE99\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFC\xDA\xDA\xFF\xF7\x9A\x9AJJ\xF4uu
+\x9C\x9C\xF4tt\xC4\xC433\xFA\xB6\xB644\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xEC  \xFF\xED33\xFF\xF5\x8A\x8A\xFF\xFD\xEE\xEED\xFF\xFF\xFF\xF6\x9C\x9C\xFF\xEE::\xFF\xEE::\xFF\xF6\x9C\x9C\xFF\xFF\xFF\xFF\xFB\xD6\xD6\xFF\xF0XX\xFF\xF0XX\xFF\xFB\xD6\xD6\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xC37>Z\x9A\x9A\xFF\xF5IEND\xAEB`\x82
\ No newline at end of file

Modified: trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml (119577 => 119578)


--- trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml	2012-06-06 10:04:20 UTC (rev 119577)
+++ trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml	2012-06-06 10:12:40 UTC (rev 119578)
@@ -192,6 +192,27 @@
             }
 
             Rectangle {
+                id: preferredMininumContentsWidthButton
+                height: parent.height
+                width: height
+                color: "#efefef"
+                opacity: { webView.experimental.preferredMinimumContentsWidth === 0 ? 0.1 : 0.6 }
+                radius: 6
+
+                Image {
+                    anchors.centerIn: parent
+                    source: "../icons/contents_width.png"
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        webView.experimental.preferredMinimumContentsWidth = webView.experimental.preferredMinimumContentsWidth === 0 ? 980 : 0
+                    }
+                }
+            }
+
+            Rectangle {
                 id: touchEventsButton
                 height: parent.height
                 width: height
@@ -380,5 +401,6 @@
         }
         visible: false
         test : webView.experimental.test
+        preferredMinimumContentsWidth: webView.experimental.preferredMinimumContentsWidth
     }
 }

Modified: trunk/Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml (119577 => 119578)


--- trunk/Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml	2012-06-06 10:04:20 UTC (rev 119577)
+++ trunk/Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml	2012-06-06 10:12:40 UTC (rev 119578)
@@ -3,6 +3,7 @@
 
 Rectangle {
     property var test
+    property var preferredMinimumContentsWidth
 
     color: "black"
     opacity: 0.8
@@ -73,8 +74,15 @@
             color: parent.fontColor
         }
         Text {
+            id: preferredMinimumContentsWidthLabel
+            anchors.top: layoutSizeLabel.bottom
+            text: "Preferred minimum contents width: " + preferredMinimumContentsWidth
+            font.family: parent.fontFamily
+            color: parent.fontColor
+        }
+        Text {
             id: scalableLabel
-            anchors.top: layoutSizeLabel.bottom
+            anchors.top: preferredMinimumContentsWidthLabel.bottom
             anchors.topMargin: 30
             text: "View " + (test.isScalable ? "is " : "is not " ) + "scalable."
             font.family: parent.fontFamily

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to