Diff
Modified: trunk/Source/WebKit2/ChangeLog (143789 => 143790)
--- trunk/Source/WebKit2/ChangeLog 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-22 22:06:51 UTC (rev 143790)
@@ -1,3 +1,30 @@
+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-02-21 Jer Noble <[email protected]>
Two video contollers appear after exiting the fullscreen video when using menubar to exit.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (143789 => 143790)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-02-22 22:06:51 UTC (rev 143790)
@@ -49,6 +49,13 @@
};
typedef uint32_t WKFocusDirection;
+enum {
+ kWKPluginLoadPolicyLoadNormally = 0,
+ kWKPluginLoadPolicyBlocked,
+ kWKPluginLoadPolicyInactive,
+};
+typedef uint32_t WKPluginLoadPolicy;
+
typedef void (*WKPageCallback)(WKPageRef page, const void* clientInfo);
// FrameLoad Client
@@ -75,6 +82,7 @@
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 void (*WKPageDidLayoutCallback)(WKPageRef page, WKLayoutMilestones milestones, WKTypeRef userData, 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);
@@ -129,6 +137,7 @@
void (*registerIntentServiceForFrame_unavailable)(void);
WKPageDidLayoutCallback didLayout;
+ WKPagePluginLoadPolicyCallback pluginLoadPolicy;
};
typedef struct WKPageLoaderClient WKPageLoaderClient;
@@ -171,13 +180,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);
@@ -215,7 +217,6 @@
typedef void (*WKPageUnavailablePluginButtonClickedCallback)(WKPageRef page, WKPluginUnavailabilityReason pluginUnavailabilityReason, WKStringRef mimeType, WKStringRef url, WKStringRef pluginsPageURL, const void* clientInfo);
typedef void (*WKPageShowColorPickerCallback)(WKPageRef page, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo);
typedef void (*WKPageHideColorPickerCallback)(WKPageRef page, 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);
@@ -276,7 +277,6 @@
// Version 2
WKPageShowColorPickerCallback showColorPicker;
WKPageHideColorPickerCallback hideColorPicker;
- WKPagePluginLoadPolicyCallback pluginLoadPolicy;
};
typedef struct WKPageUIClient WKPageUIClient;
Modified: trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp (143789 => 143790)
--- trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-02-22 22:06:51 UTC (rev 143790)
@@ -291,4 +291,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: trunk/Source/WebKit2/UIProcess/WebLoaderClient.h (143789 => 143790)
--- trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2013-02-22 22:06:51 UTC (rev 143790)
@@ -27,6 +27,7 @@
#define WebLoaderClient_h
#include "APIClient.h"
+#include "PluginModuleInfo.h"
#include "SameDocumentNavigationType.h"
#include "WKPage.h"
#include <WebCore/LayoutMilestones.h>
@@ -88,8 +89,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: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (143789 => 143790)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-02-22 22:06:51 UTC (rev 143790)
@@ -1256,7 +1256,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);
#else
UNUSED_PARAM(documentURLString);
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.cpp (143789 => 143790)
--- trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-02-22 22:06:51 UTC (rev 143790)
@@ -438,42 +438,4 @@
}
#endif
-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: trunk/Source/WebKit2/UIProcess/WebUIClient.h (143789 => 143790)
--- trunk/Source/WebKit2/UIProcess/WebUIClient.h 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.h 2013-02-22 22:06:51 UTC (rev 143790)
@@ -27,7 +27,6 @@
#define WebUIClient_h
#include "APIClient.h"
-#include "PluginModuleInfo.h"
#include "WKPage.h"
#include "WebEvent.h"
#include "WebHitTestResult.h"
@@ -122,8 +121,6 @@
bool showColorPicker(WebPageProxy*, const String&, WebColorPickerResultListenerProxy*);
bool hideColorPicker(WebPageProxy*);
#endif
-
- PluginModuleLoadPolicy pluginLoadPolicy(WebPageProxy*, const String& identifier, const String& displayName, const String& documentURLString, PluginModuleLoadPolicy currentPluginLoadPolicy);
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (143789 => 143790)
--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-02-22 22:06:51 UTC (rev 143790)
@@ -352,7 +352,6 @@
0, // unavailablePluginButtonClicked
0, // showColorPicker
0, // hideColorPicker
- 0, // shouldInstantiatePlugin
};
inspectorPage->initializeUIClient(&uiClient);
Modified: trunk/Tools/ChangeLog (143789 => 143790)
--- trunk/Tools/ChangeLog 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Tools/ChangeLog 2013-02-22 22:06:51 UTC (rev 143790)
@@ -1,3 +1,16 @@
+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-22 Kenneth Russell <[email protected]>
Unreviewed. Changed gman's primary address for auto-complete in Bugzilla.
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (143789 => 143790)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-02-22 22:06:51 UTC (rev 143790)
@@ -642,6 +642,7 @@
0, // didReceiveIntentForFrame
0, // registerIntentServiceForFrame
0, // didLayout
+ 0, // pluginLoadPolicy
};
WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
@@ -703,7 +704,6 @@
0, // unavailablePluginButtonClicked
0, // showColorPicker
0, // hideColorPicker
- 0, // shouldInstantiatePlugin
};
WKPageSetPageUIClient(_webView.pageRef, &uiClient);
}
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (143789 => 143790)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2013-02-22 22:00:09 UTC (rev 143789)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2013-02-22 22:06:51 UTC (rev 143790)
@@ -237,7 +237,6 @@
0, // unavailablePluginButtonClicked
0, // showColorPicker
0, // hideColorPicker
- 0, // shouldInstantiatePlugin
};
WKPageSetPageUIClient(newPage, &otherPageUIClient);
@@ -428,7 +427,6 @@
unavailablePluginButtonClicked,
0, // showColorPicker
0, // hideColorPicker
- 0, // shouldInstantiatePlugin
};
WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
@@ -468,6 +466,7 @@
0, // didReceiveIntentForFrame
0, // registerIntentServiceForFrame
0, // didLayout
+ 0, // pluginLoadPolicy
};
WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient);
