<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196505] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196505">196505</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-12 14:04:08 -0800 (Fri, 12 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxyh">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmacPluginControllerProxyMacmm">trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapemacNetscapePluginModuleMacmm">trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginModuleInfoh">trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapemacNetscapePluginMacmm">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginControllerh">trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapemacWKNPAPIPlugInContainerh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapemacWKNPAPIPlugInContainermm">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapemacWKNPAPIPlugInContainerInternalh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainerInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2016-02-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ 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 <andersca@apple.com>
+
</ins><span class="cx"> Remove PowerPC cruft
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154191
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -103,7 +103,6 @@
</span><span class="cx"> virtual void pluginFocusOrWindowFocusChanged(bool) override;
</span><span class="cx"> virtual void setComplexTextInputState(PluginComplexTextInputState) override;
</span><span class="cx"> virtual const WebCore::MachSendRight& compositingRenderServerPort() override;
</span><del>- virtual void openPluginPreferencePane() override;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual float contentsScaleFactor() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginControllerProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,11 +56,6 @@
</span><span class="cx"> return PluginProcess::singleton().compositingRenderServerPort();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginControllerProxy::openPluginPreferencePane()
-{
- PluginProcess::singleton().parentProcessConnection()->send(Messages::PluginProcessProxy::OpenPluginPreferencePane(), 0);
-}
-
</del><span class="cx"> void PluginControllerProxy::platformInitialize(const PluginCreationParameters& creationParameters)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_layerHostingContext);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapemacNetscapePluginModuleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -234,11 +234,6 @@
</span><span class="cx"> plugin.shortVersionString = static_cast<CFStringRef>(shortVersionTypeRef);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (CFTypeRef preferencePathTypeRef = CFBundleGetValueForInfoDictionaryKey(bundle.get(), CFSTR("WebPluginPreferencePanePath"))) {
- if (CFGetTypeID(preferencePathTypeRef) == CFStringGetTypeID())
- plugin.preferencePanePath = static_cast<CFStringRef>(preferencePathTypeRef);
- }
-
</del><span class="cx"> if (!getPluginInfoFromPropertyLists(bundle.get(), plugin))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginModuleInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> String bundleIdentifier;
</span><span class="cx"> String versionString;
</span><span class="cx"> String shortVersionString;
</span><del>- String preferencePanePath;
</del><span class="cx"> bool hasSandboxProfile;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> bool requiresGtk2;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -139,7 +139,6 @@
</span><span class="cx"> void endModal();
</span><span class="cx">
</span><span class="cx"> void applicationDidBecomeActive();
</span><del>- void openPluginPreferencePane();
</del><span class="cx"> void launchProcess(const String& launchPath, const Vector<String>& arguments, bool& result);
</span><span class="cx"> void launchApplicationAtURL(const String& urlString, const Vector<String>& arguments, bool& result);
</span><span class="cx"> void openURL(const String& url, bool& result, int32_t& status, String& launchedURLString);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,9 +33,6 @@
</span><span class="cx"> SetModalWindowIsShowing(bool modalWindowIsShowing)
</span><span class="cx"> SetFullscreenWindowIsShowing(bool fullscreenWindowIsShowing)
</span><span class="cx">
</span><del>- # Open the plug-ins preference pane (as specified in the plug-in's Info.plist file).
- OpenPluginPreferencePane()
-
</del><span class="cx"> # Returns true if the UI process launched the process.
</span><span class="cx"> LaunchProcess(String launchPath, Vector<String> arguments) -> (bool result)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -273,31 +273,6 @@
</span><span class="cx"> m_connection->send(Messages::PluginProcess::SetProcessSuppressionEnabled(processSuppressionEnabled), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> static bool isFlashUpdater(const String& launchPath, const Vector<String>& arguments)
</span><span class="cx"> {
</span><span class="cx"> if (launchPath != "/Applications/Utilities/Adobe Flash Player Install Manager.app/Contents/MacOS/Adobe Flash Player Install Manager")
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -448,8 +448,6 @@
</span><span class="cx"> 1AD01BC91905D37E00C9C45F /* _WKErrorRecoveryAttempting.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD01BC71905D37E00C9C45F /* _WKErrorRecoveryAttempting.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AD01BCC1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD01BCA1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm */; };
</span><span class="cx"> 1AD01BCD1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */; };
</span><del>- 1AD09F2B1743F8E600A95E50 /* WKNPAPIPlugInContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD09F291743F8E600A95E50 /* WKNPAPIPlugInContainer.mm */; };
- 1AD09F2C1743F8E600A95E50 /* WKNPAPIPlugInContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD09F2A1743F8E600A95E50 /* WKNPAPIPlugInContainer.h */; };
</del><span class="cx"> 1AD25E95167AB08100EA9BCD /* DownloadProxyMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */; };
</span><span class="cx"> 1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */; };
</span><span class="cx"> 1AD3306E16B1D991004F60E7 /* StorageAreaImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */; };
</span><span class="lines">@@ -2416,9 +2414,6 @@
</span><span class="cx"> 1AD01BC71905D37E00C9C45F /* _WKErrorRecoveryAttempting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKErrorRecoveryAttempting.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AD01BCA1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKReloadFrameErrorRecoveryAttempter.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKReloadFrameErrorRecoveryAttempter.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> 1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxyMap.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxyMap.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaImpl.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4349,9 +4344,6 @@
</span><span class="cx"> children = (
</span><span class="cx"> 1AE5B7F911E7AED200BA6767 /* NetscapePluginMac.mm */,
</span><span class="cx"> 1A2D92201281DC1B001EB962 /* PluginProxyMac.mm */,
</span><del>- 1AD09F2A1743F8E600A95E50 /* WKNPAPIPlugInContainer.h */,
- 1AD09F291743F8E600A95E50 /* WKNPAPIPlugInContainer.mm */,
- 1AD09F2D1743FB0300A95E50 /* WKNPAPIPlugInContainerInternal.h */,
</del><span class="cx"> );
</span><span class="cx"> path = mac;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -7954,7 +7946,6 @@
</span><span class="cx"> 318BE17114743DB100A8FBB2 /* WKNotificationManager.h in Headers */,
</span><span class="cx"> 31A2EC74148D59CA00810D71 /* WKNotificationPermissionRequest.h in Headers */,
</span><span class="cx"> 312C0C4A146DDC8A0016C911 /* WKNotificationProvider.h in Headers */,
</span><del>- 1AD09F2C1743F8E600A95E50 /* WKNPAPIPlugInContainer.h in Headers */,
</del><span class="cx"> 37C4C0941814B3AF003688B9 /* WKNSArray.h in Headers */,
</span><span class="cx"> 373CEAD6185417AE008C363D /* WKNSData.h in Headers */,
</span><span class="cx"> 371A19421824D29300F32A5E /* WKNSDictionary.h in Headers */,
</span><span class="lines">@@ -9402,7 +9393,6 @@
</span><span class="cx"> 318BE17714743E6000A8FBB2 /* WKNotification.cpp in Sources */,
</span><span class="cx"> 318BE17514743DD700A8FBB2 /* WKNotificationManager.cpp in Sources */,
</span><span class="cx"> 31A2EC77148D662E00810D71 /* WKNotificationPermissionRequest.cpp in Sources */,
</span><del>- 1AD09F2B1743F8E600A95E50 /* WKNPAPIPlugInContainer.mm in Sources */,
</del><span class="cx"> 37C4C0931814B3AF003688B9 /* WKNSArray.mm in Sources */,
</span><span class="cx"> 373CEAD5185417AE008C363D /* WKNSData.mm in Sources */,
</span><span class="cx"> 371A19411824D29300F32A5E /* WKNSDictionary.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -418,8 +418,6 @@
</span><span class="cx">
</span><span class="cx"> // 74658 and 74659 are no longer implemented.
</span><span class="cx">
</span><del>-static const unsigned WKNVPlugInContainer = 74660;
-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static NPError NPN_GetValue(NPP npp, NPNVariable variable, void *value)
</span><span class="lines">@@ -510,12 +508,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case WKNVPlugInContainer: {
- RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
- *reinterpret_cast<void**>(value) = plugin->plugInContainer();
- break;
- }
-
</del><span class="cx"> #ifndef NP_NO_QUICKDRAW
</span><span class="cx"> case NPNVsupportsQuickDrawBool:
</span><span class="cx"> // We don't support the QuickDraw drawing model.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,8 +45,6 @@
</span><span class="cx"> class SharedBuffer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-OBJC_CLASS WKNPAPIPlugInContainer;
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class NetscapePluginStream;
</span><span class="lines">@@ -74,13 +72,10 @@
</span><span class="cx"> bool hasHandledAKeyDownEvent() const { return m_hasHandledAKeyDownEvent; }
</span><span class="cx">
</span><span class="cx"> const WebCore::MachSendRight& compositingRenderServerPort();
</span><del>- void openPluginPreferencePane();
</del><span class="cx">
</span><span class="cx"> // Computes an affine transform from the given coordinate space to the screen coordinate space.
</span><span class="cx"> bool getScreenTransform(NPCoordinateSpace sourceSpace, WebCore::AffineTransform&);
</span><span class="cx">
</span><del>- WKNPAPIPlugInContainer* plugInContainer();
-
</del><span class="cx"> #ifndef NP_NO_CARBON
</span><span class="cx"> WindowRef windowRef() const;
</span><span class="cx"> bool isWindowActive() const { return m_windowHasFocus; }
</span><span class="lines">@@ -377,14 +372,12 @@
</span><span class="cx"> // if we can tell the plug-in that we support the updated Cocoa text input specification.
</span><span class="cx"> bool m_hasHandledAKeyDownEvent;
</span><span class="cx">
</span><del>- // The number of NPCocoaEventKeyUp events that should be ignored.
</del><ins>+ // The number of NPCocoaEventKeyUp events that should be ignored.
</ins><span class="cx"> unsigned m_ignoreNextKeyUpEventCounter;
</span><span class="cx">
</span><span class="cx"> WebCore::IntRect m_windowFrameInScreenCoordinates;
</span><span class="cx"> WebCore::IntRect m_viewFrameInWindowCoordinates;
</span><span class="cx">
</span><del>- RetainPtr<WKNPAPIPlugInContainer> m_plugInContainer;
-
</del><span class="cx"> #ifndef NP_NO_CARBON
</span><span class="cx"> void nullEventTimerFired();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapemacNetscapePluginMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #import "NetscapeBrowserFuncs.h"
</span><span class="cx"> #import "PluginController.h"
</span><del>-#import "WKNPAPIPlugInContainerInternal.h"
</del><span class="cx"> #import "WebEvent.h"
</span><span class="cx"> #import <Carbon/Carbon.h>
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="lines">@@ -185,19 +184,6 @@
</span><span class="cx"> return controller()->compositingRenderServerPort();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetscapePlugin::openPluginPreferencePane()
-{
- controller()->openPluginPreferencePane();
-}
-
-WKNPAPIPlugInContainer* NetscapePlugin::plugInContainer()
-{
- if (!m_plugInContainer)
- m_plugInContainer = adoptNS([[WKNPAPIPlugInContainer alloc] _initWithNetscapePlugin:this]);
-
- return m_plugInContainer.get();
-}
-
</del><span class="cx"> #ifndef NP_NO_CARBON
</span><span class="cx"> typedef HashMap<WindowRef, NetscapePlugin*> WindowMap;
</span><span class="cx">
</span><span class="lines">@@ -291,8 +277,6 @@
</span><span class="cx">
</span><span class="cx"> void NetscapePlugin::platformDestroy()
</span><span class="cx"> {
</span><del>- [m_plugInContainer _invalidate];
-
</del><span class="cx"> #ifndef NP_NO_CARBON
</span><span class="cx"> if (m_eventModel == NPEventModelCarbon) {
</span><span class="cx"> if (WindowRef window = windowRef()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapemacWKNPAPIPlugInContainerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.h (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapemacWKNPAPIPlugInContainermm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * 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
-
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapemacWKNPAPIPlugInContainerInternalh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainerInternal.h (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -108,9 +108,6 @@
</span><span class="cx">
</span><span class="cx"> // Returns the mach port of the compositing render server.
</span><span class="cx"> virtual const WebCore::MachSendRight& compositingRenderServerPort() = 0;
</span><del>-
- // Open the preference pane for this plug-in (as stated in the plug-in's Info.plist).
- virtual void openPluginPreferencePane() = 0;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Returns the contents scale factor.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1575,11 +1575,6 @@
</span><span class="cx"> return WebProcess::singleton().compositingRenderServerPort();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginView::openPluginPreferencePane()
-{
- ASSERT_NOT_REACHED();
-}
-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> float PluginView::contentsScaleFactor()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (196504 => 196505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -211,7 +211,6 @@
</span><span class="cx"> virtual void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus) override;
</span><span class="cx"> virtual void setComplexTextInputState(PluginComplexTextInputState) override;
</span><span class="cx"> virtual const WebCore::MachSendRight& compositingRenderServerPort() override;
</span><del>- virtual void openPluginPreferencePane() override;
</del><span class="cx"> #endif
</span><span class="cx"> virtual float contentsScaleFactor() override;
</span><span class="cx"> virtual String proxiesForURL(const String&) override;
</span></span></pre>
</div>
</div>
</body>
</html>