Changeset 52152 in webkit

Timestamp:

Dec 15, 2009 8:17:46 AM (14 years ago)

Author:

zecke@webkit.org

Message:

[Qt] Fix JavaScript prompt behavior for empty/null strings.

​https://bugs.webkit.org/show_bug.cgi?id=30914

The patch is based on the work done by Gupta Manish.

In the default implementation of the JavaScript prompt
we are using a QInputDialog to get the text and this has
one quirk with regard to not entering any text.

In other WebKit ports and in Firefox an empty string is
returned but in the Qt case it is a null string.

Change the API documentation in QWebPage to mention we want to
have a non null string but do the fixup in the ChromeClientQt
to support existing code.

WebKit/qt:

• Api/qwebpage.cpp:

(QWebPage::javaScriptPrompt): Change API documentation

• WebCoreSupport/ChromeClientQt.cpp:

(WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString

WebCore:

• manual-tests/qt/java-script-prompt.html: Added.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/manual-tests/qt/java-script-prompt.html (added)
• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-14  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add manual test for JavaScript prompt corner case
+        https://bugs.webkit.org/show_bug.cgi?id=30914
+
+        The patch is based on the work done by Gupta Manish.
+
+        Verify behavior of the JavaScript prompt function. Currently
+        Qt is not behaving like other WebKit ports and Firefox in
+        regards to accepting the prompt but not entering a text.
+
+        * manual-tests/qt/java-script-prompt.html: Added.
+
 2009-12-15  Luiz Agostini  <luiz.agostini@openbossa.org>
 

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1855 +1855 @@
 
     If the prompt was cancelled by the user the implementation should return false; otherwise the
-    result should be written to \a result and true should be returned.
+    result should be written to \a result and true should be returned. If the prompt was not cancelled by the
+    user, the implementation should return true and the result string must not be null.
 
     The default implementation uses QInputDialog::getText.

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-12-14  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix JavaScript prompt behavior for empty/null strings.
+        https://bugs.webkit.org/show_bug.cgi?id=30914
+
+        The patch is based on the work done by Gupta Manish.
+
+        In the default implementation of the JavaScript prompt
+        we are using a QInputDialog to get the text and this has
+        one quirk with regard to not entering any text.
+
+        In other WebKit ports and in Firefox an empty string is
+        returned but in the Qt case it is a null string.
+
+        Change the API documentation in QWebPage to mention we want to
+        have a non null string but do the fixup in the ChromeClientQt
+        to support existing code.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::javaScriptPrompt): Change API documentation
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString
+
 2009-11-24  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -284 +284 @@
     FrameLoaderClientQt *fl = static_cast<FrameLoaderClientQt*>(f->loader()->client());
     bool rc = m_webPage->javaScriptPrompt(fl->webFrame(), (QString)message, (QString)defaultValue, &x);
-    result = x;
+
+    // Fix up a quirk in the QInputDialog class. If no input happened the string should be empty
+    // but it is null. See https://bugs.webkit.org/show_bug.cgi?id=30914.
+    if (rc && result.isNull())
+        result = String("");
+    else
+        result = x;
+
     return rc;
 }