Diff
Modified: trunk/Source/WebKit2/ChangeLog (196504 => 196505)
--- trunk/Source/WebKit2/ChangeLog 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-12 22:04:08 UTC (rev 196505)
@@ -1,5 +1,43 @@
2016-02-12 Anders Carlsson <[email protected]>
+ Remove NPAPI for showing preference panes
+ https://bugs.webkit.org/show_bug.cgi?id=154193
+
+ Reviewed by Dan Bernstein.
+
+ No plug-ins ended up adopting this API, so there's no point in keeping it around.
+
+ * PluginProcess/PluginControllerProxy.h:
+ * PluginProcess/mac/PluginControllerProxyMac.mm:
+ (WebKit::PluginControllerProxy::openPluginPreferencePane): Deleted.
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ (WebKit::NetscapePluginModule::getPluginInfo): Deleted.
+ * Shared/Plugins/PluginModuleInfo.h:
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/Plugins/PluginProcessProxy.messages.in:
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::openPluginPreferencePane): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::NPN_GetValue): Deleted.
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+ (WebKit::NetscapePlugin::openPluginPreferencePane): Deleted.
+ (WebKit::NetscapePlugin::plugInContainer): Deleted.
+ (WebKit::NetscapePlugin::platformDestroy): Deleted.
+ * WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.h: Removed.
+ * WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm: Removed.
+ (-[WKNPAPIPlugInContainer dealloc]): Deleted.
+ (-[WKNPAPIPlugInContainer _invalidate]): Deleted.
+ (-[WKNPAPIPlugInContainer openPlugInPreferencePane]): Deleted.
+ * WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainerInternal.h: Removed.
+ * WebProcess/Plugins/PluginController.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::openPluginPreferencePane): Deleted.
+ * WebProcess/Plugins/PluginView.h:
+
+2016-02-12 Anders Carlsson <[email protected]>
+
Remove PowerPC cruft
https://bugs.webkit.org/show_bug.cgi?id=154191
Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (196504 => 196505)
--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2016-02-12 22:04:08 UTC (rev 196505)
@@ -103,7 +103,6 @@
virtual void pluginFocusOrWindowFocusChanged(bool) override;
virtual void setComplexTextInputState(PluginComplexTextInputState) override;
virtual const WebCore::MachSendRight& compositingRenderServerPort() override;
- virtual void openPluginPreferencePane() override;
#endif
virtual float contentsScaleFactor() override;
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (196504 => 196505)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2016-02-12 22:04:08 UTC (rev 196505)
@@ -56,11 +56,6 @@
return PluginProcess::singleton().compositingRenderServerPort();
}
-void PluginControllerProxy::openPluginPreferencePane()
-{
- PluginProcess::singleton().parentProcessConnection()->send(Messages::PluginProcessProxy::OpenPluginPreferencePane(), 0);
-}
-
void PluginControllerProxy::platformInitialize(const PluginCreationParameters& creationParameters)
{
ASSERT(!m_layerHostingContext);
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (196504 => 196505)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2016-02-12 22:04:08 UTC (rev 196505)
@@ -234,11 +234,6 @@
plugin.shortVersionString = static_cast<CFStringRef>(shortVersionTypeRef);
}
- if (CFTypeRef preferencePathTypeRef = CFBundleGetValueForInfoDictionaryKey(bundle.get(), CFSTR("WebPluginPreferencePanePath"))) {
- if (CFGetTypeID(preferencePathTypeRef) == CFStringGetTypeID())
- plugin.preferencePanePath = static_cast<CFStringRef>(preferencePathTypeRef);
- }
-
if (!getPluginInfoFromPropertyLists(bundle.get(), plugin))
return false;
Modified: trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h (196504 => 196505)
--- trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h 2016-02-12 22:04:08 UTC (rev 196505)
@@ -56,7 +56,6 @@
String bundleIdentifier;
String versionString;
String shortVersionString;
- String preferencePanePath;
bool hasSandboxProfile;
#elif PLATFORM(GTK)
bool requiresGtk2;
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (196504 => 196505)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2016-02-12 22:04:08 UTC (rev 196505)
@@ -139,7 +139,6 @@
void endModal();
void applicationDidBecomeActive();
- void openPluginPreferencePane();
void launchProcess(const String& launchPath, const Vector<String>& arguments, bool& result);
void launchApplicationAtURL(const String& urlString, const Vector<String>& arguments, bool& result);
void openURL(const String& url, bool& result, int32_t& status, String& launchedURLString);
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in (196504 => 196505)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in 2016-02-12 22:04:08 UTC (rev 196505)
@@ -33,9 +33,6 @@
SetModalWindowIsShowing(bool modalWindowIsShowing)
SetFullscreenWindowIsShowing(bool fullscreenWindowIsShowing)
- # Open the plug-ins preference pane (as specified in the plug-in's Info.plist file).
- OpenPluginPreferencePane()
-
# Returns true if the UI process launched the process.
LaunchProcess(String launchPath, Vector<String> arguments) -> (bool result)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (196504 => 196505)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-02-12 22:04:08 UTC (rev 196505)
@@ -273,31 +273,6 @@
m_connection->send(Messages::PluginProcess::SetProcessSuppressionEnabled(processSuppressionEnabled), 0);
}
-void PluginProcessProxy::openPluginPreferencePane()
-{
- if (!m_pluginProcessAttributes.moduleInfo.preferencePanePath)
- return;
-
- NSURL *preferenceURL = [NSURL fileURLWithPath:m_pluginProcessAttributes.moduleInfo.preferencePanePath];
- if (!preferenceURL) {
- LOG_ERROR("Creating URL for preference pane path \"%@\" failed.", (NSString *)m_pluginProcessAttributes.moduleInfo.preferencePanePath);
- return;
- }
-
- NSArray *preferenceURLs = [NSArray arrayWithObject:preferenceURL];
-
- LSLaunchURLSpec prefSpec;
- prefSpec.appURL = 0;
- prefSpec.itemURLs = reinterpret_cast<CFArrayRef>(preferenceURLs);
- prefSpec.passThruParams = 0;
- prefSpec.launchFlags = kLSLaunchAsync | kLSLaunchDontAddToRecents;
- prefSpec.asyncRefCon = 0;
-
- OSStatus error = LSOpenFromURLSpec(&prefSpec, 0);
- if (error != noErr)
- LOG_ERROR("LSOpenFromURLSpec to open \"%@\" failed with error %d.", (NSString *)m_pluginProcessAttributes.moduleInfo.preferencePanePath, error);
-}
-
static bool isFlashUpdater(const String& launchPath, const Vector<String>& arguments)
{
if (launchPath != "/Applications/Utilities/Adobe Flash Player Install Manager.app/Contents/MacOS/Adobe Flash Player Install Manager")
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (196504 => 196505)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-12 22:04:08 UTC (rev 196505)
@@ -448,8 +448,6 @@
1AD01BC91905D37E00C9C45F /* _WKErrorRecoveryAttempting.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD01BC71905D37E00C9C45F /* _WKErrorRecoveryAttempting.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AD01BCC1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD01BCA1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm */; };
1AD01BCD1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */; };
- 1AD09F2B1743F8E600A95E50 /* WKNPAPIPlugInContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD09F291743F8E600A95E50 /* WKNPAPIPlugInContainer.mm */; };
- 1AD09F2C1743F8E600A95E50 /* WKNPAPIPlugInContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD09F2A1743F8E600A95E50 /* WKNPAPIPlugInContainer.h */; };
1AD25E95167AB08100EA9BCD /* DownloadProxyMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */; };
1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */; };
1AD3306E16B1D991004F60E7 /* StorageAreaImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */; };
@@ -2416,9 +2414,6 @@
1AD01BC71905D37E00C9C45F /* _WKErrorRecoveryAttempting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKErrorRecoveryAttempting.h; sourceTree = "<group>"; };
1AD01BCA1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKReloadFrameErrorRecoveryAttempter.mm; sourceTree = "<group>"; };
1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKReloadFrameErrorRecoveryAttempter.h; sourceTree = "<group>"; };
- 1AD09F291743F8E600A95E50 /* WKNPAPIPlugInContainer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNPAPIPlugInContainer.mm; sourceTree = "<group>"; };
- 1AD09F2A1743F8E600A95E50 /* WKNPAPIPlugInContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNPAPIPlugInContainer.h; sourceTree = "<group>"; };
- 1AD09F2D1743FB0300A95E50 /* WKNPAPIPlugInContainerInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKNPAPIPlugInContainerInternal.h; sourceTree = "<group>"; };
1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxyMap.cpp; sourceTree = "<group>"; };
1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxyMap.h; sourceTree = "<group>"; };
1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaImpl.cpp; sourceTree = "<group>"; };
@@ -4349,9 +4344,6 @@
children = (
1AE5B7F911E7AED200BA6767 /* NetscapePluginMac.mm */,
1A2D92201281DC1B001EB962 /* PluginProxyMac.mm */,
- 1AD09F2A1743F8E600A95E50 /* WKNPAPIPlugInContainer.h */,
- 1AD09F291743F8E600A95E50 /* WKNPAPIPlugInContainer.mm */,
- 1AD09F2D1743FB0300A95E50 /* WKNPAPIPlugInContainerInternal.h */,
);
path = mac;
sourceTree = "<group>";
@@ -7954,7 +7946,6 @@
318BE17114743DB100A8FBB2 /* WKNotificationManager.h in Headers */,
31A2EC74148D59CA00810D71 /* WKNotificationPermissionRequest.h in Headers */,
312C0C4A146DDC8A0016C911 /* WKNotificationProvider.h in Headers */,
- 1AD09F2C1743F8E600A95E50 /* WKNPAPIPlugInContainer.h in Headers */,
37C4C0941814B3AF003688B9 /* WKNSArray.h in Headers */,
373CEAD6185417AE008C363D /* WKNSData.h in Headers */,
371A19421824D29300F32A5E /* WKNSDictionary.h in Headers */,
@@ -9402,7 +9393,6 @@
318BE17714743E6000A8FBB2 /* WKNotification.cpp in Sources */,
318BE17514743DD700A8FBB2 /* WKNotificationManager.cpp in Sources */,
31A2EC77148D662E00810D71 /* WKNotificationPermissionRequest.cpp in Sources */,
- 1AD09F2B1743F8E600A95E50 /* WKNPAPIPlugInContainer.mm in Sources */,
37C4C0931814B3AF003688B9 /* WKNSArray.mm in Sources */,
373CEAD5185417AE008C363D /* WKNSData.mm in Sources */,
371A19411824D29300F32A5E /* WKNSDictionary.mm in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (196504 => 196505)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2016-02-12 22:04:08 UTC (rev 196505)
@@ -418,8 +418,6 @@
// 74658 and 74659 are no longer implemented.
-static const unsigned WKNVPlugInContainer = 74660;
-
#endif
static NPError NPN_GetValue(NPP npp, NPNVariable variable, void *value)
@@ -510,12 +508,6 @@
break;
}
- case WKNVPlugInContainer: {
- RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
- *reinterpret_cast<void**>(value) = plugin->plugInContainer();
- break;
- }
-
#ifndef NP_NO_QUICKDRAW
case NPNVsupportsQuickDrawBool:
// We don't support the QuickDraw drawing model.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (196504 => 196505)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2016-02-12 22:04:08 UTC (rev 196505)
@@ -45,8 +45,6 @@
class SharedBuffer;
}
-OBJC_CLASS WKNPAPIPlugInContainer;
-
namespace WebKit {
class NetscapePluginStream;
@@ -74,13 +72,10 @@
bool hasHandledAKeyDownEvent() const { return m_hasHandledAKeyDownEvent; }
const WebCore::MachSendRight& compositingRenderServerPort();
- void openPluginPreferencePane();
// Computes an affine transform from the given coordinate space to the screen coordinate space.
bool getScreenTransform(NPCoordinateSpace sourceSpace, WebCore::AffineTransform&);
- WKNPAPIPlugInContainer* plugInContainer();
-
#ifndef NP_NO_CARBON
WindowRef windowRef() const;
bool isWindowActive() const { return m_windowHasFocus; }
@@ -377,14 +372,12 @@
// if we can tell the plug-in that we support the updated Cocoa text input specification.
bool m_hasHandledAKeyDownEvent;
- // The number of NPCocoaEventKeyUp events that should be ignored.
+ // The number of NPCocoaEventKeyUp events that should be ignored.
unsigned m_ignoreNextKeyUpEventCounter;
WebCore::IntRect m_windowFrameInScreenCoordinates;
WebCore::IntRect m_viewFrameInWindowCoordinates;
- RetainPtr<WKNPAPIPlugInContainer> m_plugInContainer;
-
#ifndef NP_NO_CARBON
void nullEventTimerFired();
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (196504 => 196505)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2016-02-12 22:04:08 UTC (rev 196505)
@@ -30,7 +30,6 @@
#import "NetscapeBrowserFuncs.h"
#import "PluginController.h"
-#import "WKNPAPIPlugInContainerInternal.h"
#import "WebEvent.h"
#import <Carbon/Carbon.h>
#import <WebCore/GraphicsContext.h>
@@ -185,19 +184,6 @@
return controller()->compositingRenderServerPort();
}
-void NetscapePlugin::openPluginPreferencePane()
-{
- controller()->openPluginPreferencePane();
-}
-
-WKNPAPIPlugInContainer* NetscapePlugin::plugInContainer()
-{
- if (!m_plugInContainer)
- m_plugInContainer = adoptNS([[WKNPAPIPlugInContainer alloc] _initWithNetscapePlugin:this]);
-
- return m_plugInContainer.get();
-}
-
#ifndef NP_NO_CARBON
typedef HashMap<WindowRef, NetscapePlugin*> WindowMap;
@@ -291,8 +277,6 @@
void NetscapePlugin::platformDestroy()
{
- [m_plugInContainer _invalidate];
-
#ifndef NP_NO_CARBON
if (m_eventModel == NPEventModelCarbon) {
if (WindowRef window = windowRef()) {
Deleted: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.h (196504 => 196505)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.h 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.h 2016-02-12 22:04:08 UTC (rev 196505)
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2013 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. 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 INC. 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.
- */
-
-@protocol WKNPAPIPlugInContainer <NSObject>
-- (BOOL)openPlugInPreferencePane;
-@end
Deleted: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm (196504 => 196505)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm 2016-02-12 22:04:08 UTC (rev 196505)
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2013 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. 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 INC. 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 "config.h"
-#import "WKNPAPIPluginContainerInternal.h"
-
-#import "NetscapePlugin.h"
-
-using namespace WebKit;
-
-@implementation WKNPAPIPlugInContainer
-
-- (id)_initWithNetscapePlugin:(NetscapePlugin *)plugin
-{
- self = [super init];
- if (!self)
- return nil;
-
- _plugin = plugin;
-
- return self;
-}
-
-#if !ASSERT_DISABLED
-- (void)dealloc
-{
- ASSERT(!_plugin);
-
- [super dealloc];
-}
-#endif
-
-- (void)_invalidate
-{
- ASSERT(_plugin);
-
- _plugin = nullptr;
-}
-
-- (BOOL)openPlugInPreferencePane
-{
- if (!_plugin)
- return NO;
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
- _plugin->openPluginPreferencePane();
- return YES;
-#else
- return NO;
-#endif
-}
-
-@end
-
Deleted: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainerInternal.h (196504 => 196505)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainerInternal.h 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainerInternal.h 2016-02-12 22:04:08 UTC (rev 196505)
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2013 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. 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 INC. 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 "WKNPAPIPlugInContainer.h"
-
-namespace WebKit {
-class NetscapePlugin;
-};
-
-@interface WKNPAPIPlugInContainer : NSObject <WKNPAPIPlugInContainer> {
- WebKit::NetscapePlugin* _plugin;
-}
-
-- (id)_initWithNetscapePlugin:(WebKit::NetscapePlugin*)plugin;
-- (void)_invalidate;
-
-@end
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h (196504 => 196505)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2016-02-12 22:04:08 UTC (rev 196505)
@@ -108,9 +108,6 @@
// Returns the mach port of the compositing render server.
virtual const WebCore::MachSendRight& compositingRenderServerPort() = 0;
-
- // Open the preference pane for this plug-in (as stated in the plug-in's Info.plist).
- virtual void openPluginPreferencePane() = 0;
#endif
// Returns the contents scale factor.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (196504 => 196505)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-02-12 22:04:08 UTC (rev 196505)
@@ -1575,11 +1575,6 @@
return WebProcess::singleton().compositingRenderServerPort();
}
-void PluginView::openPluginPreferencePane()
-{
- ASSERT_NOT_REACHED();
-}
-
#endif
float PluginView::contentsScaleFactor()
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (196504 => 196505)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2016-02-12 21:54:53 UTC (rev 196504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2016-02-12 22:04:08 UTC (rev 196505)
@@ -211,7 +211,6 @@
virtual void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus) override;
virtual void setComplexTextInputState(PluginComplexTextInputState) override;
virtual const WebCore::MachSendRight& compositingRenderServerPort() override;
- virtual void openPluginPreferencePane() override;
#endif
virtual float contentsScaleFactor() override;
virtual String proxiesForURL(const String&) override;
