Diff
Modified: branches/safari-536.29-branch/Source/WebKit2/ChangeLog (144491 => 144492)
--- branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-01 21:25:26 UTC (rev 144492)
@@ -1,5 +1,36 @@
2013-03-01 Brady Eidson <[email protected]>
+ Merge r143790
+
+ 2013-02-22 Anders Carlsson <[email protected]>
+
+ Move pluginLoadPolicy to the page loader client
+ https://bugs.webkit.org/show_bug.cgi?id=110635
+ <rdar://problem/13265303>
+
+ Reviewed by Sam Weinig.
+
+ Move the pluginLoadPolicy callback to the page loader client where it belongs.
+
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/WebLoaderClient.cpp:
+ (WebKit::toWKPluginLoadPolicy):
+ (WebKit):
+ (WebKit::toPluginModuleLoadPolicy):
+ (WebKit::WebLoaderClient::pluginLoadPolicy):
+ * UIProcess/WebLoaderClient.h:
+ (WebLoaderClient):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::getPluginPath):
+ * UIProcess/WebUIClient.cpp:
+ (WebKit):
+ * UIProcess/WebUIClient.h:
+ (WebUIClient):
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+
+2013-03-01 Brady Eidson <[email protected]>
+
Merge r142919
2013-02-14 Anders Carlsson <[email protected]>
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h (144491 => 144492)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-03-01 21:25:26 UTC (rev 144492)
@@ -48,6 +48,13 @@
};
typedef uint32_t WKFocusDirection;
+enum {
+ kWKPluginLoadPolicyLoadNormally = 0,
+ kWKPluginLoadPolicyBlocked,
+ kWKPluginLoadPolicyInactive,
+};
+typedef uint32_t WKPluginLoadPolicy;
+
typedef void (*WKPageCallback)(WKPageRef page, const void* clientInfo);
// FrameLoad Client
@@ -74,6 +81,8 @@
typedef void (*WKPageWillGoToBackForwardListItemCallback)(WKPageRef page, WKBackForwardListItemRef item, WKTypeRef userData, const void *clientInfo);
typedef void (*WKPagePluginDidFailCallback)(WKPageRef page, WKErrorCode errorCode, WKStringRef mimeType, WKStringRef pluginIdentifier, WKStringRef pluginVersion, const void* clientInfo);
+typedef WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback)(WKPageRef page, WKStringRef identifier, WKStringRef displayName, WKURLRef documentURL, WKPluginLoadPolicy currentPluginLoadPolicy, const void* clientInfo);
+
// Deprecated
typedef void (*WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0)(WKPageRef page, WKStringRef mimeType, const void* clientInfo);
@@ -120,6 +129,8 @@
WKPageCallback interactionOccurredWhileProcessUnresponsive;
WKPagePluginDidFailCallback pluginDidFail;
+
+ WKPagePluginLoadPolicyCallback pluginLoadPolicy;
};
typedef struct WKPageLoaderClient WKPageLoaderClient;
@@ -184,13 +195,6 @@
};
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);
@@ -226,7 +230,6 @@
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 WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback)(WKPageRef page, WKStringRef identifier, WKStringRef displayName, WKURLRef documentURL, WKPluginLoadPolicy currentPluginLoadPolicy, const void* clientInfo);
// Deprecated
typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV0)(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
@@ -283,7 +286,6 @@
WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest;
WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
- WKPagePluginLoadPolicyCallback pluginLoadPolicy;
};
typedef struct WKPageUIClient WKPageUIClient;
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebLoaderClient.cpp (144491 => 144492)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-03-01 21:25:26 UTC (rev 144492)
@@ -283,4 +283,43 @@
m_client.pluginDidFail(toAPI(page), kWKErrorCodeInsecurePlugInVersion, toAPI(mimeType.impl()), toAPI(pluginIdentifier.impl()), toAPI(pluginVersion.impl()), m_client.clientInfo);
}
+static inline WKPluginLoadPolicy toWKPluginLoadPolicy(PluginModuleLoadPolicy pluginModuleLoadPolicy)
+{
+ switch (pluginModuleLoadPolicy) {
+ case PluginModuleLoadNormally:
+ return kWKPluginLoadPolicyLoadNormally;
+ case PluginModuleBlocked:
+ return kWKPluginLoadPolicyBlocked;
+ case PluginModuleInactive:
+ return kWKPluginLoadPolicyInactive;
+ }
+
+ 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 WebLoaderClient::pluginLoadPolicy(WebPageProxy* page, const String& identifier, const String& displayName, const String& documentURLString, PluginModuleLoadPolicy currentPluginLoadPolicy)
+{
+ if (!m_client.pluginLoadPolicy)
+ return currentPluginLoadPolicy;
+
+ return toPluginModuleLoadPolicy(m_client.pluginLoadPolicy(toAPI(page), toAPI(identifier.impl()), toAPI(displayName.impl()), toURLRef(documentURLString.impl()), toWKPluginLoadPolicy(currentPluginLoadPolicy), m_client.clientInfo));
+}
+
+
} // namespace WebKit
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebLoaderClient.h (144491 => 144492)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebLoaderClient.h 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebLoaderClient.h 2013-03-01 21:25:26 UTC (rev 144492)
@@ -27,6 +27,7 @@
#define WebLoaderClient_h
#include "APIClient.h"
+#include "PluginModuleInfo.h"
#include "SameDocumentNavigationType.h"
#include "WKPage.h"
#include <wtf/Forward.h>
@@ -86,8 +87,10 @@
bool shouldGoToBackForwardListItem(WebPageProxy*, WebBackForwardListItem*);
void willGoToBackForwardListItem(WebPageProxy*, WebBackForwardListItem*, APIObject*);
+ PluginModuleLoadPolicy pluginLoadPolicy(WebPageProxy*, const String& identifier, const String& displayName, const String& documentURLString, PluginModuleLoadPolicy currentPluginLoadPolicy);
void didFailToInitializePlugin(WebPageProxy*, const String& mimeType);
void didBlockInsecurePluginVersion(WebPageProxy*, const String& mimeType, const String& pluginIdentifier, const String& pluginVersion);
+
};
} // namespace WebKit
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (144491 => 144492)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-03-01 21:25:26 UTC (rev 144492)
@@ -1137,7 +1137,7 @@
#if PLATFORM(MAC)
PluginModuleLoadPolicy currentPluginLoadPolicy = static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy);
- pluginLoadPolicy = m_uiClient.pluginLoadPolicy(this, plugin.bundleIdentifier, plugin.info.name, documentURLString, currentPluginLoadPolicy);
+ pluginLoadPolicy = m_loaderClient.pluginLoadPolicy(this, plugin.bundleIdentifier, plugin.info.name, documentURLString, currentPluginLoadPolicy);
#endif
if (pluginLoadPolicy != PluginModuleLoadNormally)
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.cpp (144491 => 144492)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-03-01 21:25:26 UTC (rev 144492)
@@ -417,42 +417,4 @@
return m_client.shouldInterruptJavaScript(toAPI(page), m_client.clientInfo);
}
-static inline WKPluginLoadPolicy toWKPluginLoadPolicy(PluginModuleLoadPolicy pluginModuleLoadPolicy)
-{
- switch (pluginModuleLoadPolicy) {
- case PluginModuleLoadNormally:
- return kWKPluginLoadPolicyLoadNormally;
- case PluginModuleBlocked:
- return kWKPluginLoadPolicyBlocked;
- case PluginModuleInactive:
- return kWKPluginLoadPolicyInactive;
- }
-
- 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, const String& documentURLString, PluginModuleLoadPolicy currentPluginLoadPolicy)
-{
- if (!m_client.pluginLoadPolicy)
- return currentPluginLoadPolicy;
-
- return toPluginModuleLoadPolicy(m_client.pluginLoadPolicy(toAPI(page), toAPI(identifier.impl()), toAPI(displayName.impl()), toURLRef(documentURLString.impl()), toWKPluginLoadPolicy(currentPluginLoadPolicy), m_client.clientInfo));
-}
-
} // namespace WebKit
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.h (144491 => 144492)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.h 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebUIClient.h 2013-03-01 21:25:26 UTC (rev 144492)
@@ -27,7 +27,6 @@
#define WebUIClient_h
#include "APIClient.h"
-#include "PluginModuleInfo.h"
#include "WKPage.h"
#include "WebEvent.h"
#include "WebHitTestResult.h"
@@ -116,8 +115,6 @@
void saveDataToFileInDownloadsFolder(WebPageProxy*, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData*);
bool shouldInterruptJavaScript(WebPageProxy*);
-
- PluginModuleLoadPolicy pluginLoadPolicy(WebPageProxy*, const String& identifier, const String& displayName, const String& documentURLString, PluginModuleLoadPolicy currentPluginLoadPolicy);
};
} // namespace WebKit
Modified: branches/safari-536.29-branch/Tools/ChangeLog (144491 => 144492)
--- branches/safari-536.29-branch/Tools/ChangeLog 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Tools/ChangeLog 2013-03-01 21:25:26 UTC (rev 144492)
@@ -1,3 +1,20 @@
+2013-03-01 Brady Eidson <[email protected]>
+
+ Merge r143790
+
+ 2013-02-22 Anders Carlsson <[email protected]>
+
+ Move pluginLoadPolicy to the page loader client
+ https://bugs.webkit.org/show_bug.cgi?id=110635
+
+ Reviewed by Sam Weinig.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::createWebViewWithOptions):
+
2013-02-28 Brady Eidson <[email protected]>
Merge r141486
Modified: branches/safari-536.29-branch/Tools/MiniBrowser/mac/BrowserWindowController.m (144491 => 144492)
--- branches/safari-536.29-branch/Tools/MiniBrowser/mac/BrowserWindowController.m 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Tools/MiniBrowser/mac/BrowserWindowController.m 2013-03-01 21:25:26 UTC (rev 144492)
@@ -612,6 +612,7 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail
+ 0, // pluginLoadPolicy
};
WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
@@ -671,7 +672,6 @@
mouseDidMoveOverElement,
0, // decidePolicyForNotificationPermissionRequest
0, // unavailablePluginButtonClicked
- 0, // shouldInstantiatePlugin
};
WKPageSetPageUIClient(_webView.pageRef, &uiClient);
}
Modified: branches/safari-536.29-branch/Tools/WebKitTestRunner/TestController.cpp (144491 => 144492)
--- branches/safari-536.29-branch/Tools/WebKitTestRunner/TestController.cpp 2013-03-01 21:18:46 UTC (rev 144491)
+++ branches/safari-536.29-branch/Tools/WebKitTestRunner/TestController.cpp 2013-03-01 21:25:26 UTC (rev 144492)
@@ -213,7 +213,6 @@
0, // mouseDidMoveOverElement
0, // decidePolicyForNotificationPermissionRequest
0, // unavailablePluginButtonClicked
- 0, // shouldInstantiatePlugin
};
WKPageSetPageUIClient(newPage, &otherPageUIClient);
@@ -374,7 +373,6 @@
0, // mouseDidMoveOverElement
0, // decidePolicyForNotificationPermissionRequest
0, // unavailablePluginButtonClicked
- 0, // shouldInstantiatePlugin
};
WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
@@ -411,6 +409,7 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail
+ 0, // pluginLoadPolicy
};
WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient);
}
