Diff
Modified: trunk/Source/WebKit/ChangeLog (201688 => 201689)
--- trunk/Source/WebKit/ChangeLog 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/ChangeLog 2016-06-04 22:48:07 UTC (rev 201689)
@@ -1,3 +1,12 @@
+2016-06-04 Anders Carlsson <[email protected]>
+
+ Remove NPSPI that is no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=158384
+
+ Reviewed by Sam Weinig.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2016-06-03 Chris Dumez <[email protected]>
Modernize a few more lambda captures
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (201688 => 201689)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-06-04 22:48:07 UTC (rev 201689)
@@ -15,10 +15,6 @@
070F549C17F1E42B00169E04 /* WebUserMediaClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070F549A17F1E42B00169E04 /* WebUserMediaClient.mm */; };
072E5F451ABF88750003B164 /* WebMediaPlaybackTargetPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 072E5F431ABF88750003B164 /* WebMediaPlaybackTargetPicker.h */; };
072E5F461ABF88750003B164 /* WebMediaPlaybackTargetPicker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 072E5F441ABF88750003B164 /* WebMediaPlaybackTargetPicker.mm */; };
- 0AB752370FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0AB752350FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h */; };
- 0AB752380FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0AB752360FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm */; };
- 0AEBFF630F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0AEBFF610F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 0AEBFF640F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0AEBFF620F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm */; };
1430C12C1B2C5DF700DEA01D /* WebViewGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1430C12A1B2C5DF700DEA01D /* WebViewGroup.cpp */; };
1430C12D1B2C5DF700DEA01D /* WebViewGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1430C12B1B2C5DF700DEA01D /* WebViewGroup.h */; };
14D8252F0AF955090004F057 /* WebChromeClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 14D8252D0AF955090004F057 /* WebChromeClient.h */; };
@@ -474,10 +470,6 @@
070F549A17F1E42B00169E04 /* WebUserMediaClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebUserMediaClient.mm; sourceTree = "<group>"; };
072E5F431ABF88750003B164 /* WebMediaPlaybackTargetPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaPlaybackTargetPicker.h; sourceTree = "<group>"; };
072E5F441ABF88750003B164 /* WebMediaPlaybackTargetPicker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMediaPlaybackTargetPicker.mm; sourceTree = "<group>"; };
- 0AB752350FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapeContainerCheckContextInfo.h; sourceTree = "<group>"; };
- 0AB752360FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapeContainerCheckContextInfo.mm; sourceTree = "<group>"; };
- 0AEBFF610F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = WebNetscapeContainerCheckPrivate.h; sourceTree = "<group>"; };
- 0AEBFF620F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapeContainerCheckPrivate.mm; sourceTree = "<group>"; };
1430C12A1B2C5DF700DEA01D /* WebViewGroup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = WebViewGroup.cpp; path = WebCoreSupport/WebViewGroup.cpp; sourceTree = SOURCE_ROOT; };
1430C12B1B2C5DF700DEA01D /* WebViewGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewGroup.h; path = WebCoreSupport/WebViewGroup.h; sourceTree = SOURCE_ROOT; };
14D8252D0AF955090004F057 /* WebChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebChromeClient.h; sourceTree = "<group>"; };
@@ -1286,10 +1278,6 @@
F5F717230288493C018635CA /* npapi.mm */,
1A4DF5E20EC8D104006BD4B4 /* WebBaseNetscapePluginView.h */,
1A4DF5E30EC8D104006BD4B4 /* WebBaseNetscapePluginView.mm */,
- 0AB752350FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h */,
- 0AB752360FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm */,
- 0AEBFF610F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h */,
- 0AEBFF620F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm */,
F5F7171E0288493C018635CA /* WebNetscapePluginPackage.h */,
F5F7171F0288493C018635CA /* WebNetscapePluginPackage.mm */,
F5A672B90263866E01000102 /* WebNetscapePluginStream.h */,
@@ -1872,8 +1860,6 @@
072E5F451ABF88750003B164 /* WebMediaPlaybackTargetPicker.h in Headers */,
A10C1D721820300E0036883A /* WebMIMETypeRegistry.h in Headers */,
5185F62610712B80007AA393 /* WebNavigationData.h in Headers */,
- 0AB752370FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h in Headers */,
- 0AEBFF630F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.h in Headers */,
1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */,
1AEA66D80DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h in Headers */,
1AEA6A500DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.h in Headers */,
@@ -2280,8 +2266,6 @@
072E5F461ABF88750003B164 /* WebMediaPlaybackTargetPicker.mm in Sources */,
A10C1D731820300E0036883A /* WebMIMETypeRegistry.mm in Sources */,
5185F62810712B97007AA393 /* WebNavigationData.mm in Sources */,
- 0AB752380FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm in Sources */,
- 0AEBFF640F9FA8BE000D486B /* WebNetscapeContainerCheckPrivate.mm in Sources */,
1AEA66D50DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm in Sources */,
1AEA66D90DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.mm in Sources */,
1AEA6A510DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.mm in Sources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (201688 => 201689)
--- trunk/Source/WebKit/mac/ChangeLog 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-04 22:48:07 UTC (rev 201689)
@@ -1,5 +1,55 @@
2016-06-04 Anders Carlsson <[email protected]>
+ Remove NPSPI that is no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=158384
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/WebKitLegacy.xcconfig:
+ * Plugins/Hosted/NetscapePluginHostProxy.mm:
+ (WKPCCheckIfAllowedToLoadURL): Deleted.
+ (WKPCCancelCheckIfAllowedToLoadURL): Deleted.
+ (WKPCResolveURL): Deleted.
+ * Plugins/Hosted/NetscapePluginInstanceProxy.h:
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::NetscapePluginInstanceProxy): Deleted.
+ (WebKit::NetscapePluginInstanceProxy::checkIfAllowedToLoadURL): Deleted.
+ (WebKit::NetscapePluginInstanceProxy::cancelCheckIfAllowedToLoadURL): Deleted.
+ (WebKit::NetscapePluginInstanceProxy::checkIfAllowedToLoadURLResult): Deleted.
+ (WebKit::NetscapePluginInstanceProxy::resolveURL): Deleted.
+ * Plugins/Hosted/WebHostedNetscapePluginView.h:
+ * Plugins/Hosted/WebHostedNetscapePluginView.mm:
+ (-[WebHostedNetscapePluginView _webPluginContainerCancelCheckIfAllowedToLoadRequest:]): Deleted.
+ (-[WebHostedNetscapePluginView _containerCheckResult:contextInfo:]): Deleted.
+ * Plugins/Hosted/WebKitPluginClient.defs:
+ * Plugins/WebBaseNetscapePluginView.h:
+ * Plugins/WebBaseNetscapePluginView.mm:
+ (-[WebBaseNetscapePluginView resolvedURLStringForURL:target:]): Deleted.
+ * Plugins/WebNetscapeContainerCheckContextInfo.h: Removed.
+ * Plugins/WebNetscapeContainerCheckContextInfo.mm: Removed.
+ (-[WebNetscapeContainerCheckContextInfo initWithCheckRequestID:callbackFunc:context:]): Deleted.
+ (-[WebNetscapeContainerCheckContextInfo checkRequestID]): Deleted.
+ (-[WebNetscapeContainerCheckContextInfo callback]): Deleted.
+ (-[WebNetscapeContainerCheckContextInfo context]): Deleted.
+ * Plugins/WebNetscapeContainerCheckPrivate.h: Removed.
+ * Plugins/WebNetscapeContainerCheckPrivate.mm: Removed.
+ (browserContainerCheckFuncs): Deleted.
+ * Plugins/WebNetscapePluginView.h:
+ * Plugins/WebNetscapePluginView.mm:
+ (-[WebNetscapePluginView checkIfAllowedToLoadURL:frame:callbackFunc:context:]): Deleted.
+ (-[WebNetscapePluginView _containerCheckResult:contextInfo:]): Deleted.
+ (-[WebNetscapePluginView cancelCheckIfAllowedToLoadURL:]): Deleted.
+ (-[WebNetscapePluginView _webPluginContainerCancelCheckIfAllowedToLoadRequest:]): Deleted.
+ (-[WebNetscapePluginView fini]): Deleted.
+ (-[WebNetscapePluginView getVariable:value:]): Deleted.
+ (-[WebNetscapePluginView resolveURL:forTarget:]): Deleted.
+ * Plugins/npapi.mm:
+ (WKN_CheckIfAllowedToLoadURL): Deleted.
+ (WKN_CancelCheckIfAllowedToLoadURL): Deleted.
+ (WKN_ResolveURL): Deleted.
+
+2016-06-04 Anders Carlsson <[email protected]>
+
Temporary build fix. (This function is going away).
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (201688 => 201689)
--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-06-04 22:48:07 UTC (rev 201689)
@@ -24,7 +24,7 @@
#include "FeatureDefines.xcconfig"
#include "Version.xcconfig"
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.defs *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.defs *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2016-06-04 22:48:07 UTC (rev 201689)
@@ -1103,60 +1103,7 @@
return KERN_SUCCESS;
}
-kern_return_t WKPCCheckIfAllowedToLoadURL(mach_port_t clientPort, uint32_t pluginID, data_t urlData, mach_msg_type_number_t urlLength,
- data_t targetData, mach_msg_type_number_t targetLength, uint32_t *checkID)
-{
- DataDeallocator urlDeallocator(urlData, urlLength);
- DataDeallocator targetDeallocator(targetData, targetLength);
- NetscapePluginHostProxy* hostProxy = pluginProxyMap().get(clientPort);
- if (!hostProxy)
- return KERN_FAILURE;
-
- NetscapePluginInstanceProxy* instanceProxy = hostProxy->pluginInstance(pluginID);
- if (!instanceProxy)
- return KERN_FAILURE;
-
- *checkID = instanceProxy->checkIfAllowedToLoadURL(urlData, targetData);
- return KERN_SUCCESS;
-}
-
-kern_return_t WKPCCancelCheckIfAllowedToLoadURL(mach_port_t clientPort, uint32_t pluginID, uint32_t checkID)
-{
- NetscapePluginHostProxy* hostProxy = pluginProxyMap().get(clientPort);
- if (!hostProxy)
- return KERN_FAILURE;
-
- NetscapePluginInstanceProxy* instanceProxy = hostProxy->pluginInstance(pluginID);
- if (!instanceProxy)
- return KERN_FAILURE;
-
- instanceProxy->cancelCheckIfAllowedToLoadURL(checkID);
- return KERN_SUCCESS;
-}
-
-kern_return_t WKPCResolveURL(mach_port_t clientPort, uint32_t pluginID, data_t urlData, mach_msg_type_number_t urlLength,
- data_t targetData, mach_msg_type_number_t targetLength,
- data_t *resolvedURLData, mach_msg_type_number_t *resolvedURLLength)
-{
- DataDeallocator urlDeallocator(urlData, urlLength);
- DataDeallocator targetDeallocator(targetData, targetLength);
-
- *resolvedURLData = 0;
- *resolvedURLLength = 0;
-
- NetscapePluginHostProxy* hostProxy = pluginProxyMap().get(clientPort);
- if (!hostProxy)
- return KERN_FAILURE;
-
- NetscapePluginInstanceProxy* instanceProxy = hostProxy->pluginInstance(pluginID);
- if (!instanceProxy)
- return KERN_FAILURE;
-
- instanceProxy->resolveURL(urlData, targetData, *resolvedURLData, *resolvedURLLength);
- return KERN_SUCCESS;
-}
-
kern_return_t WKPCSetException(mach_port_t clientPort, data_t message, mach_msg_type_number_t messageCnt)
{
DataDeallocator deallocator(message, messageCnt);
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h 2016-06-04 22:48:07 UTC (rev 201689)
@@ -162,13 +162,7 @@
bool shouldStop();
uint32_t nextRequestID();
-
- uint32_t checkIfAllowedToLoadURL(const char* url, const char* target);
- void cancelCheckIfAllowedToLoadURL(uint32_t checkID);
- void checkIfAllowedToLoadURLResult(uint32_t checkID, bool allowed);
- void resolveURL(const char* url, const char* target, data_t& resolvedURLData, mach_msg_type_number_t& resolvedURLLength);
-
void didDraw();
void privateBrowsingModeDidChange(bool isPrivateBrowsingEnabled);
@@ -343,10 +337,6 @@
typedef HashSet<ProxyInstance*> ProxyInstanceSet;
ProxyInstanceSet m_instances;
- uint32_t m_urlCheckCounter;
- typedef HashMap<uint32_t, RetainPtr<id>> URLCheckMap;
- URLCheckMap m_urlChecks;
-
unsigned m_pluginFunctionCallDepth;
bool m_shouldStopSoon;
uint32_t m_currentRequestID;
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-06-04 22:48:07 UTC (rev 201689)
@@ -223,7 +223,6 @@
, m_renderContextID(0)
, m_rendererType(UseSoftwareRenderer)
, m_waitingForReply(false)
- , m_urlCheckCounter(0)
, m_pluginFunctionCallDepth(0)
, m_shouldStopSoon(false)
, m_currentRequestID(0)
@@ -1607,58 +1606,6 @@
return [m_pluginView convertFromX:sourceX andY:sourceY space:sourceSpace toX:&destX andY:&destY space:destSpace];
}
-uint32_t NetscapePluginInstanceProxy::checkIfAllowedToLoadURL(const char* url, const char* target)
-{
- uint32_t checkID;
-
- // Assign a check ID
- do {
- checkID = ++m_urlCheckCounter;
- } while (m_urlChecks.contains(checkID) || !m_urlCheckCounter);
-
- NSString *frameName = target ? [NSString stringWithCString:target encoding:NSISOLatin1StringEncoding] : nil;
-
- NSNumber *contextInfo = [[NSNumber alloc] initWithUnsignedInt:checkID];
- WebPluginContainerCheck *check = [WebPluginContainerCheck checkWithRequest:[m_pluginView requestWithURLCString:url]
- target:frameName
- resultObject:m_pluginView
- selector:@selector(_containerCheckResult:contextInfo:)
- controller:m_pluginView
- contextInfo:contextInfo];
-
- [contextInfo release];
- m_urlChecks.set(checkID, check);
- [check start];
-
- return checkID;
-}
-
-void NetscapePluginInstanceProxy::cancelCheckIfAllowedToLoadURL(uint32_t checkID)
-{
- URLCheckMap::iterator it = m_urlChecks.find(checkID);
- if (it == m_urlChecks.end())
- return;
-
- WebPluginContainerCheck *check = it->value.get();
- [check cancel];
- m_urlChecks.remove(it);
-}
-
-void NetscapePluginInstanceProxy::checkIfAllowedToLoadURLResult(uint32_t checkID, bool allowed)
-{
-}
-
-void NetscapePluginInstanceProxy::resolveURL(const char* url, const char* target, data_t& resolvedURLData, mach_msg_type_number_t& resolvedURLLength)
-{
- ASSERT(m_pluginView);
-
- WTF::CString resolvedURL = [m_pluginView resolvedURLStringForURL:url target:target];
-
- resolvedURLLength = resolvedURL.length();
- mig_allocate(reinterpret_cast<vm_address_t*>(&resolvedURLData), resolvedURLLength);
- memcpy(resolvedURLData, resolvedURL.data(), resolvedURLLength);
-}
-
void NetscapePluginInstanceProxy::privateBrowsingModeDidChange(bool isPrivateBrowsingEnabled)
{
_WKPHPluginInstancePrivateBrowsingModeDidChange(m_pluginHostProxy->port(), m_pluginID, isPrivateBrowsingEnabled);
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.h (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.h 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.h 2016-06-04 22:48:07 UTC (rev 201689)
@@ -35,7 +35,7 @@
class NetscapePluginInstanceProxy;
}
-@interface WebHostedNetscapePluginView : WebBaseNetscapePluginView<WebPluginManualLoader, WebPluginContainerCheckController>
+@interface WebHostedNetscapePluginView : WebBaseNetscapePluginView<WebPluginManualLoader>
{
RetainPtr<NSArray> _attributeKeys;
RetainPtr<NSArray> _attributeValues;
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2016-06-04 22:48:07 UTC (rev 201689)
@@ -515,30 +515,6 @@
manualStream->didFinishLoading(0);
}
-- (void)_webPluginContainerCancelCheckIfAllowedToLoadRequest:(id)webPluginContainerCheck
-{
- ASSERT([webPluginContainerCheck isKindOfClass:[WebPluginContainerCheck class]]);
-
- id contextInfo = [webPluginContainerCheck contextInfo];
- ASSERT([contextInfo isKindOfClass:[NSNumber class]]);
-
- if (!_proxy)
- return;
-
- uint32_t checkID = [(NSNumber *)contextInfo unsignedIntValue];
- _proxy->cancelCheckIfAllowedToLoadURL(checkID);
-}
-
-- (void)_containerCheckResult:(PolicyAction)policy contextInfo:(id)contextInfo
-{
- ASSERT([contextInfo isKindOfClass:[NSNumber class]]);
- if (!_proxy)
- return;
-
- uint32_t checkID = [(NSNumber *)contextInfo unsignedIntValue];
- _proxy->checkIfAllowedToLoadURLResult(checkID, (policy == PolicyUse));
-}
-
- (void)webFrame:(WebFrame *)webFrame didFinishLoadWithReason:(NPReason)reason
{
if (_isStarted && _proxy)
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs 2016-06-04 22:48:07 UTC (rev 201689)
@@ -191,22 +191,6 @@
simpleroutine PCSetModal(clientPort :mach_port_t;
modal :boolean_t);
-routine PCCheckIfAllowedToLoadURL(clientPort :mach_port_t;
- pluginID :uint32_t;
- url :data_t;
- target :data_t;
- out checkID :uint32_t);
-
-simpleroutine PCCancelCheckIfAllowedToLoadURL(clientPort :mach_port_t;
- pluginID :uint32_t;
- checkID :uint32_t);
-
-routine PCResolveURL(clientPort :mach_port_t;
- pluginID :uint32_t;
- url :data_t;
- target :data_t;
- out resolvedURL :data_t, dealloc);
-
// Replies
simpleroutine PCInstantiatePluginReply(clientPort :mach_port_t;
pluginID :uint32_t;
Modified: trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.h (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.h 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.h 2016-06-04 22:48:07 UTC (rev 201689)
@@ -30,7 +30,6 @@
#import <Cocoa/Cocoa.h>
#import "WebNetscapePluginPackage.h"
-#import "WebPluginContainerCheck.h"
#import <wtf/Forward.h>
#import <wtf/PassRefPtr.h>
#import <wtf/RefPtr.h>
@@ -122,7 +121,6 @@
- (BOOL)convertFromX:(double)sourceX andY:(double)sourceY space:(NPCoordinateSpace)sourceSpace
toX:(double *)destX andY:(double *)destY space:(NPCoordinateSpace)destSpace;
-- (WTF::CString)resolvedURLStringForURL:(const char*)url target:(const char*)target;
- (void)invalidatePluginContentRect:(NSRect)rect;
Modified: trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2016-06-04 22:48:07 UTC (rev 201689)
@@ -34,8 +34,6 @@
#import "WebKitLogging.h"
#import "WebKitNSStringExtras.h"
#import "WebKitSystemInterface.h"
-#import "WebPluginContainerCheck.h"
-#import "WebNetscapeContainerCheckContextInfo.h"
#import "WebNSURLExtras.h"
#import "WebNSURLRequestExtras.h"
#import "WebView.h"
@@ -829,27 +827,6 @@
}
-- (CString)resolvedURLStringForURL:(const char*)url target:(const char*)target
-{
- String relativeURLString = String::fromUTF8(url);
- if (relativeURLString.isNull())
- return CString();
-
- Frame* frame = core([self webFrame]);
- if (!frame)
- return CString();
-
- Frame* targetFrame = frame->tree().find(String::fromUTF8(target));
- if (!targetFrame)
- return CString();
-
- if (!frame->document()->securityOrigin()->canAccess(targetFrame->document()->securityOrigin()))
- return CString();
-
- URL absoluteURL = targetFrame->document()->completeURL(relativeURLString);
- return absoluteURL.string().utf8();
-}
-
- (void)invalidatePluginContentRect:(NSRect)rect
{
auto* renderer = _element->renderer();
Deleted: trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.h (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.h 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.h 2016-06-04 22:48:07 UTC (rev 201689)
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "WebBaseNetscapePluginView.h"
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
-@interface WebNetscapeContainerCheckContextInfo : NSObject {
- uint32_t _checkRequestID;
- void (*_callback)(NPP npp, uint32_t, NPBool, void *);
- void *_context;
-}
-
-- (id)initWithCheckRequestID:(uint32_t)checkRequestID callbackFunc:(void (*)(NPP npp, uint32_t checkID, NPBool allowed, void* context))callbackFunc context:(void*)context;
-- (uint32_t)checkRequestID;
-- (void (*)(NPP npp, uint32_t, NPBool, void*))callback;
-- (void*)context;
-
-@end
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Deleted: trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.mm (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.mm 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckContextInfo.mm 2016-06-04 22:48:07 UTC (rev 201689)
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "WebNetscapeContainerCheckContextInfo.h"
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
-@implementation WebNetscapeContainerCheckContextInfo
-
-- (id)initWithCheckRequestID:(uint32_t)checkRequestID callbackFunc:(void (*)(NPP npp, uint32_t checkID, NPBool allowed, void* context))callbackFunc context:(void*)context
-{
- self = [super init];
- if (!self)
- return nil;
-
- _checkRequestID = checkRequestID;
- _callback = callbackFunc;
- _context = context;
- return self;
-}
-
-- (uint32_t)checkRequestID
-{
- return _checkRequestID;
-}
-
-- (void (*)(NPP npp, uint32_t, NPBool, void*))callback
-{
- return _callback;
-}
-
-- (void*)context
-{
- return _context;
-}
-
-@end
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Deleted: trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h 2016-06-04 22:48:07 UTC (rev 201689)
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebNetscapeContainerCheckPrivate_h
-#define WebNetscapeContainerCheckPrivate_h
-
-#include <WebKitLegacy/npapi.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define WKNVBrowserContainerCheckFuncs 1701
-#define WKNVBrowserContainerCheckFuncsVersion 2
-
-#define WKNVBrowserContainerCheckFuncsVersionHasGetLocation 2
-
-typedef uint32_t (*WKN_CheckIfAllowedToLoadURLProcPtr)(NPP npp, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32_t, NPBool allowed, void* context), void* context);
-typedef void (*WKN_CancelCheckIfAllowedToLoadURLProcPtr)(NPP npp, uint32_t);
-typedef char* (*WKN_ResolveURLProcPtr)(NPP npp, const char* url, const char* target);
-
-uint32_t WKN_CheckIfAllowedToLoadURL(NPP npp, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32_t, NPBool allowed, void* context), void* context);
-void WKN_CancelCheckIfAllowedToLoadURL(NPP npp, uint32_t);
-char* WKN_ResolveURL(NPP npp, const char* url, const char* target);
-
-typedef struct _WKNBrowserContainerCheckFuncs {
- uint16_t size;
- uint16_t version;
-
- WKN_CheckIfAllowedToLoadURLProcPtr checkIfAllowedToLoadURL;
- WKN_CancelCheckIfAllowedToLoadURLProcPtr cancelCheckIfAllowedToLoadURL;
- WKN_ResolveURLProcPtr resolveURL;
-} WKNBrowserContainerCheckFuncs;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WebNetscapeContainerCheckPrivate_h
Deleted: trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.mm 2016-06-04 22:48:07 UTC (rev 201689)
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "WebNetscapeContainerCheckPrivate.h"
-
-#import "WebNetscapePluginView.h"
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
-WKNBrowserContainerCheckFuncs *browserContainerCheckFuncs()
-{
- static WKNBrowserContainerCheckFuncs funcs = {
- sizeof(WKNBrowserContainerCheckFuncs),
- WKNVBrowserContainerCheckFuncsVersion,
- WKN_CheckIfAllowedToLoadURL,
- WKN_CancelCheckIfAllowedToLoadURL,
- WKN_ResolveURL
- };
-
- return &funcs;
-}
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.h (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.h 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.h 2016-06-04 22:48:07 UTC (rev 201689)
@@ -29,7 +29,6 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
#import "WebBaseNetscapePluginView.h"
-#import "WebNetscapeContainerCheckPrivate.h"
#import <WebKitLegacy/npfunctions.h>
#import <WebKitLegacy/npapi.h>
#import <wtf/HashMap.h>
@@ -53,7 +52,7 @@
// for the plug-in to function correctly. (rdar://problem/4699455)
#define WebNetscapePluginView WebNetscapePluginDocumentView
-@interface WebNetscapePluginView : WebBaseNetscapePluginView<WebPluginManualLoader, WebPluginContainerCheckController>
+@interface WebNetscapePluginView : WebBaseNetscapePluginView<WebPluginManualLoader>
{
@package
RefPtr<WebNetscapePluginStream> _manualStream;
@@ -96,9 +95,6 @@
BOOL _isFlash;
BOOL _isSilverlight;
-
- NSMutableDictionary *_containerChecksInProgress;
- uint32_t _currentContainerCheckRequestID;
}
+ (WebNetscapePluginView *)currentPluginView;
@@ -143,9 +139,6 @@
- (void)handleMouseEntered:(NSEvent *)event;
- (void)handleMouseExited:(NSEvent *)event;
-- (uint32_t)checkIfAllowedToLoadURL:(const char*)urlCString frame:(const char*)frameNameCString callbackFunc:(void (*)(NPP npp, uint32_t checkID, NPBool allowed, void* context))callbackFunc context:(void*)context;
-- (void)cancelCheckIfAllowedToLoadURL:(uint32_t)checkID;
-
@end
@interface WebNetscapePluginView (WebInternal)
@@ -175,10 +168,7 @@
- (NPError)getAuthenticationInfoWithProtocol:(const char*) protocol host:(const char*)host port:(int32_t)port scheme:(const char*)scheme realm:(const char*)realm
username:(char**)username usernameLength:(uint32_t*)usernameLength
password:(char**)password passwordLength:(uint32_t*)passwordLength;
-- (char*)resolveURL:(const char*)url forTarget:(const char*)target;
@end
-WKNBrowserContainerCheckFuncs *browserContainerCheckFuncs();
-
#endif
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2016-06-04 22:48:07 UTC (rev 201689)
@@ -45,12 +45,9 @@
#import "WebNSURLExtras.h"
#import "WebNSURLRequestExtras.h"
#import "WebNSViewExtras.h"
-#import "WebNetscapeContainerCheckContextInfo.h"
-#import "WebNetscapeContainerCheckPrivate.h"
#import "WebNetscapePluginEventHandler.h"
#import "WebNetscapePluginPackage.h"
#import "WebNetscapePluginStream.h"
-#import "WebPluginContainerCheck.h"
#import "WebPluginRequest.h"
#import "WebPreferences.h"
#import "WebUIDelegatePrivate.h"
@@ -1247,70 +1244,6 @@
}
}
-- (uint32_t)checkIfAllowedToLoadURL:(const char*)urlCString frame:(const char*)frameNameCString
- callbackFunc:(void (*)(NPP npp, uint32_t checkID, NPBool allowed, void* context))callbackFunc
- context:(void*)context
-{
- if (!_containerChecksInProgress)
- _containerChecksInProgress = [[NSMutableDictionary alloc] init];
-
- NSString *frameName = frameNameCString ? [NSString stringWithCString:frameNameCString encoding:NSISOLatin1StringEncoding] : nil;
-
- ++_currentContainerCheckRequestID;
- WebNetscapeContainerCheckContextInfo *contextInfo = [[WebNetscapeContainerCheckContextInfo alloc] initWithCheckRequestID:_currentContainerCheckRequestID
- callbackFunc:callbackFunc
- context:context];
-
- WebPluginContainerCheck *check = [WebPluginContainerCheck checkWithRequest:[self requestWithURLCString:urlCString]
- target:frameName
- resultObject:self
- selector:@selector(_containerCheckResult:contextInfo:)
- controller:self
- contextInfo:contextInfo];
-
- [contextInfo release];
- [_containerChecksInProgress setObject:check forKey:[NSNumber numberWithInt:_currentContainerCheckRequestID]];
- [check start];
-
- return _currentContainerCheckRequestID;
-}
-
-- (void)_containerCheckResult:(PolicyAction)policy contextInfo:(id)contextInfo
-{
- ASSERT([contextInfo isKindOfClass:[WebNetscapeContainerCheckContextInfo class]]);
- void (*pluginCallback)(NPP npp, uint32_t, NPBool, void*) = [contextInfo callback];
-
- if (!pluginCallback) {
- ASSERT_NOT_REACHED();
- return;
- }
-
- pluginCallback([self plugin], [contextInfo checkRequestID], (policy == PolicyUse), [contextInfo context]);
-}
-
-- (void)cancelCheckIfAllowedToLoadURL:(uint32_t)checkID
-{
- WebPluginContainerCheck *check = (WebPluginContainerCheck *)[_containerChecksInProgress objectForKey:[NSNumber numberWithInt:checkID]];
-
- if (!check)
- return;
-
- [check cancel];
- [_containerChecksInProgress removeObjectForKey:[NSNumber numberWithInt:checkID]];
-}
-
-// WebPluginContainerCheck automatically calls this method after invoking our _containerCheckResult: selector.
-// It works this way because calling -[WebPluginContainerCheck cancel] allows it to do it's teardown process.
-- (void)_webPluginContainerCancelCheckIfAllowedToLoadRequest:(id)webPluginContainerCheck
-{
- ASSERT([webPluginContainerCheck isKindOfClass:[WebPluginContainerCheck class]]);
- WebPluginContainerCheck *check = (WebPluginContainerCheck *)webPluginContainerCheck;
- ASSERT([[check contextInfo] isKindOfClass:[WebNetscapeContainerCheckContextInfo class]]);
-
- [self cancelCheckIfAllowedToLoadURL:[[check contextInfo] checkRequestID]];
-}
-
-
// MARK: NSVIEW
- (id)initWithFrame:(NSRect)frame
@@ -1359,8 +1292,6 @@
free(cValues);
ASSERT(!_eventHandler);
-
- [_containerChecksInProgress release];
}
- (void)disconnectStream:(WebNetscapePluginStream*)stream
@@ -2058,12 +1989,6 @@
return NPERR_NO_ERROR;
}
- case WKNVBrowserContainerCheckFuncs:
- {
- *(WKNBrowserContainerCheckFuncs **)value = browserContainerCheckFuncs();
- return NPERR_NO_ERROR;
- }
-
case WKNVSupportsCompositingCoreAnimationPluginsBool:
{
*(NPBool *)value = [[[self webView] preferences] acceleratedCompositingEnabled];
@@ -2277,17 +2202,6 @@
return NPERR_NO_ERROR;
}
-- (char*)resolveURL:(const char*)url forTarget:(const char*)target
-{
- CString location = [self resolvedURLStringForURL:url target:target];
-
- if (location.isNull())
- return 0;
-
- // We use strdup here because the caller needs to free it with NPN_MemFree (which calls free).
- return strdup(location.data());
-}
-
@end
@implementation WebNetscapePluginView (Internal)
Modified: trunk/Source/WebKit/mac/Plugins/npapi.mm (201688 => 201689)
--- trunk/Source/WebKit/mac/Plugins/npapi.mm 2016-06-04 22:34:15 UTC (rev 201688)
+++ trunk/Source/WebKit/mac/Plugins/npapi.mm 2016-06-04 22:48:07 UTC (rev 201689)
@@ -225,19 +225,4 @@
return [pluginViewForInstance(instance) convertFromX:sourceX andY:sourceY space:sourceSpace toX:destX andY:destY space:destSpace];
}
-uint32_t WKN_CheckIfAllowedToLoadURL(NPP instance, const char* url, const char* frame, void (*callbackFunc)(NPP npp, uint32_t, NPBool, void*), void* context)
-{
- return [pluginViewForInstance(instance) checkIfAllowedToLoadURL:url frame:frame callbackFunc:callbackFunc context:context];
-}
-
-void WKN_CancelCheckIfAllowedToLoadURL(NPP instance, uint32_t checkID)
-{
- [pluginViewForInstance(instance) cancelCheckIfAllowedToLoadURL:checkID];
-}
-
-char* WKN_ResolveURL(NPP instance, const char* url, const char* target)
-{
- return [pluginViewForInstance(instance) resolveURL:url forTarget:target];
-}
-
#endif
