Title: [278715] trunk/Source/WebKitLegacy/mac
- Revision
- 278715
- Author
- [email protected]
- Date
- 2021-06-10 11:53:36 -0700 (Thu, 10 Jun 2021)
Log Message
Re-enable legacy WebView plug-ins (but not NPAPI)
https://bugs.webkit.org/show_bug.cgi?id=226890
<rdar://79075349>
Reviewed by Tim Horton.
In r276720 I put the check in the wrong place.
This should also fix rdar://77179042 again, which I broke, fixed, broke, and am now fixing again.
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::createPlugin):
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (278714 => 278715)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-06-10 18:53:20 UTC (rev 278714)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-06-10 18:53:36 UTC (rev 278715)
@@ -1,3 +1,17 @@
+2021-06-10 Alex Christensen <[email protected]>
+
+ Re-enable legacy WebView plug-ins (but not NPAPI)
+ https://bugs.webkit.org/show_bug.cgi?id=226890
+ <rdar://79075349>
+
+ Reviewed by Tim Horton.
+
+ In r276720 I put the check in the wrong place.
+ This should also fix rdar://77179042 again, which I broke, fixed, broke, and am now fixing again.
+
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::createPlugin):
+
2021-06-08 Devin Rousso <[email protected]>
[Payment Request] upstream new features
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (278714 => 278715)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2021-06-10 18:53:20 UTC (rev 278714)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2021-06-10 18:53:36 UTC (rev 278715)
@@ -1935,11 +1935,11 @@
errorCode = WebKitErrorBlockedPlugInVersion;
if (is<WebCore::RenderEmbeddedObject>(element.renderer()))
downcast<WebCore::RenderEmbeddedObject>(*element.renderer()).setPluginUnavailabilityReason(WebCore::RenderEmbeddedObject::InsecurePluginVersion);
- } else if ([webView.preferences _boolValueForKey:@"WebKitNPAPIPlugInsEnabledForTestingInWebKitLegacy"]) {
+ } else {
if ([pluginPackage isKindOfClass:[WebPluginPackage class]])
view = pluginView(m_webFrame.get(), (WebPluginPackage *)pluginPackage, attributeKeys.get(), createNSArray(paramValues).get(), baseURL, kit(&element), loadManually);
#if ENABLE(NETSCAPE_PLUGIN_API)
- else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
+ else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]] && [webView.preferences _boolValueForKey:@"WebKitNPAPIPlugInsEnabledForTestingInWebKitLegacy"]) {
auto pluginView = adoptNS([[NETSCAPE_PLUGIN_VIEW alloc]
initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
pluginPackage:(WebNetscapePluginPackage *)pluginPackage
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
