<!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>[162883] trunk</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/162883">162883</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-01-27 16:07:30 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert the parts of <a href="http://trac.webkit.org/projects/webkit/changeset/162629">r162629</a> that add a new pluginLoadPolicy and the context menu item.
We're leaving the parts that make us use PDFPlugin instead of showing the blocked
plugin indicator intact, though.
* UIProcess/API/APILoaderClient.h:
(API::LoaderClient::pluginLoadPolicy):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageLoaderClient):
* UIProcess/API/C/WKPageLoaderClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::findPlugin):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/Plugins/PDF/PDFPlugin.h:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::PDFPlugin):
(WebKit::PDFPlugin::handleContextMenuEvent):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::createPlugin):
(WebKit::WebPage::canPluginHandleResponse):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::createWebViewWithOptions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPILoaderClienth">trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-27 Tim Horton <timothy_horton@apple.com>
+
+ Revert the parts of r162629 that add a new pluginLoadPolicy and the context menu item.
+
+ We're leaving the parts that make us use PDFPlugin instead of showing the blocked
+ plugin indicator intact, though.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::pluginLoadPolicy):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient):
+ * UIProcess/API/C/WKPageLoaderClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::findPlugin):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::PDFPlugin):
+ (WebKit::PDFPlugin::handleContextMenuEvent):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::createPlugin):
+ (WebKit::WebPage::canPluginHandleResponse):
+
</ins><span class="cx"> 2014-01-27 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a WKContentView initializer that takes a WKWebViewConfiguration
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPILoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> virtual void willGoToBackForwardListItem(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem*, API::Object*) { }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- virtual WebKit::PluginModuleLoadPolicy pluginLoadPolicy(WebKit::WebPageProxy*, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, WebKit::ImmutableDictionary*, WTF::String& unavailabilityDescription, WTF::String& useBlockedPluginTitle) { return currentPluginLoadPolicy; }
</del><ins>+ virtual WebKit::PluginModuleLoadPolicy pluginLoadPolicy(WebKit::WebPageProxy*, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, WebKit::ImmutableDictionary*, WTF::String& unavailabilityDescription) { return currentPluginLoadPolicy; }
</ins><span class="cx"> virtual void didFailToInitializePlugin(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) { }
</span><span class="cx"> virtual void didBlockInsecurePluginVersion(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) { }
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -931,28 +931,20 @@
</span><span class="cx"> m_client.pluginDidFail(toAPI(page), kWKErrorCodeInsecurePlugInVersion, toAPI(pluginInformation), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual PluginModuleLoadPolicy pluginLoadPolicy(WebPageProxy* page, PluginModuleLoadPolicy currentPluginLoadPolicy, ImmutableDictionary* pluginInformation, String& unavailabilityDescription, String& useBlockedPluginTitle) override
</del><ins>+ virtual PluginModuleLoadPolicy pluginLoadPolicy(WebPageProxy* page, PluginModuleLoadPolicy currentPluginLoadPolicy, ImmutableDictionary* pluginInformation, String& unavailabilityDescription) override
</ins><span class="cx"> {
</span><span class="cx"> WKStringRef unavailabilityDescriptionOut = 0;
</span><del>- WKStringRef useBlockedPluginTitleOut = 0;
</del><span class="cx"> PluginModuleLoadPolicy loadPolicy = currentPluginLoadPolicy;
</span><span class="cx">
</span><span class="cx"> if (m_client.pluginLoadPolicy_deprecatedForUseWithV2)
</span><span class="cx"> loadPolicy = toPluginModuleLoadPolicy(m_client.pluginLoadPolicy_deprecatedForUseWithV2(toAPI(page), toWKPluginLoadPolicy(currentPluginLoadPolicy), toAPI(pluginInformation), m_client.base.clientInfo));
</span><del>- else if (m_client.pluginLoadPolicy_deprecatedForUseWithV3)
- loadPolicy = toPluginModuleLoadPolicy(m_client.pluginLoadPolicy_deprecatedForUseWithV3(toAPI(page), toWKPluginLoadPolicy(currentPluginLoadPolicy), toAPI(pluginInformation), &unavailabilityDescriptionOut, m_client.base.clientInfo));
</del><span class="cx"> else if (m_client.pluginLoadPolicy)
</span><del>- loadPolicy = toPluginModuleLoadPolicy(m_client.pluginLoadPolicy(toAPI(page), toWKPluginLoadPolicy(currentPluginLoadPolicy), toAPI(pluginInformation), &unavailabilityDescriptionOut, &useBlockedPluginTitleOut, m_client.base.clientInfo));
</del><ins>+ loadPolicy = toPluginModuleLoadPolicy(m_client.pluginLoadPolicy(toAPI(page), toWKPluginLoadPolicy(currentPluginLoadPolicy), toAPI(pluginInformation), &unavailabilityDescriptionOut, m_client.base.clientInfo));
</ins><span class="cx">
</span><span class="cx"> if (unavailabilityDescriptionOut) {
</span><span class="cx"> RefPtr<API::String> webUnavailabilityDescription = adoptRef(toImpl(unavailabilityDescriptionOut));
</span><span class="cx"> unavailabilityDescription = webUnavailabilityDescription->string();
</span><span class="cx"> }
</span><del>-
- if (useBlockedPluginTitleOut) {
- RefPtr<API::String> webUseBlockedPluginTitle = adoptRef(toImpl(useBlockedPluginTitleOut));
- useBlockedPluginTitle = webUseBlockedPluginTitle->string();
- }
</del><span class="cx">
</span><span class="cx"> return loadPolicy;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> typedef bool (*WKPageShouldGoToBackForwardListItemCallback)(WKPageRef page, WKBackForwardListItemRef item, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageWillGoToBackForwardListItemCallback)(WKPageRef page, WKBackForwardListItemRef item, WKTypeRef userData, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageDidLayoutCallback)(WKPageRef page, WKLayoutMilestones milestones, WKTypeRef userData, const void *clientInfo);
</span><del>-typedef WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback)(WKPageRef page, WKPluginLoadPolicy currentPluginLoadPolicy, WKDictionaryRef pluginInfoDictionary, WKStringRef* unavailabilityDescription, WKStringRef* useBlockedPluginTitle, const void* clientInfo);
</del><ins>+typedef WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback)(WKPageRef page, WKPluginLoadPolicy currentPluginLoadPolicy, WKDictionaryRef pluginInfoDictionary, WKStringRef* unavailabilityDescription, const void* clientInfo);
</ins><span class="cx"> typedef void (*WKPagePluginDidFailCallback)(WKPageRef page, WKErrorCode errorCode, WKDictionaryRef pluginInfoDictionary, const void* clientInfo);
</span><span class="cx"> typedef WKWebGLLoadPolicy (*WKPageWebGLLoadPolicyCallback)(WKPageRef page, WKStringRef url, const void* clientInfo);
</span><span class="cx">
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx"> typedef void (*WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef mimeType, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPagePluginDidFailCallback_deprecatedForUseWithV1)(WKPageRef page, WKErrorCode errorCode, WKStringRef mimeType, WKStringRef pluginIdentifier, WKStringRef pluginVersion, const void* clientInfo);
</span><span class="cx"> typedef WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback_deprecatedForUseWithV2)(WKPageRef page, WKPluginLoadPolicy currentPluginLoadPolicy, WKDictionaryRef pluginInfoDictionary, const void* clientInfo);
</span><del>-typedef WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback_deprecatedForUseWithV3)(WKPageRef page, WKPluginLoadPolicy currentPluginLoadPolicy, WKDictionaryRef pluginInfoDictionary, WKStringRef* unavailabilityDescription, const void* clientInfo);
</del><span class="cx">
</span><span class="cx"> typedef struct WKPageLoaderClientBase {
</span><span class="cx"> int version;
</span><span class="lines">@@ -272,7 +271,7 @@
</span><span class="cx"> WKPagePluginDidFailCallback pluginDidFail;
</span><span class="cx">
</span><span class="cx"> // Version 3.
</span><del>- WKPagePluginLoadPolicyCallback_deprecatedForUseWithV3 pluginLoadPolicy_deprecatedForUseWithV3;
</del><ins>+ WKPagePluginLoadPolicyCallback pluginLoadPolicy;
</ins><span class="cx"> } WKPageLoaderClientV3;
</span><span class="cx">
</span><span class="cx"> typedef struct WKPageLoaderClientV4 {
</span><span class="lines">@@ -328,11 +327,10 @@
</span><span class="cx"> WKPagePluginDidFailCallback pluginDidFail;
</span><span class="cx">
</span><span class="cx"> // Version 3.
</span><del>- WKPagePluginLoadPolicyCallback_deprecatedForUseWithV3 pluginLoadPolicy_deprecatedForUseWithV3;
</del><ins>+ WKPagePluginLoadPolicyCallback pluginLoadPolicy;
</ins><span class="cx">
</span><del>- // Version 4.
</del><ins>+ // Version 4
</ins><span class="cx"> WKPageWebGLLoadPolicyCallback webGLLoadPolicy;
</span><del>- WKPagePluginLoadPolicyCallback pluginLoadPolicy;
</del><span class="cx"> } WKPageLoaderClientV4;
</span><span class="cx">
</span><span class="cx"> // FIXME: These should be deprecated.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -1338,7 +1338,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>-void WebPageProxy::findPlugin(const String& mimeType, uint32_t processType, const String& urlString, const String& frameURLString, const String& pageURLString, bool allowOnlyApplicationPlugins, uint64_t& pluginProcessToken, String& newMimeType, uint32_t& pluginLoadPolicy, String& unavailabilityDescription, String& useBlockedPluginTitle)
</del><ins>+void WebPageProxy::findPlugin(const String& mimeType, uint32_t processType, const String& urlString, const String& frameURLString, const String& pageURLString, bool allowOnlyApplicationPlugins, uint64_t& pluginProcessToken, String& newMimeType, uint32_t& pluginLoadPolicy, String& unavailabilityDescription)
</ins><span class="cx"> {
</span><span class="cx"> MESSAGE_CHECK_URL(urlString);
</span><span class="cx">
</span><span class="lines">@@ -1356,12 +1356,11 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> RefPtr<ImmutableDictionary> pluginInformation = createPluginInformationDictionary(plugin, frameURLString, String(), pageURLString, String(), String());
</span><del>- pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription, useBlockedPluginTitle);
</del><ins>+ pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(frameURLString);
</span><span class="cx"> UNUSED_PARAM(pageURLString);
</span><span class="cx"> UNUSED_PARAM(unavailabilityDescription);
</span><del>- UNUSED_PARAM(useBlockedPluginTitle);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> PluginProcessSandboxPolicy pluginProcessSandboxPolicy = PluginProcessSandboxPolicyNormal;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -1165,7 +1165,7 @@
</span><span class="cx"> void sendWheelEvent(const WebWheelEvent&);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- void findPlugin(const String& mimeType, uint32_t processType, const String& urlString, const String& frameURLString, const String& pageURLString, bool allowOnlyApplicationPlugins, uint64_t& pluginProcessToken, String& newMIMEType, uint32_t& pluginLoadPolicy, String& unavailabilityDescription, String& useBlockedPluginTitle);
</del><ins>+ void findPlugin(const String& mimeType, uint32_t processType, const String& urlString, const String& frameURLString, const String& pageURLString, bool allowOnlyApplicationPlugins, uint64_t& pluginProcessToken, String& newMIMEType, uint32_t& pluginLoadPolicy, String& unavailabilityDescription);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> PageClient& m_pageClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- FindPlugin(String mimeType, uint32_t processType, String urlString, String frameURLString, String pageURLString, bool allowOnlyApplicationPlugins) -> (uint64_t pluginProcessToken, String newMIMEType, uint32_t pluginLoadPolicy, String unavailabilityDescription, String useBlockedPluginTitle)
</del><ins>+ FindPlugin(String mimeType, uint32_t processType, String urlString, String frameURLString, String pageURLString, bool allowOnlyApplicationPlugins) -> (uint64_t pluginProcessToken, String newMIMEType, uint32_t pluginLoadPolicy, String unavailabilityDescription)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> DidUpdateViewState()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -46,9 +46,8 @@
</span><span class="cx"> OBJC_CLASS PDFAnnotation;
</span><span class="cx"> OBJC_CLASS PDFLayerController;
</span><span class="cx"> OBJC_CLASS PDFSelection;
</span><del>-OBJC_CLASS WKPDFLayerControllerDelegate;
</del><span class="cx"> OBJC_CLASS WKPDFPluginAccessibilityObject;
</span><del>-OBJC_CLASS WKPDFPluginContextMenuTarget;
</del><ins>+OBJC_CLASS WKPDFLayerControllerDelegate;
</ins><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class DataReference;
</span><span class="lines">@@ -89,7 +88,6 @@
</span><span class="cx"> void clickedLink(NSURL *);
</span><span class="cx"> void saveToPDF();
</span><span class="cx"> void openWithNativeApplication();
</span><del>- void openWithPlugin();
</del><span class="cx"> void writeItemsToPasteboard(NSString *pasteboardName, NSArray *items, NSArray *types);
</span><span class="cx"> void showDefinitionForAttributedString(NSAttributedString *, CGPoint);
</span><span class="cx"> void performWebSearch(NSString *);
</span><span class="lines">@@ -105,8 +103,6 @@
</span><span class="cx">
</span><span class="cx"> bool showContextMenuAtPoint(const WebCore::IntPoint&);
</span><span class="cx">
</span><del>- void setUsedInPlaceOfBlockedPlugin(bool value, const String& useBlockedPluginContextMenuTitle);
-
</del><span class="cx"> private:
</span><span class="cx"> explicit PDFPlugin(WebFrame*);
</span><span class="cx">
</span><span class="lines">@@ -261,10 +257,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_isPostScript;
</span><span class="cx"> bool m_pdfDocumentWasMutated;
</span><del>- bool m_usedInPlaceOfBlockedPlugin;
</del><span class="cx">
</span><del>- String m_useBlockedPluginContextMenuTitle;
-
</del><span class="cx"> WebCore::IntSize m_scrollOffset;
</span><span class="cx">
</span><span class="cx"> RetainPtr<CALayer> m_containerLayer;
</span><span class="lines">@@ -274,8 +267,7 @@
</span><span class="cx"> RetainPtr<CALayer> m_scrollCornerLayer;
</span><span class="cx"> RetainPtr<PDFLayerController> m_pdfLayerController;
</span><span class="cx"> RetainPtr<WKPDFPluginAccessibilityObject> m_accessibilityObject;
</span><del>- RetainPtr<WKPDFPluginContextMenuTarget> m_contextMenuTarget;
-
</del><ins>+
</ins><span class="cx"> RefPtr<PDFPluginAnnotation> m_activeAnnotation;
</span><span class="cx"> RefPtr<PDFPluginPasswordField> m_passwordField;
</span><span class="cx"> RefPtr<WebCore::Element> m_annotationContainer;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx"> #import <WebCore/ArchiveResource.h>
</span><span class="cx"> #import <WebCore/Chrome.h>
</span><del>-#import <WebCore/ChromeClient.h>
</del><span class="cx"> #import <WebCore/Cursor.h>
</span><span class="cx"> #import <WebCore/DocumentLoader.h>
</span><span class="cx"> #import <WebCore/FocusController.h>
</span><span class="lines">@@ -66,7 +65,6 @@
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="cx"> #import <WebCore/HTMLElement.h>
</span><span class="cx"> #import <WebCore/HTMLFormElement.h>
</span><del>-#import <WebCore/HTMLPlugInElement.h>
</del><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/MouseEvent.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="lines">@@ -271,38 +269,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WKPDFPluginContextMenuTarget : NSObject
-{
- WebKit::PDFPlugin* _pdfPlugin;
-}
</del><span class="cx">
</span><del>-@property(assign) WebKit::PDFPlugin* pdfPlugin;
-
-- (id)initWithPDFPlugin:(WebKit::PDFPlugin *)plugin;
-
-@end
-
-@implementation WKPDFPluginContextMenuTarget
-
-@synthesize pdfPlugin = _pdfPlugin;
-
-- (id)initWithPDFPlugin:(WebKit::PDFPlugin *)plugin
-{
- if (!(self = [super init]))
- return nil;
-
- _pdfPlugin = plugin;
-
- return self;
-}
-
-- (void)useBlockedPlugin:(id)sender
-{
- _pdfPlugin->openWithPlugin();
-}
-
-@end
-
</del><span class="cx"> @interface WKPDFPluginScrollbarLayer : CALayer
</span><span class="cx"> {
</span><span class="cx"> WebKit::PDFPlugin* _pdfPlugin;
</span><span class="lines">@@ -532,12 +499,10 @@
</span><span class="cx"> : m_frame(frame)
</span><span class="cx"> , m_isPostScript(false)
</span><span class="cx"> , m_pdfDocumentWasMutated(false)
</span><del>- , m_usedInPlaceOfBlockedPlugin(false)
</del><span class="cx"> , m_containerLayer(adoptNS([[CALayer alloc] init]))
</span><span class="cx"> , m_contentLayer(adoptNS([[CALayer alloc] init]))
</span><span class="cx"> , m_scrollCornerLayer(adoptNS([[WKPDFPluginScrollbarLayer alloc] initWithPDFPlugin:this]))
</span><span class="cx"> , m_pdfLayerController(adoptNS([[pdfLayerControllerClass() alloc] init]))
</span><del>- , m_contextMenuTarget(adoptNS([[WKPDFPluginContextMenuTarget alloc] initWithPDFPlugin:this]))
</del><span class="cx"> , m_pdfLayerControllerDelegate(adoptNS([[WKPDFLayerControllerDelegate alloc] initWithPDFPlugin:this]))
</span><span class="cx"> {
</span><span class="cx"> m_pdfLayerController.get().delegate = m_pdfLayerControllerDelegate.get();
</span><span class="lines">@@ -1492,18 +1457,6 @@
</span><span class="cx"> IntPoint point = frameView->contentsToScreen(IntRect(frameView->windowToContents(event.position()), IntSize())).location();
</span><span class="cx">
</span><span class="cx"> if (NSMenu *nsMenu = [m_pdfLayerController menuForEvent:nsEventForWebMouseEvent(event)]) {
</span><del>- if (m_usedInPlaceOfBlockedPlugin) {
- String title = useBlockedPlugInContextMenuTitle();
-
- if (!m_useBlockedPluginContextMenuTitle.isEmpty())
- title = m_useBlockedPluginContextMenuTitle;
-
- NSMenuItem *useBlockedPluginItem = [[[NSMenuItem alloc] initWithTitle:title action:@selector(useBlockedPlugin:) keyEquivalent:@""] autorelease];
-
- [useBlockedPluginItem setTarget:m_contextMenuTarget.get()];
- [nsMenu insertItem:useBlockedPluginItem atIndex:0];
- [nsMenu insertItem:[NSMenuItem separatorItem] atIndex:1];
- }
</del><span class="cx"> WKPopupContextMenu(nsMenu, point);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1690,11 +1643,6 @@
</span><span class="cx"> webFrame()->page()->send(Messages::WebPageProxy::OpenPDFFromTemporaryFolderWithNativeApplication(m_temporaryPDFUUID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PDFPlugin::openWithPlugin()
-{
- webFrame()->page()->corePage()->chrome().client().unavailablePluginButtonClicked(pluginView()->pluginElement(), RenderEmbeddedObject::InsecurePluginVersion);
-}
-
</del><span class="cx"> void PDFPlugin::writeItemsToPasteboard(NSString *pasteboardName, NSArray *items, NSArray *types)
</span><span class="cx"> {
</span><span class="cx"> Vector<String> pasteboardTypes;
</span><span class="lines">@@ -1935,13 +1883,6 @@
</span><span class="cx"> return m_accessibilityObject.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-void PDFPlugin::setUsedInPlaceOfBlockedPlugin(bool value, const String& useBlockedPluginContextMenuTitle)
-{
- m_usedInPlaceOfBlockedPlugin = value;
- m_useBlockedPluginContextMenuTitle = useBlockedPluginContextMenuTitle;
-}
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(PDFKIT_PLUGIN)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -574,8 +574,7 @@
</span><span class="cx"> uint64_t pluginProcessToken;
</span><span class="cx"> uint32_t pluginLoadPolicy;
</span><span class="cx"> String unavailabilityDescription;
</span><del>- String useBlockedPluginTitle;
- if (!sendSync(Messages::WebPageProxy::FindPlugin(parameters.mimeType, static_cast<uint32_t>(processType), parameters.url.string(), frameURLString, pageURLString, allowOnlyApplicationPlugins), Messages::WebPageProxy::FindPlugin::Reply(pluginProcessToken, newMIMEType, pluginLoadPolicy, unavailabilityDescription, useBlockedPluginTitle)))
</del><ins>+ if (!sendSync(Messages::WebPageProxy::FindPlugin(parameters.mimeType, static_cast<uint32_t>(processType), parameters.url.string(), frameURLString, pageURLString, allowOnlyApplicationPlugins), Messages::WebPageProxy::FindPlugin::Reply(pluginProcessToken, newMIMEType, pluginLoadPolicy, unavailabilityDescription)))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> bool isBlockedPlugin = static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy) == PluginModuleBlocked;
</span><span class="lines">@@ -585,7 +584,6 @@
</span><span class="cx"> String path = parameters.url.path();
</span><span class="cx"> if (shouldUsePDFPlugin() && (MIMETypeRegistry::isPDFOrPostScriptMIMEType(parameters.mimeType) || (parameters.mimeType.isEmpty() && (path.endsWith(".pdf", false) || path.endsWith(".ps", false))))) {
</span><span class="cx"> RefPtr<PDFPlugin> pdfPlugin = PDFPlugin::create(frame);
</span><del>- pdfPlugin->setUsedInPlaceOfBlockedPlugin(isBlockedPlugin, useBlockedPluginTitle);
</del><span class="cx"> return pdfPlugin.release();
</span><span class="cx"> }
</span><span class="cx"> #else
</span><span class="lines">@@ -3755,8 +3753,7 @@
</span><span class="cx"> uint64_t pluginProcessToken;
</span><span class="cx"> String newMIMEType;
</span><span class="cx"> String unavailabilityDescription;
</span><del>- String useBlockedPluginTitle;
- if (!sendSync(Messages::WebPageProxy::FindPlugin(response.mimeType(), PluginProcessTypeNormal, response.url().string(), response.url().string(), response.url().string(), allowOnlyApplicationPlugins), Messages::WebPageProxy::FindPlugin::Reply(pluginProcessToken, newMIMEType, pluginLoadPolicy, unavailabilityDescription, useBlockedPluginTitle)))
</del><ins>+ if (!sendSync(Messages::WebPageProxy::FindPlugin(response.mimeType(), PluginProcessTypeNormal, response.url().string(), response.url().string(), response.url().string(), allowOnlyApplicationPlugins), Messages::WebPageProxy::FindPlugin::Reply(pluginProcessToken, newMIMEType, pluginLoadPolicy, unavailabilityDescription)))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return pluginLoadPolicy != PluginModuleBlocked && pluginProcessToken;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Tools/ChangeLog 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-27 Tim Horton <timothy_horton@apple.com>
+
+ Revert the parts of r162629 that add a new pluginLoadPolicy and the context menu item.
+
+ We're leaving the parts that make us use PDFPlugin instead of showing the blocked
+ plugin indicator intact, though.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createWebViewWithOptions):
+
</ins><span class="cx"> 2014-01-27 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Scrub WebKit API headers of WTF macros
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (162882 => 162883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-01-28 00:04:39 UTC (rev 162882)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-01-28 00:07:30 UTC (rev 162883)
</span><span class="lines">@@ -459,9 +459,8 @@
</span><span class="cx"> 0, // didLayout
</span><span class="cx"> 0, // pluginLoadPolicy_deprecatedForUseWithV2
</span><span class="cx"> 0, // pluginDidFail
</span><del>- 0, // pluginLoadPolicy_deprecatedForUseWithV3
</del><ins>+ 0, // pluginLoadPolicy
</ins><span class="cx"> 0, // webGLLoadPolicy
</span><del>- pluginLoadPolicy, // pluginLoadPolicy
</del><span class="cx"> };
</span><span class="cx"> WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient.base);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>