<!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>[163644] 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/163644">163644</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 13:42:30 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify WebPreferences creation inside WebPageGroup
https://bugs.webkit.org/show_bug.cgi?id=128392
Reviewed by Andreas Kling.
Always create a WebPreferences object when creating the web page group.
This is another step towards letting WebPageProxy manage web preferences.
* UIProcess/WebPageGroup.cpp:
(WebKit::pageGroupData):
(WebKit::WebPageGroup::WebPageGroup):
(WebKit::WebPageGroup::~WebPageGroup):
(WebKit::WebPageGroup::setPreferences):
(WebKit::WebPageGroup::preferences):
* UIProcess/WebPageGroup.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageGroupcpp">trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageGrouph">trunk/Source/WebKit2/UIProcess/WebPageGroup.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163643 => 163644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-07 21:39:16 UTC (rev 163643)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-07 21:42:30 UTC (rev 163644)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-07 Anders Carlsson <andersca@apple.com>
+
+ Simplify WebPreferences creation inside WebPageGroup
+ https://bugs.webkit.org/show_bug.cgi?id=128392
+
+ Reviewed by Andreas Kling.
+
+ Always create a WebPreferences object when creating the web page group.
+ This is another step towards letting WebPageProxy manage web preferences.
+
+ * UIProcess/WebPageGroup.cpp:
+ (WebKit::pageGroupData):
+ (WebKit::WebPageGroup::WebPageGroup):
+ (WebKit::WebPageGroup::~WebPageGroup):
+ (WebKit::WebPageGroup::setPreferences):
+ (WebKit::WebPageGroup::preferences):
+ * UIProcess/WebPageGroup.h:
+
</ins><span class="cx"> 2014-02-07 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Reenable AppNap
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp (163643 => 163644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2014-02-07 21:39:16 UTC (rev 163643)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2014-02-07 21:42:30 UTC (rev 163644)
</span><span class="lines">@@ -65,25 +65,34 @@
</span><span class="cx"> return webPageGroupMap().get(pageGroupID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebPageGroup::WebPageGroup(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
</del><ins>+static WebPageGroupData pageGroupData(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
</ins><span class="cx"> {
</span><del>- m_data.pageGroupID = generatePageGroupID();
</del><ins>+ WebPageGroupData data;
</ins><span class="cx">
</span><ins>+ data.pageGroupID = generatePageGroupID();
+
</ins><span class="cx"> if (!identifier.isEmpty())
</span><del>- m_data.identifer = identifier;
</del><ins>+ data.identifer = identifier;
</ins><span class="cx"> else
</span><del>- m_data.identifer = m_data.identifer = makeString("__uniquePageGroupID-", String::number(m_data.pageGroupID));
</del><ins>+ data.identifer = makeString("__uniquePageGroupID-", String::number(data.pageGroupID));
</ins><span class="cx">
</span><del>- m_data.visibleToInjectedBundle = visibleToInjectedBundle;
- m_data.visibleToHistoryClient = visibleToHistoryClient;
-
</del><ins>+ data.visibleToInjectedBundle = visibleToInjectedBundle;
+ data.visibleToHistoryClient = visibleToHistoryClient;
+
+ return data;
+}
+
+WebPageGroup::WebPageGroup(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
+ : m_data(pageGroupData(identifier, visibleToInjectedBundle, visibleToHistoryClient))
+ , m_preferences(WebPreferences::create(m_data.identifer))
+{
+ m_preferences->addPageGroup(this);
</ins><span class="cx"> webPageGroupMap().set(m_data.pageGroupID, this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPageGroup::~WebPageGroup()
</span><span class="cx"> {
</span><del>- if (m_preferences)
- m_preferences->removePageGroup(this);
</del><ins>+ m_preferences->removePageGroup(this);
</ins><span class="cx"> webPageGroupMap().remove(pageGroupID());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,34 +111,18 @@
</span><span class="cx"> if (preferences == m_preferences)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_preferences) {
- m_preferences = preferences;
- m_preferences->addPageGroup(this);
</del><ins>+ m_preferences->removePageGroup(this);
+ m_preferences = preferences;
+ m_preferences->addPageGroup(this);
</ins><span class="cx">
</span><del>- for (auto& webPageProxy : m_pages)
- webPageProxy->setPreferences(*m_preferences);
- } else {
- m_preferences->removePageGroup(this);
- m_preferences = preferences;
- m_preferences->addPageGroup(this);
</del><ins>+ for (auto& webPageProxy : m_pages)
+ webPageProxy->setPreferences(*m_preferences);
</ins><span class="cx">
</span><del>- for (auto& webPageProxy : m_pages)
- webPageProxy->setPreferences(*m_preferences);
-
- preferencesDidChange();
- }
</del><ins>+ preferencesDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPreferences& WebPageGroup::preferences() const
</span><span class="cx"> {
</span><del>- if (!m_preferences) {
- if (!m_data.identifer.isNull())
- m_preferences = WebPreferences::create(m_data.identifer);
- else
- m_preferences = WebPreferences::create();
- m_preferences->addPageGroup(const_cast<WebPageGroup*>(this));
- }
-
</del><span class="cx"> return *m_preferences;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.h (163643 => 163644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2014-02-07 21:39:16 UTC (rev 163643)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2014-02-07 21:42:30 UTC (rev 163644)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> template<typename T> void sendToAllProcessesInGroup(const T&, uint64_t destinationID);
</span><span class="cx">
</span><span class="cx"> WebPageGroupData m_data;
</span><del>- mutable RefPtr<WebPreferences> m_preferences;
</del><ins>+ RefPtr<WebPreferences> m_preferences;
</ins><span class="cx"> HashSet<WebPageProxy*> m_pages;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>