Changeset 54550 in webkit

Timestamp:

Feb 9, 2010 7:55:06 AM (14 years ago)

Author:

yael.aharon@nokia.com

Message:

[Qt] Webkit in Qt does not have window.showModalDialog
​https://bugs.webkit.org/show_bug.cgi?id=25585

Reviewed by Kenneth Rohde Christiansen.

WebKit/qt:

Create a new eventloop when runModal() is called.
Added comemnt in QWebPage::createWindow that the application is responsible
for setting the modality of the appropriate window.

• Api/qwebpage.cpp:
• WebCoreSupport/ChromeClientQt.cpp:
• WebCoreSupport/ChromeClientQt.h:

WebKitTools:

Set the modality flag when createWindow is called with window type WebWindowDialog.

• QtLauncher/main.cpp:

Location:

trunk

Files:

• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (5 diffs)
• WebKit/qt/WebCoreSupport/ChromeClientQt.h (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/QtLauncher/main.cpp (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1956 +1956 @@
     the request to QWebView's createWindow() function; otherwise it returns a null pointer.
 
+    If \a type is WebModalDialog, the application must call setWindowModality(Qt::ApplicationModal) on the new window.
+
     \sa acceptNavigationRequest()
 */

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-02-09  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Webkit in Qt does not have window.showModalDialog
+        https://bugs.webkit.org/show_bug.cgi?id=25585
+
+        Create a new eventloop when runModal() is called.
+        Added comemnt in QWebPage::createWindow that the application is responsible
+        for setting the modality of the appropriate window.
+
+        * Api/qwebpage.cpp:
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::ChromeClientQt):
+        (WebCore::ChromeClientQt::~ChromeClientQt):
+        (WebCore::ChromeClientQt::canRunModal):
+        (WebCore::ChromeClientQt::runModal):
+        * WebCoreSupport/ChromeClientQt.h:
+
 2010-01-19  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -45 +45 @@
 
 #include <qdebug.h>
+#include <qeventloop.h>
 #include <qtextdocument.h>
 #include <qtooltip.h>
@@ -63 +64 @@
 ChromeClientQt::ChromeClientQt(QWebPage* webPage)
     : m_webPage(webPage)
+    , m_eventLoop(0)
 {
     toolBarsVisible = statusBarVisible = menuBarVisible = true;
@@ -69 +71 @@
 ChromeClientQt::~ChromeClientQt()
 {
-
+    if (m_eventLoop)
+        m_eventLoop->exit();
 }
 
@@ -174 +177 @@
 bool ChromeClientQt::canRunModal()
 {
-    notImplemented();
-    return false;
+    return true;
 }
 
@@ -181 +183 @@
 void ChromeClientQt::runModal()
 {
-    notImplemented();
+    m_eventLoop = new QEventLoop();
+    QEventLoop* eventLoop = m_eventLoop;
+    m_eventLoop->exec();
+    delete eventLoop;
 }
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h

@@ -35 +35 @@
 #include "PlatformString.h"
 
+class QEventLoop;
 class QWebPage;
 
@@ -159 +160 @@
         bool statusBarVisible;
         bool menuBarVisible;
+        QEventLoop* m_eventLoop;
     };
 }

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-02-09  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Webkit in Qt does not have window.showModalDialog
+        https://bugs.webkit.org/show_bug.cgi?id=25585
+
+        Set the modality flag when createWindow is called with window type WebWindowDialog.
+
+        * QtLauncher/main.cpp:
+        (WebPage::createWindow):
+
 2010-02-09  Andras Becsi  <abecsi@webkit.org>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -521 +521 @@
 }
 
-QWebPage* WebPage::createWindow(QWebPage::WebWindowType)
+QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)
 {
     LauncherWindow* mw = new LauncherWindow;
+    if (type == WebModalDialog)
+        mw->setWindowModality(Qt::ApplicationModal);
     mw->show();
     return mw->page();