Changeset 154735 in webkit

Timestamp:

Aug 28, 2013 5:32:33 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r154593.
​http://trac.webkit.org/changeset/154593
​https://bugs.webkit.org/show_bug.cgi?id=120403

Caused 50+ flaky tests on WebKit1 bots (Requested by carewolf
on #webkit).

Source/WebKit/qt:

• WidgetApi/qwebpage.cpp:

(QWebPage::javaScriptConsoleMessage):

Tools:

• DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebPage::~WebPage):

Location:

trunk

Files:

• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/WidgetApi/qwebpage.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2013-08-28  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154593.
+        http://trac.webkit.org/changeset/154593
+        https://bugs.webkit.org/show_bug.cgi?id=120403
+
+        Caused 50+ flaky tests on WebKit1 bots (Requested by carewolf
+        on #webkit).
+
+        * WidgetApi/qwebpage.cpp:
+        (QWebPage::javaScriptConsoleMessage):
+
 2013-08-27  Arunprasad Rajkumar  <arurajku@cisco.com>
 

trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp

@@ -1486 +1486 @@
 {
     Q_UNUSED(sourceID);
-    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 (QWebPageAdapter::drtRun) {
+        if (message == QLatin1String("PLUGIN: NPP_Destroy")) {
+            fprintf(stdout, "CONSOLE MESSAGE: ");
+            if (lineNumber)
+                fprintf(stdout, "line %d: ", lineNumber);
+            fprintf(stdout, "%s\n", message.toUtf8().constData());
+        }
+    }
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2013-08-28  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154593.
+        http://trac.webkit.org/changeset/154593
+        https://bugs.webkit.org/show_bug.cgi?id=120403
+
+        Caused 50+ flaky tests on WebKit1 bots (Requested by carewolf
+        on #webkit).
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebPage::~WebPage):
+
 2013-08-28  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -160 +160 @@
 WebPage::~WebPage()
 {
-    // Load an empty url to send the onunload event to the running page before
-    // deleting this instance.
-    // Prior to this fix the onunload event would be triggered from '~QWebPage', but
-    // it may call virtual functions (e.g. calling a window.alert from window.onunload)
-    // of 'QWebPage' as the 'WebPage' part of the vtable has already been unwinded.
-    // When in '~WebPage' the vtable of 'QWebPage' points to the derived
-    // class 'WebPage' and it's possible to receive 'QWebPage' virtual calls
-    // like javaScriptAlert, javaScriptConsoleMessage, ...etc.
-    mainFrame()->load(QUrl());
     delete m_webInspector;
 }