Changeset 61433 in webkit

Timestamp:

Jun 18, 2010 2:01:07 PM (14 years ago)

Author:

robert@webkit.org

Message:

2010-06-18 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] pass plugins/open-and-close-window-with-plugin.html on Qt

Capture logDestroy messages from the test plugin. DRT's WebPage
is already destroyed by the time they are emitted.

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

Unskip:
plugins/open-and-close-window-with-plugin.html
plugins/geturlnotify-during-document-teardown.html

• platform/qt/Skipped:

2010-06-18 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] pass plugins/open-and-close-window-with-plugin.html on Qt

Capture logDestroy messages from the test plugin. DRT's WebPage
is already destroyed by the time they are emitted.

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

Unskip:
plugins/open-and-close-window-with-plugin.html
plugins/geturlnotify-during-document-teardown.html

• Api/qwebpage.cpp: (QWebPage::javaScriptConsoleMessage):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-18  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] pass plugins/open-and-close-window-with-plugin.html on Qt
+
+        Capture logDestroy messages from the test plugin. DRT's WebPage
+        is already destroyed by the time they are emitted.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33333
+
+        Unskip:
+        plugins/open-and-close-window-with-plugin.html
+        plugins/geturlnotify-during-document-teardown.html
+
+        * platform/qt/Skipped:
+
 2010-06-18  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -423 +423 @@
 # ---- https://bugs.webkit.org/show_bug.cgi?id=36721
 plugins/get-url-with-blank-target.html
-
-# plugin logdestroy message reaches destroyed webpage
-# ---- https://bugs.webkit.org/show_bug.cgi?id=33333
-plugins/open-and-close-window-with-plugin.html
-plugins/geturlnotify-during-document-teardown.html
 
 # ---- https://bugs.webkit.org/show_bug.cgi?id=36702

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1999 +1999 @@
 void QWebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
 {
-    Q_UNUSED(message)
-    Q_UNUSED(lineNumber)
     Q_UNUSED(sourceID)
+
+    // Catch plugin logDestroy message for LayoutTests/plugins/open-and-close-window-with-plugin.html
+    // At this point DRT's WebPage has already been destroyed
+    if (QWebPagePrivate::drtRun) {
+        if (message == "PLUGIN: NPP_Destroy")
+            fprintf (stdout, "CONSOLE MESSAGE: line %d: %s\n", lineNumber, message.toUtf8().constData());
+    }
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-06-18  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] pass plugins/open-and-close-window-with-plugin.html on Qt
+
+        Capture logDestroy messages from the test plugin. DRT's WebPage
+        is already destroyed by the time they are emitted.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33333
+
+        Unskip:
+        plugins/open-and-close-window-with-plugin.html
+        plugins/geturlnotify-during-document-teardown.html
+
+        * Api/qwebpage.cpp:
+        (QWebPage::javaScriptConsoleMessage):
+
 2010-06-18  Alexis Menard  <alexis.menard@nokia.com>