<!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>[178514] trunk/Source/WebKit2</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/178514">178514</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 10:39:47 -0800 (Thu, 15 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>More work on the lifetime observer
https://bugs.webkit.org/show_bug.cgi?id=140500

Reviewed by Andreas Kling.

Add webPageWasAdded/webPageWasRemoved functions; these will be called first and last during the
lifetime of the web page. Also remove removeObserver since nobody is calling it.

* UIProcess/WebProcessLifetimeObserver.h:
(WebKit::WebProcessLifetimeObserver::webPageWasAdded):
(WebKit::WebProcessLifetimeObserver::webPageWasRemoved):
* UIProcess/WebProcessLifetimeTracker.cpp:
(WebKit::WebProcessLifetimeTracker::addObserver):
(WebKit::WebProcessLifetimeTracker::pageWasInvalidated):
(WebKit::WebProcessLifetimeTracker::removeObserver): Deleted.
* UIProcess/WebProcessLifetimeTracker.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessLifetimeObserverh">trunk/Source/WebKit2/UIProcess/WebProcessLifetimeObserver.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessLifetimeTrackercpp">trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessLifetimeTrackerh">trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178513 => 178514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-01-15 17:22:18 UTC (rev 178513)
+++ trunk/Source/WebKit2/ChangeLog        2015-01-15 18:39:47 UTC (rev 178514)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-15  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        More work on the lifetime observer
+        https://bugs.webkit.org/show_bug.cgi?id=140500
+
+        Reviewed by Andreas Kling.
+
+        Add webPageWasAdded/webPageWasRemoved functions; these will be called first and last during the
+        lifetime of the web page. Also remove removeObserver since nobody is calling it.
+
+        * UIProcess/WebProcessLifetimeObserver.h:
+        (WebKit::WebProcessLifetimeObserver::webPageWasAdded):
+        (WebKit::WebProcessLifetimeObserver::webPageWasRemoved):
+        * UIProcess/WebProcessLifetimeTracker.cpp:
+        (WebKit::WebProcessLifetimeTracker::addObserver):
+        (WebKit::WebProcessLifetimeTracker::pageWasInvalidated):
+        (WebKit::WebProcessLifetimeTracker::removeObserver): Deleted.
+        * UIProcess/WebProcessLifetimeTracker.h:
+
</ins><span class="cx"> 2015-01-14  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Don't pass an allowed connection when creating a session storage namespace
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessLifetimeObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessLifetimeObserver.h (178513 => 178514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessLifetimeObserver.h        2015-01-15 17:22:18 UTC (rev 178513)
+++ trunk/Source/WebKit2/UIProcess/WebProcessLifetimeObserver.h        2015-01-15 18:39:47 UTC (rev 178514)
</span><span class="lines">@@ -49,10 +49,14 @@
</span><span class="cx">     WTF::IteratorRange&lt;HashCountedSet&lt;WebProcessProxy*&gt;::const_iterator::Keys&gt; processes() const;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><ins>+    friend class WebProcessLifetimeTracker;
+
+    virtual void webPageWasAdded(WebPageProxy&amp;) { }
</ins><span class="cx">     virtual void webProcessWillOpenConnection(WebProcessProxy&amp;, IPC::Connection&amp;) { }
</span><span class="cx">     virtual void webPageWillOpenConnection(WebPageProxy&amp;, IPC::Connection&amp;) { }
</span><span class="cx">     virtual void webPageDidCloseConnection(WebPageProxy&amp;, IPC::Connection&amp;) { }
</span><span class="cx">     virtual void webProcessDidCloseConnection(WebProcessProxy&amp;, IPC::Connection&amp;) { }
</span><ins>+    virtual void webPageWasRemoved(WebPageProxy&amp;) { }
</ins><span class="cx"> 
</span><span class="cx">     HashCountedSet&lt;WebProcessProxy*&gt; m_processes;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessLifetimeTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp (178513 => 178514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp        2015-01-15 17:22:18 UTC (rev 178513)
+++ trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp        2015-01-15 18:39:47 UTC (rev 178514)
</span><span class="lines">@@ -46,17 +46,12 @@
</span><span class="cx"> 
</span><span class="cx">     m_observers.add(&amp;observer);
</span><span class="cx"> 
</span><ins>+    observer.webPageWasAdded(m_webPageProxy);
+
</ins><span class="cx">     if (processIsRunning())
</span><span class="cx">         observer.addWebPage(m_webPageProxy);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebProcessLifetimeTracker::removeObserver(WebProcessLifetimeObserver&amp; observer)
-{
-    ASSERT(m_observers.contains(&amp;observer));
-
-    m_observers.remove(&amp;observer);
-}
-
</del><span class="cx"> void WebProcessLifetimeTracker::connectionWillOpen()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(processIsRunning());
</span><span class="lines">@@ -78,8 +73,11 @@
</span><span class="cx">     if (!processIsRunning())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    for (auto&amp; observer : m_observers)
</del><ins>+    for (auto&amp; observer : m_observers) {
</ins><span class="cx">         observer-&gt;removeWebPage(m_webPageProxy);
</span><ins>+
+        observer-&gt;webPageWasRemoved(m_webPageProxy);
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool WebProcessLifetimeTracker::processIsRunning()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessLifetimeTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h (178513 => 178514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h        2015-01-15 17:22:18 UTC (rev 178513)
+++ trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h        2015-01-15 18:39:47 UTC (rev 178514)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx">     ~WebProcessLifetimeTracker();
</span><span class="cx"> 
</span><span class="cx">     void addObserver(WebProcessLifetimeObserver&amp;);
</span><del>-    void removeObserver(WebProcessLifetimeObserver&amp;);
</del><span class="cx"> 
</span><span class="cx">     void connectionWillOpen();
</span><span class="cx">     void connectionWillClose();
</span></span></pre>
</div>
</div>

</body>
</html>