Changeset 153913 in webkit

Timestamp:

Aug 9, 2013 4:25:11 PM (11 years ago)

Author:

ap@apple.com

Message:

REGRESSION (r142755): window.open creates an invisible window when width and height are 0
​https://bugs.webkit.org/show_bug.cgi?id=119633

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/dom/Window/open-zero-size-as-default.html

Relying on each WebKit to refuse setting size to zero was fragile - because this
required each one to have the check, and because by the time the client was called,
the initially zero size was not necessarily zero.

• loader/FrameLoader.cpp: (WebCore::createWindow): When sizes are zero, keep the

size the window was created with, because that's the default one by definition.

• page/DOMWindow.cpp: (WebCore::DOMWindow::adjustWindowRect): It's too late to

check for zero size now, it's been mangled to adjust for the difference between
window and viewport size.

Source/WebKit/efl:

• WebCoreSupport/ChromeClientEfl.cpp: (WebCore::ChromeClientEfl::setWindowRect):

Once again, the passed rect cannot be empty.

Source/WebKit/gtk:

• WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::setWindowRect):

Once again, the passed rect cannot be empty.

LayoutTests:

• fast/dom/Window/open-zero-size-as-default-expected.txt: Added.
• fast/dom/Window/open-zero-size-as-default.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Window/open-zero-size-as-default-expected.txt (added)
• LayoutTests/fast/dom/Window/open-zero-size-as-default.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• Source/WebCore/page/DOMWindow.cpp (modified) (1 diff)
• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-09  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r142755): window.open creates an invisible window when width and height are 0
+        https://bugs.webkit.org/show_bug.cgi?id=119633
+
+        Reviewed by Darin Adler.
+
+        * fast/dom/Window/open-zero-size-as-default-expected.txt: Added.
+        * fast/dom/Window/open-zero-size-as-default.html: Added.
+
 2013-08-09  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-09  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r142755): window.open creates an invisible window when width and height are 0
+        https://bugs.webkit.org/show_bug.cgi?id=119633
+
+        Reviewed by Darin Adler.
+
+        Test: fast/dom/Window/open-zero-size-as-default.html
+
+        Relying on each WebKit to refuse setting size to zero was fragile - because this
+        required each one to have the check, and because by the time the client was called,
+        the initially zero size was not necessarily zero.
+
+        * loader/FrameLoader.cpp: (WebCore::createWindow): When sizes are zero, keep the
+        size the window was created with, because that's the default one by definition.
+
+        * page/DOMWindow.cpp: (WebCore::DOMWindow::adjustWindowRect): It's too late to
+        check for zero size now, it's been mangled to adjust for the difference between
+        window and viewport size.
+
 2013-08-09  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -3453 +3453 @@
     if (features.ySet)
         windowRect.setY(features.y);
-    if (features.widthSet)
+    // Zero width and height mean using default size, not minumum one.
+    if (features.widthSet && features.width)
         windowRect.setWidth(features.width + (windowRect.width() - viewportSize.width()));
-    if (features.heightSet)
+    if (features.heightSet && features.height)
         windowRect.setHeight(features.height + (windowRect.height() - viewportSize.height()));
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -341 +341 @@
 
     FloatSize minimumSize = page->chrome().client()->minimumWindowSize();
-    // 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()));
+    window.setWidth(min(max(minimumSize.width(), window.width()), screen.width()));
+    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-08-09  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r142755): window.open creates an invisible window when width and height are 0
+        https://bugs.webkit.org/show_bug.cgi?id=119633
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/ChromeClientEfl.cpp: (WebCore::ChromeClientEfl::setWindowRect):
+        Once again, the passed rect cannot be empty.
+
 2013-07-27  Mark Rowe  <mrowe@apple.com>
 

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) || rect.isEmpty())
+    if (!ewk_view_setting_enable_auto_resize_window_get(m_view))
         return;
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-08-09  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r142755): window.open creates an invisible window when width and height are 0
+        https://bugs.webkit.org/show_bug.cgi?id=119633
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::setWindowRect):
+        Once again, the passed rect cannot be empty.
+
 2013-07-27  Mark Rowe  <mrowe@apple.com>
 

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

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