Diff
Modified: trunk/Source/WTF/ChangeLog (275911 => 275912)
--- trunk/Source/WTF/ChangeLog 2021-04-13 21:19:42 UTC (rev 275911)
+++ trunk/Source/WTF/ChangeLog 2021-04-13 21:20:56 UTC (rev 275912)
@@ -1,3 +1,12 @@
+2021-04-13 Alex Christensen <achristen...@webkit.org>
+
+ Remove support for NPAPI plugins in WebView
+ https://bugs.webkit.org/show_bug.cgi?id=224449
+
+ Reviewed by Chris Dumez.
+
+ * Scripts/Preferences/WebPreferences.yaml:
+
2021-04-13 Chris Dumez <cdu...@apple.com>
Make MemoryPressureHandler::isUnderMemoryPressure() return true for 2 seconds after a simulated warning
Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml (275911 => 275912)
--- trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2021-04-13 21:19:42 UTC (rev 275911)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2021-04-13 21:20:56 UTC (rev 275912)
@@ -1720,7 +1720,7 @@
webcoreOnChange: pluginsEnabledChanged
defaultValue:
WebKitLegacy:
- default: true
+ default: false
WebKit:
default: false
WebCore:
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (275911 => 275912)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-04-13 21:19:42 UTC (rev 275911)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-04-13 21:20:56 UTC (rev 275912)
@@ -1,3 +1,13 @@
+2021-04-13 Alex Christensen <achristen...@webkit.org>
+
+ Remove support for NPAPI plugins in WebView
+ https://bugs.webkit.org/show_bug.cgi?id=224449
+
+ Reviewed by Chris Dumez.
+
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences setPlugInsEnabled:]):
+
2021-04-12 Peng Liu <peng.l...@apple.com>
Fix some issues hidden by unified build
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (275911 => 275912)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2021-04-13 21:19:42 UTC (rev 275911)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2021-04-13 21:20:56 UTC (rev 275912)
@@ -900,7 +900,8 @@
- (void)setPlugInsEnabled:(BOOL)flag
{
- [self _setBoolValue: flag forKey: WebKitPluginsEnabledPreferenceKey];
+ if (flag)
+ RELEASE_LOG_FAULT(Plugins, "Application attempted to enable WebView NPAPI plug ins, which are no longer supported");
}
- (BOOL)allowsAnimatedImages
Modified: trunk/Tools/ChangeLog (275911 => 275912)
--- trunk/Tools/ChangeLog 2021-04-13 21:19:42 UTC (rev 275911)
+++ trunk/Tools/ChangeLog 2021-04-13 21:20:56 UTC (rev 275912)
@@ -1,5 +1,17 @@
2021-04-13 Alex Christensen <achristen...@webkit.org>
+ Remove support for NPAPI plugins in WebView
+ https://bugs.webkit.org/show_bug.cgi?id=224449
+
+ Reviewed by Chris Dumez.
+
+ Keep them on in tests until we remove the code.
+
+ * DumpRenderTree/TestOptions.cpp:
+ (WTR::TestOptions::defaults):
+
+2021-04-13 Alex Christensen <achristen...@webkit.org>
+
Remove support for NPAPI plugins in WKWebView
https://bugs.webkit.org/show_bug.cgi?id=224451
Modified: trunk/Tools/DumpRenderTree/TestOptions.cpp (275911 => 275912)
--- trunk/Tools/DumpRenderTree/TestOptions.cpp 2021-04-13 21:19:42 UTC (rev 275911)
+++ trunk/Tools/DumpRenderTree/TestOptions.cpp 2021-04-13 21:20:56 UTC (rev 275912)
@@ -63,6 +63,7 @@
static TestFeatures features;
if (features.boolWebPreferenceFeatures.empty()) {
features.boolWebPreferenceFeatures = {
+ { "PluginsEnabled", true },
#if PLATFORM(COCOA)
// These are non-experimental WebPreference values that must always be set as they
// differ from the default set in the WebPreferences*.yaml configuration.
@@ -154,7 +155,6 @@
{ "ModernMediaControlsEnabled", true },
{ "NeedsStorageAccessFromFileURLsQuirk", false },
{ "OverscrollBehaviorEnabled", true },
- { "PluginsEnabled", true },
{ "PrivateClickMeasurementEnabled", false },
{ "RequestIdleCallbackEnabled", false },
{ "ResizeObserverEnabled", false },
