<!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>[161291] 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/161291">161291</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-01-03 16:03:49 -0800 (Fri, 03 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove SPI, user default for disabling process suppression
https://bugs.webkit.org/show_bug.cgi?id=126458
Reviewed by Sam Weinig.
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKContextGetProcessSuppressionEnabled):
(WKContextSetProcessSuppressionEnabled):
- depracated SPI.
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
- depracated SPI.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
- removed m_processSuppressionEnabled.
* UIProcess/WebContext.h:
- removed setProcessSuppressionEnabled, processSuppressionEnabled implementation,
processSuppressionEnabledChanged, m_processSuppressionEnabled.
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformInitialize):
- removed m_processSuppressionEnabled.
(WebKit::WebContext::processSuppressionEnabled):
- check whether all pages in all processes are suppressible.
(WebKit::WebContext::canEnableProcessSuppressionForNetworkProcess):
- removed call to omitProcessSuppression, m_processSuppressionEnabled -> processSuppressionEnabled().
(WebKit::WebContext::canEnableProcessSuppressionForWebProcess):
- removed call to omitProcessSuppression, processSuppressionEnabled (we don't care if a page in a difference process is not suppresible).
(WebKit::WebContext::canEnableProcessSuppressionForGlobalChildProcesses):
- removed call to omitProcessSuppression, s_processSuppressionEnabledForAllContexts -> processSuppressionIsEnabledForAllContexts().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp">trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161290 => 161291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-03 23:38:44 UTC (rev 161290)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-04 00:03:49 UTC (rev 161291)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-01-03 Gavin Barraclough <barraclough@apple.com>
+
+ Remove SPI, user default for disabling process suppression
+ https://bugs.webkit.org/show_bug.cgi?id=126458
+
+ Reviewed by Sam Weinig.
+
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ (WKContextGetProcessSuppressionEnabled):
+ (WKContextSetProcessSuppressionEnabled):
+ - depracated SPI.
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ - depracated SPI.
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ - removed m_processSuppressionEnabled.
+ * UIProcess/WebContext.h:
+ - removed setProcessSuppressionEnabled, processSuppressionEnabled implementation,
+ processSuppressionEnabledChanged, m_processSuppressionEnabled.
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformInitialize):
+ - removed m_processSuppressionEnabled.
+ (WebKit::WebContext::processSuppressionEnabled):
+ - check whether all pages in all processes are suppressible.
+ (WebKit::WebContext::canEnableProcessSuppressionForNetworkProcess):
+ - removed call to omitProcessSuppression, m_processSuppressionEnabled -> processSuppressionEnabled().
+ (WebKit::WebContext::canEnableProcessSuppressionForWebProcess):
+ - removed call to omitProcessSuppression, processSuppressionEnabled (we don't care if a page in a difference process is not suppresible).
+ (WebKit::WebContext::canEnableProcessSuppressionForGlobalChildProcesses):
+ - removed call to omitProcessSuppression, s_processSuppressionEnabledForAllContexts -> processSuppressionIsEnabledForAllContexts().
+
</ins><span class="cx"> 2014-01-03 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
</span><span class="cx">
</span><span class="cx"> [WK2][CoordinatedGraphics] Removing repeated protected keyword in WebView
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (161290 => 161291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2014-01-03 23:38:44 UTC (rev 161290)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2014-01-04 00:03:49 UTC (rev 161291)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MutableDictionary.h"
</span><span class="cx"> #include "WKArray.h"
</span><ins>+#include "WKContextPrivateMac.h"
</ins><span class="cx"> #include "WKMutableDictionary.h"
</span><span class="cx"> #include "WKSharedAPICast.h"
</span><span class="cx">
</span><span class="lines">@@ -72,4 +73,13 @@
</span><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><ins>+
+bool WKContextGetProcessSuppressionEnabled(WKContextRef)
+{
+ return true;
+}
+
+void WKContextSetProcessSuppressionEnabled(WKContextRef, bool)
+{
+}
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (161290 => 161291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2014-01-03 23:38:44 UTC (rev 161290)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2014-01-04 00:03:49 UTC (rev 161291)
</span><span class="lines">@@ -44,16 +44,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-bool WKContextGetProcessSuppressionEnabled(WKContextRef contextRef)
-{
- return toImpl(contextRef)->processSuppressionEnabled();
-}
-
-void WKContextSetProcessSuppressionEnabled(WKContextRef contextRef, bool enabled)
-{
- toImpl(contextRef)->setProcessSuppressionEnabled(enabled);
-}
-
</del><span class="cx"> bool WKContextIsPlugInUpdateAvailable(WKContextRef contextRef, WKStringRef plugInBundleIdentifierRef)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (161290 => 161291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-01-03 23:38:44 UTC (rev 161290)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-01-04 00:03:49 UTC (rev 161291)
</span><span class="lines">@@ -146,9 +146,6 @@
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> , m_usesNetworkProcess(false)
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
- , m_processSuppressionEnabled(true)
-#endif
</del><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_ignoreTLSErrors(true)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (161290 => 161291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-01-03 23:38:44 UTC (rev 161290)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-01-04 00:03:49 UTC (rev 161291)
</span><span class="lines">@@ -283,8 +283,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- void setProcessSuppressionEnabled(bool);
- bool processSuppressionEnabled() const { return m_processSuppressionEnabled; }
</del><ins>+ bool processSuppressionEnabled() const;
</ins><span class="cx"> bool canEnableProcessSuppressionForNetworkProcess() const;
</span><span class="cx"> bool canEnableProcessSuppressionForWebProcess(const WebProcessProxy*) const;
</span><span class="cx"> static bool canEnableProcessSuppressionForGlobalChildProcesses();
</span><span class="lines">@@ -396,7 +395,6 @@
</span><span class="cx"> String platformDefaultCookieStorageDirectory() const;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- void processSuppressionEnabledChanged();
</del><span class="cx"> void registerNotificationObservers();
</span><span class="cx"> void unregisterNotificationObservers();
</span><span class="cx"> #endif
</span><span class="lines">@@ -505,10 +503,6 @@
</span><span class="cx"> HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
</span><span class="cx"> HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- bool m_processSuppressionEnabled;
-#endif
-
</del><span class="cx"> #if USE(SOUP)
</span><span class="cx"> bool m_ignoreTLSErrors;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (161290 => 161291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-01-03 23:38:44 UTC (rev 161290)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-01-04 00:03:49 UTC (rev 161291)
</span><span class="lines">@@ -85,8 +85,6 @@
</span><span class="cx"> NSString *SchemeForCustomProtocolRegisteredNotificationName = @"WebKitSchemeForCustomProtocolRegisteredNotification";
</span><span class="cx"> NSString *SchemeForCustomProtocolUnregisteredNotificationName = @"WebKitSchemeForCustomProtocolUnregisteredNotification";
</span><span class="cx">
</span><del>-static bool s_processSuppressionEnabledForAllContexts = true;
-
</del><span class="cx"> static void registerUserDefaultsIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> static bool didRegister;
</span><span class="lines">@@ -128,17 +126,10 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool omitProcessSuppression()
-{
- static bool result = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKit2OmitProcessSuppression"];
- return result;
-}
-
</del><span class="cx"> void WebContext::platformInitialize()
</span><span class="cx"> {
</span><span class="cx"> registerUserDefaultsIfNeeded();
</span><span class="cx"> registerNotificationObservers();
</span><del>- ASSERT(m_processSuppressionEnabled);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultApplicationCacheDirectory() const
</span><span class="lines">@@ -400,12 +391,13 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebContext::setProcessSuppressionEnabled(bool enabled)
</del><ins>+bool WebContext::processSuppressionEnabled() const
</ins><span class="cx"> {
</span><del>- if (m_processSuppressionEnabled == enabled)
- return;
- m_processSuppressionEnabled = enabled;
- processSuppressionEnabledChanged();
</del><ins>+ for (const auto& process : m_processes) {
+ if (!process->allPagesAreProcessSuppressible())
+ return false;
+ }
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContext::updateProcessSuppressionStateOfChildProcesses()
</span><span class="lines">@@ -424,31 +416,19 @@
</span><span class="cx">
</span><span class="cx"> bool WebContext::canEnableProcessSuppressionForNetworkProcess() const
</span><span class="cx"> {
</span><del>- return (WindowServerConnection::shared().applicationIsOccluded() || WindowServerConnection::shared().applicationWindowModificationsHaveStopped()) && m_processSuppressionEnabled && !omitProcessSuppression();
</del><ins>+ return (WindowServerConnection::shared().applicationIsOccluded() || WindowServerConnection::shared().applicationWindowModificationsHaveStopped()) && processSuppressionEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebContext::canEnableProcessSuppressionForWebProcess(const WebKit::WebProcessProxy *webProcess) const
</span><span class="cx"> {
</span><del>- return (WindowServerConnection::shared().applicationIsOccluded() || WindowServerConnection::shared().applicationWindowModificationsHaveStopped() || webProcess->allPagesAreProcessSuppressible())
- && m_processSuppressionEnabled && !omitProcessSuppression();
</del><ins>+ return WindowServerConnection::shared().applicationIsOccluded() || WindowServerConnection::shared().applicationWindowModificationsHaveStopped() || webProcess->allPagesAreProcessSuppressible();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebContext::canEnableProcessSuppressionForGlobalChildProcesses()
</span><span class="cx"> {
</span><del>- return (WindowServerConnection::shared().applicationIsOccluded() || WindowServerConnection::shared().applicationWindowModificationsHaveStopped()) && s_processSuppressionEnabledForAllContexts && !omitProcessSuppression();
</del><ins>+ return (WindowServerConnection::shared().applicationIsOccluded() || WindowServerConnection::shared().applicationWindowModificationsHaveStopped()) && processSuppressionIsEnabledForAllContexts();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContext::processSuppressionEnabledChanged()
-{
- updateProcessSuppressionStateOfChildProcesses();
-
- bool newProcessSuppressionEnabledForAllContexts = processSuppressionIsEnabledForAllContexts();
- if (s_processSuppressionEnabledForAllContexts != newProcessSuppressionEnabledForAllContexts) {
- s_processSuppressionEnabledForAllContexts = newProcessSuppressionEnabledForAllContexts;
- updateProcessSuppressionStateOfGlobalChildProcesses();
- }
-}
-
</del><span class="cx"> void WebContext::registerNotificationObservers()
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>