Title: [89663] trunk/Tools
- Revision
- 89663
- Author
- [email protected]
- Date
- 2011-06-24 03:42:54 -0700 (Fri, 24 Jun 2011)
Log Message
2011-06-23 MORITA Hajime <[email protected]>
Reviewed by Kent Tamura.
[Chromium] Invalid write inside WebKit::FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld
https://bugs.webkit.org/show_bug.cgi?id=63216
Deleted m_webViewHost which looks leaked.
* DumpRenderTree/chromium/TestShell.h:
* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::~TestShell):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89662 => 89663)
--- trunk/Tools/ChangeLog 2011-06-24 10:39:29 UTC (rev 89662)
+++ trunk/Tools/ChangeLog 2011-06-24 10:42:54 UTC (rev 89663)
@@ -1,3 +1,16 @@
+2011-06-23 MORITA Hajime <[email protected]>
+
+ Reviewed by Kent Tamura.
+
+ [Chromium] Invalid write inside WebKit::FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld
+ https://bugs.webkit.org/show_bug.cgi?id=63216
+
+ Deleted m_webViewHost which looks leaked.
+
+ * DumpRenderTree/chromium/TestShell.h:
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::~TestShell):
+
2011-06-24 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix WebKit2 GTK build.
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (89662 => 89663)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2011-06-24 10:39:29 UTC (rev 89662)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2011-06-24 10:42:54 UTC (rev 89663)
@@ -138,7 +138,7 @@
void TestShell::createMainWindow()
{
m_drtDevToolsAgent = adoptPtr(new DRTDevToolsAgent);
- m_webViewHost = createNewWindow(WebURL(), m_drtDevToolsAgent.get());
+ m_webViewHost = adoptPtr(createNewWindow(WebURL(), m_drtDevToolsAgent.get()));
m_webView = m_webViewHost->webView();
m_drtDevToolsAgent->setWebView(m_webView);
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (89662 => 89663)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2011-06-24 10:39:29 UTC (rev 89662)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2011-06-24 10:42:54 UTC (rev 89663)
@@ -87,7 +87,7 @@
// The main WebView.
WebKit::WebView* webView() const { return m_webView; }
// Returns the host for the main WebView.
- WebViewHost* webViewHost() const { return m_webViewHost; }
+ WebViewHost* webViewHost() const { return m_webViewHost.get(); }
LayoutTestController* layoutTestController() const { return m_layoutTestController.get(); }
EventSender* eventSender() const { return m_eventSender.get(); }
AccessibilityController* accessibilityController() const { return m_accessibilityController.get(); }
@@ -192,8 +192,8 @@
WebKit::WebView* m_webView;
WebKit::WebWidget* m_focusedWidget;
bool m_testShellMode;
- WebViewHost* m_webViewHost;
WebViewHost* m_devTools;
+ OwnPtr<WebViewHost> m_webViewHost;
OwnPtr<WebPermissions> m_webPermissions;
OwnPtr<DRTDevToolsAgent> m_drtDevToolsAgent;
OwnPtr<DRTDevToolsClient> m_drtDevToolsClient;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
