Changeset 58485 in webkit

Timestamp:

Apr 29, 2010 1:41:53 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] REGRESSION(r57982): tst_qwebpage::showModalDialog() crashes
​https://bugs.webkit.org/show_bug.cgi?id=38314

Reviewed by Tor Arne Vestbø.

Make sure that there's always a main frame when returning from createWindow()
to the caller in WebCore.

• WebCoreSupport/ChromeClientQt.cpp:

(WebCore::ChromeClientQt::createWindow):

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-04-29  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] REGRESSION(r57982): tst_qwebpage::showModalDialog() crashes
+        https://bugs.webkit.org/show_bug.cgi?id=38314
+
+        Make sure that there's always a main frame when returning from createWindow()
+        to the caller in WebCore.
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createWindow):
+
 2010-04-28  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -168 +168 @@
         return 0;
 
+    // A call to QWebPage::mainFrame() implicitly creates the main frame.
+    // Make sure it exists, as WebCore expects it when returning from this call.
+    QWebFrame* mainFrame = newPage->mainFrame();
+
     if (!request.isEmpty())
-        newPage->mainFrame()->load(request.resourceRequest().url());
+        mainFrame->load(request.resourceRequest().url());
     return newPage->d->page;
 }