Title: [89802] trunk/Tools
- Revision
- 89802
- Author
- [email protected]
- Date
- 2011-06-27 01:07:18 -0700 (Mon, 27 Jun 2011)
Log Message
2011-06-27 Kent Tamura <[email protected]>
Reviewed by Hajime Morita.
[Chromium] WebViewHost should be destructed before LayoutTestController, etc.
https://bugs.webkit.org/show_bug.cgi?id=63427
~WebViewHost() navigates to about:blank, so it calls some
callbacks and LayoutTestController functions.
* DumpRenderTree/chromium/TestShell.h:
Move m_printer upper and move m_webViewHost lower.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89801 => 89802)
--- trunk/Tools/ChangeLog 2011-06-27 08:04:51 UTC (rev 89801)
+++ trunk/Tools/ChangeLog 2011-06-27 08:07:18 UTC (rev 89802)
@@ -1,3 +1,16 @@
+2011-06-27 Kent Tamura <[email protected]>
+
+ Reviewed by Hajime Morita.
+
+ [Chromium] WebViewHost should be destructed before LayoutTestController, etc.
+ https://bugs.webkit.org/show_bug.cgi?id=63427
+
+ ~WebViewHost() navigates to about:blank, so it calls some
+ callbacks and LayoutTestController functions.
+
+ * DumpRenderTree/chromium/TestShell.h:
+ Move m_printer upper and move m_webViewHost lower.
+
2011-06-27 Adam Barth <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (89801 => 89802)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2011-06-27 08:04:51 UTC (rev 89801)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2011-06-27 08:07:18 UTC (rev 89802)
@@ -193,7 +193,9 @@
WebKit::WebWidget* m_focusedWidget;
bool m_testShellMode;
WebViewHost* m_devTools;
- OwnPtr<WebViewHost> m_webViewHost;
+
+ // Be careful of the destruction order of the following objects.
+ OwnPtr<TestEventPrinter> m_printer;
OwnPtr<WebPermissions> m_webPermissions;
OwnPtr<DRTDevToolsAgent> m_drtDevToolsAgent;
OwnPtr<DRTDevToolsClient> m_drtDevToolsClient;
@@ -203,7 +205,8 @@
OwnPtr<PlainTextController> m_plainTextController;
OwnPtr<TextInputController> m_textInputController;
OwnPtr<NotificationPresenter> m_notificationPresenter;
- OwnPtr<TestEventPrinter> m_printer;
+ OwnPtr<WebViewHost> m_webViewHost;
+
TestParams m_params;
int m_timeout; // timeout value in millisecond
bool m_allowExternalPages;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
