[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
bweinstein at apple.com
bweinstein at apple.com
Wed Dec 22 18:33:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ee5f6a8aba032ffb337335e0eafc7ddba834f597
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 13 23:02:47 2010 +0000
WebKit2: Leaks a WebView when opening/closing Web Inspector on Windows
https://bugs.webkit.org/show_bug.cgi?id=50975
<rdar://problem/8763501>
Reviewed by Adam Roben.
Make m_inspectorView be a RefPtr<WebView>, instead of a WebView*.
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::WebInspectorProxy): If we are on Windows, include WebView.h.
* UIProcess/WebInspectorProxy.h: Change the type of m_inspectorView to a RefPtr<WebView>.
* UIProcess/win/WebInspectorProxyWin.cpp:
(WebKit::WebInspectorProxy::platformCreateInspectorPage): Remove the call to leakRef when creating the WebView.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73970 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1f382d6..220d7de 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-13 Brian Weinstein <bweinstein at apple.com>
+
+ Reviewed by Adam Roben.
+
+ WebKit2: Leaks a WebView when opening/closing Web Inspector on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=50975
+ <rdar://problem/8763501>
+
+ Make m_inspectorView be a RefPtr<WebView>, instead of a WebView*.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::WebInspectorProxy): If we are on Windows, include WebView.h.
+ * UIProcess/WebInspectorProxy.h: Change the type of m_inspectorView to a RefPtr<WebView>.
+ * UIProcess/win/WebInspectorProxyWin.cpp:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage): Remove the call to leakRef when creating the WebView.
+
2010-12-13 Anders Carlsson <andersca at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit2/UIProcess/WebInspectorProxy.cpp b/WebKit2/UIProcess/WebInspectorProxy.cpp
index 970305e..396d7d7 100644
--- a/WebKit2/UIProcess/WebInspectorProxy.cpp
+++ b/WebKit2/UIProcess/WebInspectorProxy.cpp
@@ -33,6 +33,10 @@
#include "WebProcessProxy.h"
#include "WebPageGroup.h"
+#if PLATFORM(WIN)
+#include "WebView.h"
+#endif
+
#define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
#include "NotImplemented.h"
@@ -55,7 +59,6 @@ WebInspectorProxy::WebInspectorProxy(WebPageProxy* page)
, m_isProfilingPage(false)
#if PLATFORM(WIN)
, m_inspectorWindow(0)
- , m_inspectorView(0)
#endif
{
}
diff --git a/WebKit2/UIProcess/WebInspectorProxy.h b/WebKit2/UIProcess/WebInspectorProxy.h
index ecedade..cc0725a 100644
--- a/WebKit2/UIProcess/WebInspectorProxy.h
+++ b/WebKit2/UIProcess/WebInspectorProxy.h
@@ -32,6 +32,7 @@
#include "Connection.h"
#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
+#include <wtf/RefPtr.h>
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
@@ -147,7 +148,7 @@ private:
RetainPtr<WebInspectorProxyObjCAdapter> m_inspectorProxyObjCAdapter;
#elif PLATFORM(WIN)
HWND m_inspectorWindow;
- WebView* m_inspectorView;
+ RefPtr<WebView> m_inspectorView;
#endif
};
diff --git a/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp b/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
index 42a41e5..ad19c53 100644
--- a/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
+++ b/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
@@ -152,7 +152,7 @@ WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
ASSERT(!m_inspectorWindow);
RECT emptyRect = {0};
- m_inspectorView = WebView::createForAssociatedPage(emptyRect, m_page, inspectorPageGroup(), 0).leakRef();
+ m_inspectorView = WebView::createForAssociatedPage(emptyRect, m_page, inspectorPageGroup(), 0);
return m_inspectorView->page();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list