<!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>[178383] 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/178383">178383</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-13 15:32:42 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stub out more of the process lifetime tracker code
https://bugs.webkit.org/show_bug.cgi?id=140411
Reviewed by Sam Weinig.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::connectionWillOpen):
(WebKit::WebPageProxy::connectionWillClose):
* UIProcess/WebProcessLifetimeTracker.cpp:
(WebKit::WebProcessLifetimeTracker::connectionWillOpen):
(WebKit::WebProcessLifetimeTracker::connectionWillClose):
(WebKit::WebProcessLifetimeTracker::pageWasInvalidated):
* UIProcess/WebProcessLifetimeTracker.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessVisitedLinkProviderh">trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</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 (178382 => 178383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-13 23:28:24 UTC (rev 178382)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-13 23:32:42 UTC (rev 178383)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-13 Anders Carlsson <andersca@apple.com>
+
+ Stub out more of the process lifetime tracker code
+ https://bugs.webkit.org/show_bug.cgi?id=140411
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::close):
+ (WebKit::WebPageProxy::connectionWillOpen):
+ (WebKit::WebPageProxy::connectionWillClose):
+ * UIProcess/WebProcessLifetimeTracker.cpp:
+ (WebKit::WebProcessLifetimeTracker::connectionWillOpen):
+ (WebKit::WebProcessLifetimeTracker::connectionWillClose):
+ (WebKit::WebProcessLifetimeTracker::pageWasInvalidated):
+ * UIProcess/WebProcessLifetimeTracker.h:
+
</ins><span class="cx"> 2015-01-13 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Unreviewed build fix after r178366.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h (178382 => 178383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2015-01-13 23:28:24 UTC (rev 178382)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2015-01-13 23:32:42 UTC (rev 178383)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "VisitedLinkTable.h"
</span><ins>+#include "WebProcessLifetimeObserver.h"
</ins><span class="cx"> #include <WebCore/LinkHash.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -39,7 +40,7 @@
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> class WebProcessProxy;
</span><span class="cx">
</span><del>-class VisitedLinkProvider : public RefCounted<VisitedLinkProvider>, private IPC::MessageReceiver {
</del><ins>+class VisitedLinkProvider : public RefCounted<VisitedLinkProvider>, private IPC::MessageReceiver, public WebProcessLifetimeObserver {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<VisitedLinkProvider> create();
</span><span class="cx"> ~VisitedLinkProvider();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178382 => 178383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-13 23:28:24 UTC (rev 178382)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-13 23:32:42 UTC (rev 178383)
</span><span class="lines">@@ -715,6 +715,8 @@
</span><span class="cx"> m_process->processPool().supplement<WebNotificationManagerProxy>()->clearNotifications(this);
</span><span class="cx">
</span><span class="cx"> m_websiteDataStore->removeWebPage(*this);
</span><ins>+
+ m_webProcessLifetimeTracker.pageWasInvalidated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageProxy::tryClose()
</span><span class="lines">@@ -3199,6 +3201,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(connection == m_process->connection());
</span><span class="cx">
</span><ins>+ m_webProcessLifetimeTracker.connectionWillOpen();
</ins><span class="cx"> m_process->processPool().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, connection);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3206,6 +3209,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(connection, connection == m_process->connection());
</span><span class="cx">
</span><ins>+ m_webProcessLifetimeTracker.connectionWillClose();
</ins><span class="cx"> m_process->processPool().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessLifetimeTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp (178382 => 178383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp 2015-01-13 23:28:24 UTC (rev 178382)
+++ trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp 2015-01-13 23:32:42 UTC (rev 178383)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebProcessLifetimeTracker.h"
</span><span class="cx">
</span><ins>+#include "WebProcessProxy.h"
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> WebProcessLifetimeTracker::WebProcessLifetimeTracker(WebPageProxy& webPageProxy)
</span><span class="lines">@@ -52,4 +54,23 @@
</span><span class="cx"> m_observers.remove(&observer);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessLifetimeTracker::connectionWillOpen()
+{
+ ASSERT(m_webPageProxy.process().state() == WebProcessProxy::State::Running);
+
+ // FIXME: Notify the observers.
</ins><span class="cx"> }
</span><ins>+
+void WebProcessLifetimeTracker::connectionWillClose()
+{
+ ASSERT(m_webPageProxy.process().state() == WebProcessProxy::State::Running);
+
+ // FIXME: Notify the observers.
+}
+
+void WebProcessLifetimeTracker::pageWasInvalidated()
+{
+ // FIXME: Notify the observers if the process is currently running.
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessLifetimeTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h (178382 => 178383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h 2015-01-13 23:28:24 UTC (rev 178382)
+++ trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h 2015-01-13 23:32:42 UTC (rev 178383)
</span><span class="lines">@@ -41,6 +41,11 @@
</span><span class="cx"> void addObserver(WebProcessLifetimeObserver&);
</span><span class="cx"> void removeObserver(WebProcessLifetimeObserver&);
</span><span class="cx">
</span><ins>+ void connectionWillOpen();
+ void connectionWillClose();
+
+ void pageWasInvalidated();
+
</ins><span class="cx"> private:
</span><span class="cx"> WebPageProxy& m_webPageProxy;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>