Changeset 154593 in webkit
- Timestamp:
- Aug 26, 2013 3:07:28 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/qt/ChangeLog
r154558 r154593 1 2013-08-26 Arunprasad Rajkumar <arurajku@cisco.com> 2 3 [Qt] Remove the fix in QWebPage::javaScriptConsoleMessage introduced by (r61433) 4 https://bugs.webkit.org/show_bug.cgi?id=119791 5 6 Reviewed by Jocelyn Turcotte. 7 8 * WidgetApi/qwebpage.cpp: 9 (QWebPage::javaScriptConsoleMessage): Removed hack specific to DRT, introduced by 10 (r61433). 11 1 12 2013-08-24 Darin Adler <darin@apple.com> 2 13 -
trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp
r153751 r154593 1486 1486 { 1487 1487 Q_UNUSED(sourceID); 1488 1489 // Catch plugin logDestroy message for LayoutTests/plugins/open-and-close-window-with-plugin.html 1490 // At this point DRT's WebPage has already been destroyed 1491 if (QWebPageAdapter::drtRun) { 1492 if (message == QLatin1String("PLUGIN: NPP_Destroy")) { 1493 fprintf(stdout, "CONSOLE MESSAGE: "); 1494 if (lineNumber) 1495 fprintf(stdout, "line %d: ", lineNumber); 1496 fprintf(stdout, "%s\n", message.toUtf8().constData()); 1497 } 1498 } 1488 Q_UNUSED(lineNumber); 1489 Q_UNUSED(sourceID); 1499 1490 } 1500 1491 -
trunk/Tools/ChangeLog
r154592 r154593 1 2013-08-26 Arunprasad Rajkumar <arurajku@cisco.com> 2 3 [Qt] Remove the fix in QWebPage::javaScriptConsoleMessage introduced by (r61433) 4 https://bugs.webkit.org/show_bug.cgi?id=119791 5 6 Reviewed by Jocelyn Turcotte. 7 8 Load empty url to send onunload event to currently running page. onunload event is 9 mandatory for LayoutTests/plugins/open-and-close-window-with-plugin.html and 10 LayoutTests/plugins/geturlnotify-during-document-teardown.html. 11 12 * DumpRenderTree/qt/DumpRenderTreeQt.cpp: 13 (WebPage::~WebPage): 14 1 15 2013-08-26 Carlos Garcia Campos <cgarcia@igalia.com> 2 16 -
trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
r154444 r154593 160 160 WebPage::~WebPage() 161 161 { 162 // Load an empty url to send the onunload event to the running page before 163 // deleting this instance. 164 // Prior to this fix the onunload event would be triggered from '~QWebPage', but 165 // it may call virtual functions (e.g. calling a window.alert from window.onunload) 166 // of 'QWebPage' as the 'WebPage' part of the vtable has already been unwinded. 167 // When in '~WebPage' the vtable of 'QWebPage' points to the derived 168 // class 'WebPage' and it's possible to receive 'QWebPage' virtual calls 169 // like javaScriptAlert, javaScriptConsoleMessage, ...etc. 170 mainFrame()->load(QUrl()); 162 171 delete m_webInspector; 163 172 }
Note: See TracChangeset
for help on using the changeset viewer.