Commit eab3d6ec authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154735 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1a7337a9
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>
 
[Qt] Let Page create the main Frame.
......
......@@ -1485,8 +1485,17 @@ QWidget *QWebPage::view() const
void QWebPage::javaScriptConsoleMessage(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());
}
}
}
/*!
......
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>
[Qt][Wk2] Many tests are flaky on Qt 5.1
......
......@@ -159,15 +159,6 @@ WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment