Changeset 142755 in webkit

Timestamp:

Feb 13, 2013 9:21:42 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] window.open passes height and width parameters even if not defined in a page
​https://bugs.webkit.org/show_bug.cgi?id=107705

Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Do not override width or height of 0, as that indicates default size, and not minimum size.

Tested by tst_qwebpage.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::adjustWindowRect):

Source/WebKit/efl:

Do not resize window when default size is requested.

• WebCoreSupport/ChromeClientEfl.cpp:

(WebCore::ChromeClientEfl::setWindowRect):

Source/WebKit/gtk:

Do not resize window when default size is requested.

• WebCoreSupport/ChromeClientGtk.cpp:

(WebKit::ChromeClient::setWindowRect):

Source/WebKit/qt:

Test that minimum size is applied only when the requested size is too small,
not when default is requested.

• tests/qwebpage/tst_qwebpage.cpp:

(tst_QWebPage):
(TestPage):
(TestPage::TestPage):
(TestPage::createWindow):
(TestPage::slotGeometryChangeRequested):
(tst_QWebPage::openWindowDefaultSize):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DOMWindow.cpp (modified) (1 diff)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-13  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] window.open passes height and width parameters even if not defined in a page
+        https://bugs.webkit.org/show_bug.cgi?id=107705
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Do not override width or height of 0, as that indicates default size, and not minimum size.
+
+        Tested by tst_qwebpage.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::adjustWindowRect):
+
 2013-02-13  Rashmi Shyamasundar  <rashmi.s2@samsung.com>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -342 +342 @@
 
     FloatSize minimumSize = page->chrome()->client()->minimumWindowSize();
-    window.setWidth(min(max(minimumSize.width(), window.width()), screen.width()));
-    window.setHeight(min(max(minimumSize.height(), window.height()), screen.height()));
+    // Let size 0 pass through, since that indicates default size, not minimum size.
+    if (window.width())
+        window.setWidth(min(max(minimumSize.width(), window.width()), screen.width()));
+    if (window.height())
+        window.setHeight(min(max(minimumSize.height(), window.height()), screen.height()));
 
     // Constrain the window position within the valid screen area.

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2013-02-13  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] window.open passes height and width parameters even if not defined in a page
+        https://bugs.webkit.org/show_bug.cgi?id=107705
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Do not resize window when default size is requested.
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::setWindowRect):
+
 2013-02-12  Huang Dongsung  <luxtella@company100.net>
 

trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -129 +129 @@
 void ChromeClientEfl::setWindowRect(const FloatRect& rect)
 {
-    if (!ewk_view_setting_enable_auto_resize_window_get(m_view))
+    if (!ewk_view_setting_enable_auto_resize_window_get(m_view) || rect.isEmpty())
         return;
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-02-13  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] window.open passes height and width parameters even if not defined in a page
+        https://bugs.webkit.org/show_bug.cgi?id=107705
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Do not resize window when default size is requested.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::setWindowRect):
+
 2013-02-13  Andrew Wilson  <atwilson@chromium.org>
 

trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -143 +143 @@
     if (widgetIsOnscreenToplevelWindow(window)) {
         gtk_window_move(GTK_WINDOW(window), intrect.x(), intrect.y());
-        gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height());
+        if (!intrect.isEmpty())
+            gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height());
     }
 }

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2013-02-13  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] window.open passes height and width parameters even if not defined in a page
+        https://bugs.webkit.org/show_bug.cgi?id=107705
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Test that minimum size is applied only when the requested size is too small,
+        not when default is requested.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage):
+        (TestPage):
+        (TestPage::TestPage):
+        (TestPage::createWindow):
+        (TestPage::slotGeometryChangeRequested):
+        (tst_QWebPage::openWindowDefaultSize):
+
 2013-02-12  Huang Dongsung  <luxtella@company100.net>
 

trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -187 +187 @@
     void loadSignalsOrder_data();
     void loadSignalsOrder();
+    void openWindowDefaultSize();
 
 #ifdef Q_OS_MAC
@@ -411 +412 @@
 }
 
-class TestPage : public QWebPage
-{
+class TestPage : public QWebPage {
+    Q_OBJECT
 public:
-    TestPage(QObject* parent = 0) : QWebPage(parent) {}
+    TestPage(QObject* parent = 0) : QWebPage(parent)
+    {
+        connect(this, SIGNAL(geometryChangeRequested(QRect)), this, SLOT(slotGeometryChangeRequested(QRect)));
+    }
 
     struct Navigation {
@@ -423 +427 @@
 
     QList<Navigation> navigations;
-    QList<QWebPage*> createdWindows;
+    QList<TestPage*> createdWindows;
+    QRect requestedGeometry;
 
     virtual bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest &request, NavigationType type) {
@@ -435 +440 @@
 
     virtual QWebPage* createWindow(WebWindowType) {
-        QWebPage* page = new TestPage(this);
+        TestPage* page = new TestPage(this);
         createdWindows.append(page);
         return page;
+    }
+
+private Q_SLOTS:
+    void slotGeometryChangeRequested(const QRect& geom) {
+        requestedGeometry = geom;
     }
 };
@@ -3253 +3263 @@
 }
 
+void tst_QWebPage::openWindowDefaultSize()
+{
+    TestPage page;
+    page.settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
+    // Open a default window.
+    page.mainFrame()->evaluateJavaScript("window.open()");
+    // Open a too small window.
+    page.mainFrame()->evaluateJavaScript("window.open('', '', 'width=10,height=10')");
+
+    QTest::qWait(500);
+    // The number of popups created should be two.
+    QVERIFY(page.createdWindows.size() == 2);
+
+    QRect requestedGeometry = page.createdWindows[0]->requestedGeometry;
+    // Check default size has been requested.
+    QVERIFY(requestedGeometry.width() == 0);
+    QVERIFY(requestedGeometry.height() == 0);
+
+    requestedGeometry = page.createdWindows[1]->requestedGeometry;
+    // Check minimum size has been requested.
+    QVERIFY(requestedGeometry.width() == 100);
+    QVERIFY(requestedGeometry.height() == 100);
+}
+
 QTEST_MAIN(tst_QWebPage)
 #include "tst_qwebpage.moc"