Title: [154735] trunk
- Revision
- 154735
- Author
- [email protected]
- Date
- 2013-08-28 05:32:33 -0700 (Wed, 28 Aug 2013)
Log 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::_javascript_ConsoleMessage):
Tools:
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebPage::~WebPage):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (154734 => 154735)
--- trunk/Source/WebKit/qt/ChangeLog 2013-08-28 12:31:10 UTC (rev 154734)
+++ trunk/Source/WebKit/qt/ChangeLog 2013-08-28 12:32:33 UTC (rev 154735)
@@ -1,3 +1,15 @@
+2013-08-28 Commit Queue <[email protected]>
+
+ 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::_javascript_ConsoleMessage):
+
2013-08-27 Arunprasad Rajkumar <[email protected]>
[Qt] Let Page create the main Frame.
Modified: trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp (154734 => 154735)
--- trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp 2013-08-28 12:31:10 UTC (rev 154734)
+++ trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp 2013-08-28 12:32:33 UTC (rev 154735)
@@ -1485,8 +1485,17 @@
void QWebPage::_javascript_ConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
{
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());
+ }
+ }
}
/*!
Modified: trunk/Tools/ChangeLog (154734 => 154735)
--- trunk/Tools/ChangeLog 2013-08-28 12:31:10 UTC (rev 154734)
+++ trunk/Tools/ChangeLog 2013-08-28 12:32:33 UTC (rev 154735)
@@ -1,3 +1,15 @@
+2013-08-28 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
[Qt][Wk2] Many tests are flaky on Qt 5.1
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (154734 => 154735)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2013-08-28 12:31:10 UTC (rev 154734)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2013-08-28 12:32:33 UTC (rev 154735)
@@ -159,15 +159,6 @@
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 _javascript_Alert, _javascript_ConsoleMessage, ...etc.
- mainFrame()->load(QUrl());
delete m_webInspector;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
