Diff
Modified: branches/safari-536.29-branch/Source/WebKit2/ChangeLog (144471 => 144472)
--- 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)
@@ -1,3 +1,30 @@
+2013-03-01 Brady Eidson <[email protected]>
+
+ Merge r141923
+
+ 2013-02-05 Anders Carlsson <[email protected]>
+
+ WebKit clients should be able to override loading of blocked plug-ins
+ https://bugs.webkit.org/show_bug.cgi?id=108968
+ <rdar://problem/13154516>
+
+ 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):
+
2013-02-28 Brady Eidson <[email protected]>
Merge r141486
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h (144471 => 144472)
--- 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)
@@ -184,6 +184,13 @@
};
typedef uint32_t WKPluginUnavailabilityReason;
+enum {
+ kWKPluginLoadPolicyLoadNormally = 0,
+ kWKPluginLoadPolicyBlocked,
+ kWKPluginLoadPolicyInactive,
+};
+typedef uint32_t WKPluginLoadPolicy;
+
// UI Client
typedef WKPageRef (*WKPageCreateNewPageCallback)(WKPageRef page, WKURLRequestRef urlRequest, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
typedef void (*WKPageRunJavaScriptAlertCallback)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void *clientInfo);
@@ -219,7 +226,7 @@
typedef bool (*WKPageShouldInterruptJavaScriptCallback)(WKPageRef page, const void *clientInfo);
typedef void (*WKPageDecidePolicyForNotificationPermissionRequestCallback)(WKPageRef page, WKSecurityOriginRef origin, WKNotificationPermissionRequestRef permissionRequest, const void *clientInfo);
typedef void (*WKPageUnavailablePluginButtonClickedCallback)(WKPageRef page, WKPluginUnavailabilityReason pluginUnavailabilityReason, WKStringRef mimeType, WKStringRef url, WKStringRef pluginsPageURL, const void* clientInfo);
-typedef bool (*WKPageShouldInstantiatePluginCallback)(WKPageRef page, WKStringRef identifier, WKStringRef displayName, const void* clientInfo);
+typedef WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback)(WKPageRef page, WKStringRef identifier, WKStringRef displayName, WKPluginLoadPolicy currentPluginLoadPolicy, const void* clientInfo);
// Deprecated
typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV0)(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
@@ -276,7 +283,7 @@
WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest;
WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
- WKPageShouldInstantiatePluginCallback shouldInstantiatePlugin;
+ WKPagePluginLoadPolicyCallback pluginLoadPolicy;
};
typedef struct WKPageUIClient WKPageUIClient;
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (144471 => 144472)
--- 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)
@@ -1134,10 +1134,12 @@
return;
pluginLoadPolicy = PluginInfoStore::policyForPlugin(plugin);
- if (pluginLoadPolicy != PluginModuleLoadNormally)
- return;
- pluginLoadPolicy = m_uiClient.shouldInstantiatePlugin(this, plugin.bundleIdentifier, plugin.info.name) ? PluginModuleLoadNormally : PluginModuleBlocked;
+#if PLATFORM(MAC)
+ PluginModuleLoadPolicy currentPluginLoadPolicy = static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy);
+ pluginLoadPolicy = m_uiClient.pluginLoadPolicy(this, plugin.bundleIdentifier, plugin.info.name, currentPluginLoadPolicy);
+#endif
+
if (pluginLoadPolicy != PluginModuleLoadNormally)
return;
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.cpp (144471 => 144472)
--- 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)
@@ -417,12 +417,42 @@
return m_client.shouldInterruptJavaScript(toAPI(page), m_client.clientInfo);
}
-bool WebUIClient::shouldInstantiatePlugin(WebPageProxy* page, const String& identifier, const String& displayName)
+static inline WKPluginLoadPolicy toWKPluginLoadPolicy(PluginModuleLoadPolicy pluginModuleLoadPolicy)
{
- if (!m_client.shouldInstantiatePlugin)
- return true;
+ switch (pluginModuleLoadPolicy) {
+ case PluginModuleLoadNormally:
+ return kWKPluginLoadPolicyLoadNormally;
+ case PluginModuleBlocked:
+ return kWKPluginLoadPolicyBlocked;
+ case PluginModuleInactive:
+ return kWKPluginLoadPolicyInactive;
+ }
- return m_client.shouldInstantiatePlugin(toAPI(page), toAPI(identifier.impl()), toAPI(displayName.impl()), m_client.clientInfo);
+ ASSERT_NOT_REACHED();
+ return kWKPluginLoadPolicyBlocked;
}
+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& identifier, const String& 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));
+}
+
} // namespace WebKit
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.h (144471 => 144472)
--- 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)
@@ -27,6 +27,7 @@
#define WebUIClient_h
#include "APIClient.h"
+#include "PluginModuleInfo.h"
#include "WKPage.h"
#include "WebEvent.h"
#include "WebHitTestResult.h"
@@ -116,7 +117,7 @@
bool shouldInterruptJavaScript(WebPageProxy*);
- bool shouldInstantiatePlugin(WebPageProxy*, const String& identifier, const String& displayName);
+ PluginModuleLoadPolicy pluginLoadPolicy(WebPageProxy*, const String& identifier, const String& displayName, PluginModuleLoadPolicy currentPluginLoadPolicy);
};
} // namespace WebKit
