<!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>[144472] branches/safari-536.29-branch/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/144472">144472</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2013-03-01 10:53:59 -0800 (Fri, 01 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/141923">r141923</a>

    2013-02-05  Anders Carlsson  &lt;andersca@apple.com&gt;

    WebKit clients should be able to override loading of blocked plug-ins
    https://bugs.webkit.org/show_bug.cgi?id=108968
    &lt;rdar://problem/13154516&gt;

    Reviewed by Sam Weinig.

    Replace the shouldInstantiatePlugin callback with a new pluginLoadPolicy which is called regardless
    of whether the plug-in is blocked or not. This lets clients override the plug-in load policy and
    force loading of blacklisted plug-ins (and vice versa).

    * UIProcess/API/C/WKPage.h:
    * UIProcess/WebPageProxy.cpp:
    (WebKit::WebPageProxy::getPluginPath):
    * UIProcess/WebUIClient.cpp:
    (WebKit::toWKPluginLoadPolicy):
    (WebKit):
    (WebKit::toPluginModuleLoadPolicy):
    (WebKit::WebUIClient::pluginLoadPolicy):
    * UIProcess/WebUIClient.h:
    (WebUIClient):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53629branchSourceWebKit2ChangeLog">branches/safari-536.29-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53629branchSourceWebKit2UIProcessAPICWKPageh">branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h</a></li>
