Changeset 110098 in webkit

Timestamp:

Mar 7, 2012 1:43:37 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Authentication dialog does not work
​https://bugs.webkit.org/show_bug.cgi?id=79738

Patch by Dinu Jacob <​dinu.jacob@nokia.com> on 2012-03-07
Reviewed by Simon Hausmann.

QQuickWebView should accept touch events only if there is
no active dialog.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::QQuickWebViewPrivate):
(QQuickWebViewPrivate::runJavaScriptAlert):
(QQuickWebViewPrivate::runJavaScriptConfirm):
(QQuickWebViewPrivate::runJavaScriptPrompt):
(QQuickWebViewPrivate::handleAuthenticationRequiredRequest):
(QQuickWebViewPrivate::handleProxyAuthenticationRequiredRequest):
(QQuickWebViewPrivate::handleCertificateVerificationRequest):
(QQuickWebView::touchEvent):

• UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (8 diffs)
• UIProcess/API/qt/qquickwebview_p_p.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-07  Dinu Jacob  <dinu.jacob@nokia.com>
+
+        [Qt] Authentication dialog does not work
+        https://bugs.webkit.org/show_bug.cgi?id=79738
+
+        Reviewed by Simon Hausmann.
+
+        QQuickWebView should accept touch events only if there is
+        no active dialog.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::QQuickWebViewPrivate):
+        (QQuickWebViewPrivate::runJavaScriptAlert):
+        (QQuickWebViewPrivate::runJavaScriptConfirm):
+        (QQuickWebViewPrivate::runJavaScriptPrompt):
+        (QQuickWebViewPrivate::handleAuthenticationRequiredRequest):
+        (QQuickWebViewPrivate::handleProxyAuthenticationRequiredRequest):
+        (QQuickWebViewPrivate::handleCertificateVerificationRequest):
+        (QQuickWebView::touchEvent):
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        (QQuickWebViewPrivate):
+
 2012-03-07  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -82 +82 @@
     , m_renderToOffscreenBuffer(false)
     , m_loadStartedSignalSent(false)
+    , m_dialogRunnerActive(false)
 {
     viewport->setFlags(QQuickItem::ItemClipsChildrenToShape);
@@ -268 +269 @@
 
     disableMouseEvents();
+    m_dialogRunnerActive = true;
+
     dialogRunner.exec();
+    m_dialogRunnerActive = false;
     enableMouseEvents();
 }
@@ -284 +288 @@
 
     disableMouseEvents();
+    m_dialogRunnerActive = true;
+
     dialogRunner.exec();
+    m_dialogRunnerActive = false;
     enableMouseEvents();
 
@@ -306 +313 @@
 
     disableMouseEvents();
+    m_dialogRunnerActive = true;
+
     dialogRunner.exec();
+    m_dialogRunnerActive = false;
     enableMouseEvents();
 
@@ -326 +336 @@
 
     disableMouseEvents();
+    m_dialogRunnerActive = true;
+
     dialogRunner.exec();
+    m_dialogRunnerActive = false;
     enableMouseEvents();
 
@@ -345 +358 @@
     setViewInAttachedProperties(dialogRunner.dialog());
     disableMouseEvents();
+    m_dialogRunnerActive = true;
+
     dialogRunner.exec();
+    m_dialogRunnerActive = false;
     enableMouseEvents();
 
@@ -365 +381 @@
 
     disableMouseEvents();
+    m_dialogRunnerActive = true;
+
     dialogRunner.exec();
+    m_dialogRunnerActive = false;
     enableMouseEvents();
 
@@ -1344 +1363 @@
 {
     Q_D(QQuickWebView);
+    if (d->m_dialogRunnerActive) {
+        event->ignore();
+        return;
+    }
+
     forceActiveFocus();
     d->pageView->eventHandler()->handleTouchEvent(event);

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h

@@ -164 +164 @@
     bool m_renderToOffscreenBuffer;
     bool m_loadStartedSignalSent;
+    bool m_dialogRunnerActive;
     QUrl m_iconURL;
     QUrl m_deferedUrlToLoad;