Changeset 89802 in webkit

Timestamp:

Jun 27, 2011 1:07:18 AM (13 years ago)

Author:

tkent@chromium.org

Message:

2011-06-27 Kent Tamura <​tkent@chromium.org>

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/TestShell.h (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-27  Kent Tamura  <tkent@chromium.org>
+
+        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  <abarth@webkit.org>
 

trunk/Tools/DumpRenderTree/chromium/TestShell.h

@@ -194 +194 @@
     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;
@@ -204 +206 @@
     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