<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183179] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183179">183179</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-04-23 01:12:30 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] WebDiagnosticLoggingClient is leaking
https://bugs.webkit.org/show_bug.cgi?id=144089
<rdar://problem/19706214>
Reviewed by Darin Adler.
WebDiagnosticLoggingClient is leaking. It is constructed inside WebPage
constructor but there is no code destroying it.
This patch adds a new xxxDestroyed() virtual function to
DiagnosticLoggingClient and that is overriden in
WebDiagnosticLoggingClient to call "delete this". This is the same
pattern as for other WK2 clients (e.g. WebFrameLoaderClient,
WebProgressTrackerClient).
Source/WebCore:
* loader/EmptyClients.h:
* page/DiagnosticLoggingClient.h:
* page/MainFrame.cpp:
(WebCore::MainFrame::~MainFrame):
Source/WebKit2:
* WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
(WebKit::WebDiagnosticLoggingClient::mainFrameDestroyed):
* WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingClienth">trunk/Source/WebCore/page/DiagnosticLoggingClient.h</a></li>
<li><a href="#trunkSourceWebCorepageMainFramecpp">trunk/Source/WebCore/page/MainFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183178 => 183179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-23 07:57:57 UTC (rev 183178)
+++ trunk/Source/WebCore/ChangeLog 2015-04-23 08:12:30 UTC (rev 183179)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-04-23 Chris Dumez <cdumez@apple.com>
+
+ [WK2] WebDiagnosticLoggingClient is leaking
+ https://bugs.webkit.org/show_bug.cgi?id=144089
+ <rdar://problem/19706214>
+
+ Reviewed by Darin Adler.
+
+ WebDiagnosticLoggingClient is leaking. It is constructed inside WebPage
+ constructor but there is no code destroying it.
+
+ This patch adds a new xxxDestroyed() virtual function to
+ DiagnosticLoggingClient and that is overriden in
+ WebDiagnosticLoggingClient to call "delete this". This is the same
+ pattern as for other WK2 clients (e.g. WebFrameLoaderClient,
+ WebProgressTrackerClient).
+
+ * loader/EmptyClients.h:
+ * page/DiagnosticLoggingClient.h:
+ * page/MainFrame.cpp:
+ (WebCore::MainFrame::~MainFrame):
+
</ins><span class="cx"> 2015-04-22 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> CrashTracer: WebProcess at com.apple.WebCore: WebCore::toScriptElementIfPossible + 4
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (183178 => 183179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2015-04-23 07:57:57 UTC (rev 183178)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-04-23 08:12:30 UTC (rev 183179)
</span><span class="lines">@@ -634,6 +634,8 @@
</span><span class="cx"> virtual void logDiagnosticMessage(const String&, const String&, ShouldSample) override { }
</span><span class="cx"> virtual void logDiagnosticMessageWithResult(const String&, const String&, DiagnosticLoggingResultType, ShouldSample) override { }
</span><span class="cx"> virtual void logDiagnosticMessageWithValue(const String&, const String&, const String&, ShouldSample) override { }
</span><ins>+
+ virtual void mainFrameDestroyed() override { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void fillWithEmptyClients(PageConfiguration&);
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingClient.h (183178 => 183179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingClient.h 2015-04-23 07:57:57 UTC (rev 183178)
+++ trunk/Source/WebCore/page/DiagnosticLoggingClient.h 2015-04-23 08:12:30 UTC (rev 183179)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx"> virtual void logDiagnosticMessageWithResult(const String& message, const String& description, DiagnosticLoggingResultType, ShouldSample) = 0;
</span><span class="cx"> virtual void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value, ShouldSample) = 0;
</span><span class="cx">
</span><ins>+ virtual void mainFrameDestroyed() = 0;
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~DiagnosticLoggingClient() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepageMainFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MainFrame.cpp (183178 => 183179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MainFrame.cpp 2015-04-23 07:57:57 UTC (rev 183178)
+++ trunk/Source/WebCore/page/MainFrame.cpp 2015-04-23 08:12:30 UTC (rev 183179)
</span><span class="lines">@@ -58,6 +58,8 @@
</span><span class="cx">
</span><span class="cx"> MainFrame::~MainFrame()
</span><span class="cx"> {
</span><ins>+ if (m_diagnosticLoggingClient)
+ m_diagnosticLoggingClient->mainFrameDestroyed();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<MainFrame> MainFrame::create(Page& page, PageConfiguration& configuration)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183178 => 183179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-23 07:57:57 UTC (rev 183178)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-23 08:12:30 UTC (rev 183179)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-04-23 Chris Dumez <cdumez@apple.com>
+
+ [WK2] WebDiagnosticLoggingClient is leaking
+ https://bugs.webkit.org/show_bug.cgi?id=144089
+ <rdar://problem/19706214>
+
+ Reviewed by Darin Adler.
+
+ WebDiagnosticLoggingClient is leaking. It is constructed inside WebPage
+ constructor but there is no code destroying it.
+
+ This patch adds a new xxxDestroyed() virtual function to
+ DiagnosticLoggingClient and that is overriden in
+ WebDiagnosticLoggingClient to call "delete this". This is the same
+ pattern as for other WK2 clients (e.g. WebFrameLoaderClient,
+ WebProgressTrackerClient).
+
+ * WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
+ (WebKit::WebDiagnosticLoggingClient::mainFrameDestroyed):
+ * WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h:
+
</ins><span class="cx"> 2015-04-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [UNIX] Simplify the file descriptor handling in SharedMemory
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp (183178 => 183179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2015-04-23 07:57:57 UTC (rev 183178)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2015-04-23 08:12:30 UTC (rev 183179)
</span><span class="lines">@@ -71,4 +71,9 @@
</span><span class="cx"> m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithValue(message, description, value, shouldSample == WebCore::ShouldSample::Yes));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebDiagnosticLoggingClient::mainFrameDestroyed()
+{
+ delete this;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h (183178 => 183179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h 2015-04-23 07:57:57 UTC (rev 183178)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h 2015-04-23 08:12:30 UTC (rev 183179)
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx"> virtual void logDiagnosticMessageWithResult(const String& message, const String& description, WebCore::DiagnosticLoggingResultType, WebCore::ShouldSample) override;
</span><span class="cx"> virtual void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value, WebCore::ShouldSample) override;
</span><span class="cx">
</span><ins>+ virtual void mainFrameDestroyed() override;
+
</ins><span class="cx"> WebPage& m_page;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>