<!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>[201021] branches/safari-602.1.32-branch/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/201021">201021</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-17 10:58:57 -0700 (Tue, 17 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200819">r200819</a>. rdar://problem/26235373</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebCoreChangeLog">branches/safari-602.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebCorepluginsPluginStrategyh">branches/safari-602.1.32-branch/Source/WebCore/plugins/PluginStrategy.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKitmacChangeLog">branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebKitmacWebCoreSupportWebPlatformStrategiesh">branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm">branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2ChangeLog">branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedWebProcessCreationParameterscpp">branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedWebProcessCreationParametersh">branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessAPICmacWKContextPrivateMach">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessWebProcessPoolcpp">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessWebProcessPoolh">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2WebProcessWebProcesscpp">branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2WebProcessWebProcessh">branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2WebProcessWebProcessmessagesin">branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200819. rdar://problem/26235373
+
+ 2016-05-13 Tina Liu <iting_liu@apple.com>
+
+ Revert r199691.
+ https://bugs.webkit.org/show_bug.cgi?id=157645
+ <rdar://problem/26235373>
+
+ Reviewed by Darin Adler.
+
+ * plugins/PluginStrategy.h:
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200872. rdar://problem/25993225
</span><span class="cx">
</span><span class="cx"> 2016-05-13 Nan Wang <n_wang@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCorepluginsPluginStrategyh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/plugins/PluginStrategy.h (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/plugins/PluginStrategy.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebCore/plugins/PluginStrategy.h 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> virtual void getWebVisiblePluginInfo(const Page*, Vector<PluginInfo>&) = 0;
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> virtual void setPluginLoadClientPolicy(PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) = 0;
</span><del>- virtual void setPrivateBrowsingPluginLoadClientPolicy(PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) = 0;
</del><span class="cx"> virtual void clearPluginClientPolicies() = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200819. rdar://problem/26235373
+
+ 2016-05-13 Tina Liu <iting_liu@apple.com>
+
+ Revert r199691.
+ https://bugs.webkit.org/show_bug.cgi?id=157645
+ <rdar://problem/26235373>
+
+ Reviewed by Darin Adler.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::setPrivateBrowsingPluginLoadClientPolicy): Deleted.
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200866. rdar://problem/26253396
</span><span class="cx">
</span><span class="cx"> 2016-05-13 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKitmacWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> void getWebVisiblePluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String&, const String&, const String&) override;
</span><del>- void setPrivateBrowsingPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String&, const String&, const String&) override;
</del><span class="cx"> void clearPluginClientPolicies() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -150,10 +150,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlatformStrategies::setPrivateBrowsingPluginLoadClientPolicy(PluginLoadClientPolicy, const String&, const String&, const String&)
-{
-}
-
</del><span class="cx"> void WebPlatformStrategies::clearPluginClientPolicies()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200819. rdar://problem/26235373
+
+ 2016-05-13 Tina Liu <iting_liu@apple.com>
+
+ Revert r199691.
+ https://bugs.webkit.org/show_bug.cgi?id=157645
+ <rdar://problem/26235373>
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode): Deleted.
+ (WebKit::WebProcessCreationParameters::decode): Deleted.
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ (WKContextSetPrivateBrowsingPluginLoadClientPolicy): Deleted.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::setPluginLoadClientPolicy):
+ (WebKit::WebProcessPool::createNewWebProcess): Deleted.
+ (WebKit::WebProcessPool::setPluginLoadClientPolicyForPrivateBrowsing): Deleted.
+ (WebKit::WebProcessPool::setPrivateBrowsingPluginLoadClientPolicy): Deleted.
+ (WebKit::WebProcessPool::clearPluginClientPolicies): Deleted.
+ * UIProcess/WebProcessPool.h:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::setPluginLoadClientPolicy):
+ (WebKit::WebPlatformStrategies::longestMatchedWildcardHostForHost):
+ (WebKit::WebPlatformStrategies::replaceHostWithMatchedWildcardHost):
+ (WebKit::WebPlatformStrategies::pluginLoadClientPolicyForHost):
+ (WebKit::WebPlatformStrategies::populatePluginCache):
+ (WebKit::WebPlatformStrategies::setPluginLoadClientPolicyForPrivateBrowsing): Deleted.
+ (WebKit::WebPlatformStrategies::setPrivateBrowsingPluginLoadClientPolicy): Deleted.
+ (WebKit::WebPlatformStrategies::clearPluginClientPolicies): Deleted.
+ (WebKit::WebPlatformStrategies::pluginLoadClientPolicyForHostForPrivateBrowsing): Deleted.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::setPluginLoadClientPolicies): Deleted.
+ (WebKit::WebProcess::setPrivateBrowsingPluginLoadClientPolicy): Deleted.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200866. rdar://problem/26253396
</span><span class="cx">
</span><span class="cx"> 2016-05-13 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -139,7 +139,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> encoder << pluginLoadClientPolicies;
</span><del>- encoder << pluginLoadClientPoliciesForPrivateBrowsing;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</span><span class="lines">@@ -297,8 +296,6 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if (!decoder.decode(parameters.pluginLoadClientPolicies))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.pluginLoadClientPoliciesForPrivateBrowsing))
- return false;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -164,7 +164,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> HashMap<String, HashMap<String, HashMap<String, uint8_t>>> pluginLoadClientPolicies;
</span><del>- HashMap<String, HashMap<String, HashMap<String, uint8_t>>> pluginLoadClientPoliciesForPrivateBrowsing;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessAPICmacWKContextPrivateMach"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> WK_EXPORT bool WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextSetPluginLoadClientPolicy(WKContextRef context, WKPluginLoadClientPolicy policy, WKStringRef host, WKStringRef bundleIdentifier, WKStringRef versionString);
</span><del>-WK_EXPORT void WKContextSetPrivateBrowsingPluginLoadClientPolicy(WKContextRef context, WKPluginLoadClientPolicy policy, WKStringRef host, WKStringRef bundleIdentifier, WKStringRef versionString);
</del><span class="cx"> WK_EXPORT void WKContextClearPluginClientPolicies(WKContextRef context);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef context, WKStringRef plugInBundleIdentifier);
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -59,13 +59,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetPrivateBrowsingPluginLoadClientPolicy(WKContextRef contextRef, WKPluginLoadClientPolicy policy, WKStringRef host, WKStringRef bundleIdentifier, WKStringRef versionString)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
- toImpl(contextRef)->setPrivateBrowsingPluginLoadClientPolicy(toPluginLoadClientPolicy(policy), toWTFString(host), toWTFString(bundleIdentifier), toWTFString(versionString));
-#endif
-}
-
</del><span class="cx"> void WKContextClearPluginClientPolicies(WKContextRef contextRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -627,7 +627,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> parameters.pluginLoadClientPolicies = m_pluginLoadClientPolicies;
</span><del>- parameters.pluginLoadClientPoliciesForPrivateBrowsing = m_pluginLoadClientPoliciesForPrivateBrowsing;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if OS(LINUX)
</span><span class="lines">@@ -1322,37 +1321,29 @@
</span><span class="cx"> m_client.plugInInformationBecameAvailable(this, API::Array::create(WTFMove(plugins)).ptr());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessPool::setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing privateBrowsing, WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
</del><ins>+void WebProcessPool::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- auto& pluginLoadClientPolicies = privateBrowsing == PrivateBrowsing::Yes ? m_pluginLoadClientPolicies : m_pluginLoadClientPoliciesForPrivateBrowsing;
</del><ins>+ HashMap<String, HashMap<String, uint8_t>> policiesByIdentifier;
+ if (m_pluginLoadClientPolicies.contains(host))
+ policiesByIdentifier = m_pluginLoadClientPolicies.get(host);
</ins><span class="cx">
</span><del>- HashMap<String, HashMap<String, uint8_t>> policiesByIdentifier = pluginLoadClientPolicies.get(host);
- HashMap<String, uint8_t> versionsToPolicies = policiesByIdentifier.get(bundleIdentifier);
</del><ins>+ HashMap<String, uint8_t> versionsToPolicies;
+ if (policiesByIdentifier.contains(bundleIdentifier))
+ versionsToPolicies = policiesByIdentifier.get(bundleIdentifier);
</ins><span class="cx">
</span><span class="cx"> versionsToPolicies.set(versionString, policy);
</span><span class="cx"> policiesByIdentifier.set(bundleIdentifier, versionsToPolicies);
</span><del>- pluginLoadClientPolicies.set(host, policiesByIdentifier);
</del><ins>+ m_pluginLoadClientPolicies.set(host, policiesByIdentifier);
</ins><span class="cx"> #endif
</span><del>-}
</del><span class="cx">
</span><del>-void WebProcessPool::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
- setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing::No, policy, host, bundleIdentifier, versionString);
</del><span class="cx"> sendToAllProcesses(Messages::WebProcess::SetPluginLoadClientPolicy(policy, host, bundleIdentifier, versionString));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessPool::setPrivateBrowsingPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
- setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing::Yes, policy, host, bundleIdentifier, versionString);
- sendToAllProcesses(Messages::WebProcess::SetPrivateBrowsingPluginLoadClientPolicy(policy, host, bundleIdentifier, versionString));
-}
-
</del><span class="cx"> void WebProcessPool::clearPluginClientPolicies()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> m_pluginLoadClientPolicies.clear();
</span><del>- m_pluginLoadClientPoliciesForPrivateBrowsing.clear();
</del><span class="cx"> #endif
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::ClearPluginClientPolicies());
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.h (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.h 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -184,10 +184,6 @@
</span><span class="cx"> PluginInfoStore& pluginInfoStore() { return m_pluginInfoStore; }
</span><span class="cx">
</span><span class="cx"> void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
</span><del>- enum class PrivateBrowsing { Yes, No };
- void setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing, WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
- void setPrivateBrowsingPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
-
</del><span class="cx"> void clearPluginClientPolicies();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -542,7 +538,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> HashMap<String, HashMap<String, HashMap<String, uint8_t>>> m_pluginLoadClientPolicies;
</span><del>- HashMap<String, HashMap<String, HashMap<String, uint8_t>>> m_pluginLoadClientPoliciesForPrivateBrowsing;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -218,36 +218,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-void WebPlatformStrategies::setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing privateBrowsing, PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
</del><ins>+void WebPlatformStrategies::setPluginLoadClientPolicy(PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
</ins><span class="cx"> {
</span><span class="cx"> String hostToSet = host.isNull() || !host.length() ? "*" : host;
</span><span class="cx"> String bundleIdentifierToSet = bundleIdentifier.isNull() || !bundleIdentifier.length() ? "*" : bundleIdentifier;
</span><span class="cx"> String versionStringToSet = versionString.isNull() || !versionString.length() ? "*" : versionString;
</span><span class="cx">
</span><del>- auto& hostsToPluginIdentifierData = privateBrowsing == PrivateBrowsing::Yes ? m_hostsToPluginIdentifierDataInPrivateBrowsing : m_hostsToPluginIdentifierData;
</del><ins>+ PluginPolicyMapsByIdentifier policiesByIdentifier;
+ if (m_hostsToPluginIdentifierData.contains(hostToSet))
+ policiesByIdentifier = m_hostsToPluginIdentifierData.get(hostToSet);
</ins><span class="cx">
</span><del>- PluginPolicyMapsByIdentifier policiesByIdentifier = hostsToPluginIdentifierData.get(hostToSet);
- PluginLoadClientPoliciesByBundleVersion versionsToPolicies = policiesByIdentifier.get(bundleIdentifierToSet);
</del><ins>+ PluginLoadClientPoliciesByBundleVersion versionsToPolicies;
+ if (policiesByIdentifier.contains(bundleIdentifierToSet))
+ versionsToPolicies = policiesByIdentifier.get(bundleIdentifierToSet);
</ins><span class="cx">
</span><span class="cx"> versionsToPolicies.set(versionStringToSet, clientPolicy);
</span><span class="cx"> policiesByIdentifier.set(bundleIdentifierToSet, versionsToPolicies);
</span><del>- hostsToPluginIdentifierData.set(hostToSet, policiesByIdentifier);
</del><ins>+ m_hostsToPluginIdentifierData.set(hostToSet, policiesByIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlatformStrategies::setPluginLoadClientPolicy(PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
- setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing::No, clientPolicy, host, bundleIdentifier, versionString);
-}
-
-void WebPlatformStrategies::setPrivateBrowsingPluginLoadClientPolicy(PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
- setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing::Yes, clientPolicy, host, bundleIdentifier, versionString);
-}
-
</del><span class="cx"> void WebPlatformStrategies::clearPluginClientPolicies()
</span><span class="cx"> {
</span><span class="cx"> m_hostsToPluginIdentifierData.clear();
</span><del>- m_hostsToPluginIdentifierDataInPrivateBrowsing.clear();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -255,12 +247,11 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><del>-String WebPlatformStrategies::longestMatchedWildcardHostForHost(const String& host, PrivateBrowsing privateBrowsing) const
</del><ins>+String WebPlatformStrategies::longestMatchedWildcardHostForHost(const String& host) const
</ins><span class="cx"> {
</span><span class="cx"> String longestMatchedHost;
</span><span class="cx">
</span><del>- auto& hostsToPluginIdentifierData = privateBrowsing == PrivateBrowsing::Yes ? m_hostsToPluginIdentifierDataInPrivateBrowsing : m_hostsToPluginIdentifierData;
- for (auto& key : hostsToPluginIdentifierData.keys()) {
</del><ins>+ for (auto& key : m_hostsToPluginIdentifierData.keys()) {
</ins><span class="cx"> if (key.contains('*') && key != "*" && stringMatchesWildcardString(host, key)) {
</span><span class="cx"> if (key.length() > longestMatchedHost.length())
</span><span class="cx"> longestMatchedHost = key;
</span><span class="lines">@@ -272,40 +263,38 @@
</span><span class="cx"> return longestMatchedHost;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebPlatformStrategies::replaceHostWithMatchedWildcardHost(String& host, const String& identifier, PrivateBrowsing privateBrowsing) const
</del><ins>+bool WebPlatformStrategies::replaceHostWithMatchedWildcardHost(String& host, const String& identifier) const
</ins><span class="cx"> {
</span><del>- String matchedWildcardHost = longestMatchedWildcardHostForHost(host, privateBrowsing);
</del><ins>+ String matchedWildcardHost = longestMatchedWildcardHostForHost(host);
</ins><span class="cx">
</span><span class="cx"> if (matchedWildcardHost.isNull())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- auto& hostsToPluginIdentifierData = privateBrowsing == PrivateBrowsing::Yes ? m_hostsToPluginIdentifierDataInPrivateBrowsing : m_hostsToPluginIdentifierData;
- auto plugInIdentifierData = hostsToPluginIdentifierData.find(matchedWildcardHost);
- if (plugInIdentifierData == hostsToPluginIdentifierData.end() || !plugInIdentifierData->value.contains(identifier))
</del><ins>+ auto plugInIdentifierData = m_hostsToPluginIdentifierData.find(matchedWildcardHost);
+ if (plugInIdentifierData == m_hostsToPluginIdentifierData.end() || !plugInIdentifierData->value.contains(identifier))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> host = matchedWildcardHost;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebPlatformStrategies::pluginLoadClientPolicyForHostForPrivateBrowsing(PrivateBrowsing privateBrowsing, const String& host, const PluginInfo& info, PluginLoadClientPolicy& policy) const
</del><ins>+bool WebPlatformStrategies::pluginLoadClientPolicyForHost(const String& host, const PluginInfo& info, PluginLoadClientPolicy& policy) const
</ins><span class="cx"> {
</span><span class="cx"> String hostToLookUp = host;
</span><span class="cx"> String identifier = info.bundleIdentifier;
</span><span class="cx">
</span><del>- auto& hostsToPluginIdentifierData = privateBrowsing == PrivateBrowsing::Yes ? m_hostsToPluginIdentifierDataInPrivateBrowsing : m_hostsToPluginIdentifierData;
- auto policiesByIdentifierIterator = hostsToPluginIdentifierData.find(hostToLookUp);
</del><ins>+ auto policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
</ins><span class="cx">
</span><del>- if (!identifier.isNull() && policiesByIdentifierIterator == hostsToPluginIdentifierData.end()) {
- if (!replaceHostWithMatchedWildcardHost(hostToLookUp, identifier, privateBrowsing))
</del><ins>+ if (!identifier.isNull() && policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end()) {
+ if (!replaceHostWithMatchedWildcardHost(hostToLookUp, identifier))
</ins><span class="cx"> hostToLookUp = "*";
</span><del>- policiesByIdentifierIterator = hostsToPluginIdentifierData.find(hostToLookUp);
- if (hostToLookUp != "*" && policiesByIdentifierIterator == hostsToPluginIdentifierData.end()) {
</del><ins>+ policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
+ if (hostToLookUp != "*" && policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end()) {
</ins><span class="cx"> hostToLookUp = "*";
</span><del>- policiesByIdentifierIterator = hostsToPluginIdentifierData.find(hostToLookUp);
</del><ins>+ policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (policiesByIdentifierIterator == hostsToPluginIdentifierData.end())
</del><ins>+ if (policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> auto& policiesByIdentifier = policiesByIdentifierIterator->value;
</span><span class="lines">@@ -356,7 +345,7 @@
</span><span class="cx"> String pageHost = page.mainFrame().loader().documentLoader()->responseURL().host();
</span><span class="cx"> for (PluginInfo& info : m_cachedPlugins) {
</span><span class="cx"> PluginLoadClientPolicy clientPolicy;
</span><del>- if (pluginLoadClientPolicyForHostForPrivateBrowsing(page.usesEphemeralSession() ? PrivateBrowsing::Yes : PrivateBrowsing::No, pageHost, info, clientPolicy))
</del><ins>+ if (pluginLoadClientPolicyForHost(pageHost, info, clientPolicy))
</ins><span class="cx"> info.clientLoadPolicy = clientPolicy;
</span><span class="cx"> }
</span><span class="cx"> #else
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> typedef HashMap<String, PluginLoadClientPoliciesByBundleVersion> PluginPolicyMapsByIdentifier;
</span><span class="cx">
</span><span class="cx"> void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
</span><del>- void setPrivateBrowsingPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
</del><span class="cx"> void clearPluginClientPolicies() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -113,12 +112,9 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> HashMap<String, PluginPolicyMapsByIdentifier> m_hostsToPluginIdentifierData;
</span><del>- HashMap<String, PluginPolicyMapsByIdentifier> m_hostsToPluginIdentifierDataInPrivateBrowsing;
- enum class PrivateBrowsing { Yes, No };
- String longestMatchedWildcardHostForHost(const String& host, PrivateBrowsing) const;
- bool pluginLoadClientPolicyForHostForPrivateBrowsing(PrivateBrowsing, const String&, const WebCore::PluginInfo&, WebCore::PluginLoadClientPolicy&) const;
- bool replaceHostWithMatchedWildcardHost(String& host, const String& identifier, PrivateBrowsing) const;
- void setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing, WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
</del><ins>+ bool pluginLoadClientPolicyForHost(const String&, const WebCore::PluginInfo&, WebCore::PluginLoadClientPolicy&) const;
+ String longestMatchedWildcardHostForHost(const String& host) const;
+ bool replaceHostWithMatchedWildcardHost(String& host, const String& identifier) const;
</ins><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.cpp (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -388,26 +388,14 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
</span><del>- setPluginLoadClientPolicies(parameters.pluginLoadClientPoliciesForPrivateBrowsing, PrivateBrowsing::Yes);
- setPluginLoadClientPolicies(parameters.pluginLoadClientPolicies, PrivateBrowsing::No);
-#endif
-}
-
-#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
-void WebProcess::setPluginLoadClientPolicies(const HashMap<String, HashMap<String, HashMap<String, uint8_t>>> &pluginPolicies, PrivateBrowsing privateBrowsing)
-{
- for (auto hostIter = pluginPolicies.begin(); hostIter != pluginPolicies.end(); ++hostIter) {
</del><ins>+ for (auto hostIter = parameters.pluginLoadClientPolicies.begin(); hostIter != parameters.pluginLoadClientPolicies.end(); ++hostIter) {
</ins><span class="cx"> for (auto bundleIdentifierIter = hostIter->value.begin(); bundleIdentifierIter != hostIter->value.end(); ++bundleIdentifierIter) {
</span><del>- for (auto versionIter = bundleIdentifierIter->value.begin(); versionIter != bundleIdentifierIter->value.end(); ++versionIter) {
- if (privateBrowsing == PrivateBrowsing::No)
- platformStrategies()->pluginStrategy()->setPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(versionIter->value), hostIter->key, bundleIdentifierIter->key, versionIter->key);
- else
- platformStrategies()->pluginStrategy()->setPrivateBrowsingPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(versionIter->value), hostIter->key, bundleIdentifierIter->key, versionIter->key);
- }
</del><ins>+ for (auto versionIter = bundleIdentifierIter->value.begin(); versionIter != bundleIdentifierIter->value.end(); ++versionIter)
+ platformStrategies()->pluginStrategy()->setPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(versionIter->value), hostIter->key, bundleIdentifierIter->key, versionIter->key);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-}
</del><span class="cx"> #endif
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> void WebProcess::ensureNetworkProcessConnection()
</span><span class="cx"> {
</span><span class="lines">@@ -882,13 +870,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::setPrivateBrowsingPluginLoadClientPolicy(uint8_t policy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
- platformStrategies()->pluginStrategy()->setPrivateBrowsingPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(policy), host, bundleIdentifier, versionString);
-#endif
-}
-
</del><span class="cx"> void WebProcess::clearPluginClientPolicies()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.h (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.h 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -128,7 +128,6 @@
</span><span class="cx"> void plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
</span><span class="cx"> void plugInDidReceiveUserInteraction(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
</span><span class="cx"> void setPluginLoadClientPolicy(uint8_t policy, const String& host, const String& bundleIdentifier, const String& versionString);
</span><del>- void setPrivateBrowsingPluginLoadClientPolicy(uint8_t policy, const String& host, const String& bundleIdentifier, const String& versionString);
</del><span class="cx"> void clearPluginClientPolicies();
</span><span class="cx">
</span><span class="cx"> bool fullKeyboardAccessEnabled() const { return m_fullKeyboardAccessEnabled; }
</span><span class="lines">@@ -371,10 +370,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>-#if PLATFORM(MAC)
- enum class PrivateBrowsing { Yes, No };
- void setPluginLoadClientPolicies(const HashMap<String, HashMap<String, HashMap<String, uint8_t>>>&, PrivateBrowsing);
-#endif
</del><span class="cx"> RefPtr<PluginProcessConnectionManager> m_pluginProcessConnectionManager;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.messages.in (201020 => 201021)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-05-17 17:58:57 UTC (rev 201021)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> ResetPlugInAutoStartOriginDefaultHashes(HashMap<uint32_t,double> hashes)
</span><span class="cx"> ResetPlugInAutoStartOriginHashes(HashMap<WebCore::SessionID, HashMap<uint32_t,double>> hashes)
</span><span class="cx"> SetPluginLoadClientPolicy(uint8_t policy, String host, String bundleIdentifier, String versionString)
</span><del>- SetPrivateBrowsingPluginLoadClientPolicy(uint8_t policy, String host, String bundleIdentifier, String versionString)
</del><span class="cx"> ClearPluginClientPolicies()
</span><span class="cx">
</span><span class="cx"> void StartMemorySampler(WebKit::SandboxExtension::Handle sampleLogFileHandle, String sampleLogFilePath, double interval);
</span></span></pre>
</div>
</div>
</body>
</html>