<li><a href="#branchessafari53629branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari53629branchSourceWebKit2UIProcessWebUIClientcpp">branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.cpp</a></li>
<li><a href="#branchessafari53629branchSourceWebKit2UIProcessWebUIClienth">branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53629branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-536.29-branch/Source/WebKit2/ChangeLog (144471 => 144472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-536.29-branch/Source/WebKit2/ChangeLog        2013-03-01 18:32:17 UTC (rev 144471)
+++ branches/safari-536.29-branch/Source/WebKit2/ChangeLog        2013-03-01 18:53:59 UTC (rev 144472)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2013-03-01  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Merge r141923
+
+    2013-02-05  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+            WebKit clients should be able to override loading of blocked plug-ins
+            https://bugs.webkit.org/show_bug.cgi?id=108968
+            &lt;rdar://problem/13154516&gt;
+
+            Reviewed by Sam Weinig.
+
+            Replace the shouldInstantiatePlugin callback with a new pluginLoadPolicy which is called regardless
+            of whether the plug-in is blocked or not. This lets clients override the plug-in load policy and
+            force loading of blacklisted plug-ins (and vice versa).
+
+            * UIProcess/API/C/WKPage.h:
+            * UIProcess/WebPageProxy.cpp:
+            (WebKit::WebPageProxy::getPluginPath):
+            * UIProcess/WebUIClient.cpp:
+            (WebKit::toWKPluginLoadPolicy):
+            (WebKit):
+            (WebKit::toPluginModuleLoadPolicy):
+            (WebKit::WebUIClient::pluginLoadPolicy):
+            * UIProcess/WebUIClient.h:
+            (WebUIClient):
+
</ins><span class="cx"> 2013-02-28  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r141486
</span></span></pre></div>
<a id="branchessafari53629branchSourceWebKit2UIProcessAPICWKPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h (144471 => 144472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h        2013-03-01 18:32:17 UTC (rev 144471)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h        2013-03-01 18:53:59 UTC (rev 144472)
</span><span class="lines">@@ -184,6 +184,13 @@
</span><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKPluginUnavailabilityReason;
</span><span class="cx"> 
</span><ins>+enum {
+    kWKPluginLoadPolicyLoadNormally = 0,
+    kWKPluginLoadPolicyBlocked,
+    kWKPluginLoadPolicyInactive,
+};
+typedef uint32_t WKPluginLoadPolicy;
+
</ins><span class="cx"> // UI Client
</span><span class="cx"> typedef WKPageRef (*WKPageCreateNewPageCallback)(WKPageRef page, WKURLRequestRef urlRequest, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageRunJavaScriptAlertCallback)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void *clientInfo);
</span><span class="lines">@@ -219,7 +226,7 @@
</span><span class="cx"> typedef bool (*WKPageShouldInterruptJavaScriptCallback)(WKPageRef page, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageDecidePolicyForNotificationPermissionRequestCallback)(WKPageRef page, WKSecurityOriginRef origin, WKNotificationPermissionRequestRef permissionRequest, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageUnavailablePluginButtonClickedCallback)(WKPageRef page, WKPluginUnavailabilityReason pluginUnavailabilityReason, WKStringRef mimeType, WKStringRef url, WKStringRef pluginsPageURL, const void* clientInfo);
</span><del>-typedef bool (*WKPageShouldInstantiatePluginCallback)(WKPageRef page, WKStringRef identifier, WKStringRef displayName, const void* clientInfo);
</del><ins>+typedef WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback)(WKPageRef page, WKStringRef identifier, WKStringRef displayName, WKPluginLoadPolicy currentPluginLoadPolicy, const void* clientInfo);
</ins><span class="cx"> 
</span><span class="cx"> // Deprecated    
</span><span class="cx"> typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV0)(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
</span><span class="lines">@@ -276,7 +283,7 @@
</span><span class="cx">     WKPageMouseDidMoveOverElementCallback                               mouseDidMoveOverElement;
</span><span class="cx">     WKPageDecidePolicyForNotificationPermissionRequestCallback          decidePolicyForNotificationPermissionRequest;
</span><span class="cx">     WKPageUnavailablePluginButtonClickedCallback                        unavailablePluginButtonClicked;
</span><del>-    WKPageShouldInstantiatePluginCallback                               shouldInstantiatePlugin;
</del><ins>+    WKPagePluginLoadPolicyCallback                                      pluginLoadPolicy;
</ins><span class="cx"> };
</span><span class="cx"> typedef struct WKPageUIClient WKPageUIClient;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari53629branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (144471 => 144472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp        2013-03-01 18:32:17 UTC (rev 144471)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp        2013-03-01 18:53:59 UTC (rev 144472)
</span><span class="lines">@@ -1134,10 +1134,12 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     pluginLoadPolicy = PluginInfoStore::policyForPlugin(plugin);
</span><del>-    if (pluginLoadPolicy != PluginModuleLoadNormally)
-        return;
</del><span class="cx"> 
</span><del>-    pluginLoadPolicy = m_uiClient.shouldInstantiatePlugin(this, plugin.bundleIdentifier, plugin.info.name) ? PluginModuleLoadNormally : PluginModuleBlocked;
</del><ins>+#if PLATFORM(MAC)
+    PluginModuleLoadPolicy currentPluginLoadPolicy = static_cast&lt;PluginModuleLoadPolicy&gt;(pluginLoadPolicy);
+    pluginLoadPolicy = m_uiClient.pluginLoadPolicy(this, plugin.bundleIdentifier, plugin.info.name, currentPluginLoadPolicy);
+#endif
+
</ins><span class="cx">     if (pluginLoadPolicy != PluginModuleLoadNormally)
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari53629branchSourceWebKit2UIProcessWebUIClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.cpp (144471 => 144472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.cpp        2013-03-01 18:32:17 UTC (rev 144471)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.cpp        2013-03-01 18:53:59 UTC (rev 144472)
</span><span class="lines">@@ -417,12 +417,42 @@
</span><span class="cx">     return m_client.shouldInterruptJavaScript(toAPI(page), m_client.clientInfo);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool WebUIClient::shouldInstantiatePlugin(WebPageProxy* page, const String&amp; identifier, const String&amp; displayName)
</del><ins>+static inline WKPluginLoadPolicy toWKPluginLoadPolicy(PluginModuleLoadPolicy pluginModuleLoadPolicy)
</ins><span class="cx"> {
</span><del>-    if (!m_client.shouldInstantiatePlugin)
-        return true;
</del><ins>+    switch (pluginModuleLoadPolicy) {
+    case PluginModuleLoadNormally:
+        return kWKPluginLoadPolicyLoadNormally;
+    case PluginModuleBlocked:
+        return kWKPluginLoadPolicyBlocked;
+    case PluginModuleInactive:
+        return kWKPluginLoadPolicyInactive;
+    }
</ins><span class="cx"> 
</span><del>-    return m_client.shouldInstantiatePlugin(toAPI(page), toAPI(identifier.impl()), toAPI(displayName.impl()), m_client.clientInfo);
</del><ins>+    ASSERT_NOT_REACHED();
+    return kWKPluginLoadPolicyBlocked;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static inline PluginModuleLoadPolicy toPluginModuleLoadPolicy(WKPluginLoadPolicy pluginLoadPolicy)
+{
+    switch (pluginLoadPolicy) {
+    case kWKPluginLoadPolicyLoadNormally:
+        return PluginModuleLoadNormally;
+    case kWKPluginLoadPolicyBlocked:
+        return PluginModuleBlocked;
+    case kWKPluginLoadPolicyInactive:
+        return PluginModuleInactive;
+    }
+
+    ASSERT_NOT_REACHED();
+    return PluginModuleBlocked;
+}
+
+PluginModuleLoadPolicy WebUIClient::pluginLoadPolicy(WebPageProxy* page, const String&amp; identifier, const String&amp; displayName, PluginModuleLoadPolicy currentPluginLoadPolicy)
+{
+    if (!m_client.pluginLoadPolicy)
+        return currentPluginLoadPolicy;
+
+    return toPluginModuleLoadPolicy(m_client.pluginLoadPolicy(toAPI(page), toAPI(identifier.impl()), toAPI(displayName.impl()), toWKPluginLoadPolicy(currentPluginLoadPolicy), m_client.clientInfo));
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari53629branchSourceWebKit2UIProcessWebUIClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.h (144471 => 144472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.h        2013-03-01 18:32:17 UTC (rev 144471)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.h        2013-03-01 18:53:59 UTC (rev 144472)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WebUIClient_h
</span><span class="cx"> 
</span><span class="cx"> #include &quot;APIClient.h&quot;
</span><ins>+#include &quot;PluginModuleInfo.h&quot;
</ins><span class="cx"> #include &quot;WKPage.h&quot;
</span><span class="cx"> #include &quot;WebEvent.h&quot;
</span><span class="cx"> #include &quot;WebHitTestResult.h&quot;
</span><span class="lines">@@ -116,7 +117,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool shouldInterruptJavaScript(WebPageProxy*);
</span><span class="cx"> 
</span><del>-    bool shouldInstantiatePlugin(WebPageProxy*, const String&amp; identifier, const String&amp; displayName);
</del><ins>+    PluginModuleLoadPolicy pluginLoadPolicy(WebPageProxy*, const String&amp; identifier, const String&amp; displayName, PluginModuleLoadPolicy currentPluginLoadPolicy);
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>

</body>
</html>