Diff
Modified: branches/safari-612.1.12-branch/Source/WTF/ChangeLog (276683 => 276684)
--- branches/safari-612.1.12-branch/Source/WTF/ChangeLog 2021-04-28 00:44:06 UTC (rev 276683)
+++ branches/safari-612.1.12-branch/Source/WTF/ChangeLog 2021-04-28 00:44:09 UTC (rev 276684)
@@ -1,3 +1,34 @@
+2021-04-27 Ruben Turcios <[email protected]>
+
+ Cherry-pick r276652. rdar://problem/77235499
+
+ Unreviewed, reverting r275912.
+ rdar://77179042
+
+ Broke internal client
+
+ Reverted changeset:
+
+ "Remove support for NPAPI plugins in WebView"
+ https://bugs.webkit.org/show_bug.cgi?id=224449
+ https://commits.webkit.org/r275912
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276652 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-27 Alex Christensen <[email protected]>
+
+ Unreviewed, reverting r275912.
+ rdar://77179042
+
+ Broke internal client
+
+ Reverted changeset:
+
+ "Remove support for NPAPI plugins in WebView"
+ https://bugs.webkit.org/show_bug.cgi?id=224449
+ https://commits.webkit.org/r275912
+
2021-04-25 Devin Rousso <[email protected]>
Add `ALWAYS_LOG_WITH_STREAM` macro for easier development/debugging
Modified: branches/safari-612.1.12-branch/Source/WTF/Scripts/Preferences/WebPreferences.yaml (276683 => 276684)
--- branches/safari-612.1.12-branch/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2021-04-28 00:44:06 UTC (rev 276683)
+++ branches/safari-612.1.12-branch/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2021-04-28 00:44:09 UTC (rev 276684)
@@ -1721,7 +1721,7 @@
webcoreOnChange: pluginsEnabledChanged
defaultValue:
WebKitLegacy:
- default: false
+ default: true
WebKit:
default: false
WebCore:
Modified: branches/safari-612.1.12-branch/Source/WebKitLegacy/mac/ChangeLog (276683 => 276684)
--- branches/safari-612.1.12-branch/Source/WebKitLegacy/mac/ChangeLog 2021-04-28 00:44:06 UTC (rev 276683)
+++ branches/safari-612.1.12-branch/Source/WebKitLegacy/mac/ChangeLog 2021-04-28 00:44:09 UTC (rev 276684)
@@ -1,3 +1,34 @@
+2021-04-27 Ruben Turcios <[email protected]>
+
+ Cherry-pick r276652. rdar://problem/77235499
+
+ Unreviewed, reverting r275912.
+ rdar://77179042
+
+ Broke internal client
+
+ Reverted changeset:
+
+ "Remove support for NPAPI plugins in WebView"
+ https://bugs.webkit.org/show_bug.cgi?id=224449
+ https://commits.webkit.org/r275912
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276652 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-27 Alex Christensen <[email protected]>
+
+ Unreviewed, reverting r275912.
+ rdar://77179042
+
+ Broke internal client
+
+ Reverted changeset:
+
+ "Remove support for NPAPI plugins in WebView"
+ https://bugs.webkit.org/show_bug.cgi?id=224449
+ https://commits.webkit.org/r275912
+
2021-04-23 Chris Dumez <[email protected]>
Improve our constructDeletedValue() template specializations
Modified: branches/safari-612.1.12-branch/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (276683 => 276684)
--- branches/safari-612.1.12-branch/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2021-04-28 00:44:06 UTC (rev 276683)
+++ branches/safari-612.1.12-branch/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2021-04-28 00:44:09 UTC (rev 276684)
@@ -900,8 +900,7 @@
- (void)setPlugInsEnabled:(BOOL)flag
{
- if (flag)
- RELEASE_LOG_FAULT(Plugins, "Application attempted to enable WebView NPAPI plug ins, which are no longer supported");
+ [self _setBoolValue: flag forKey: WebKitPluginsEnabledPreferenceKey];
}
- (BOOL)allowsAnimatedImages
Modified: branches/safari-612.1.12-branch/Tools/ChangeLog (276683 => 276684)
--- branches/safari-612.1.12-branch/Tools/ChangeLog 2021-04-28 00:44:06 UTC (rev 276683)
+++ branches/safari-612.1.12-branch/Tools/ChangeLog 2021-04-28 00:44:09 UTC (rev 276684)
@@ -1,3 +1,34 @@
+2021-04-27 Ruben Turcios <[email protected]>
+
+ Cherry-pick r276652. rdar://problem/77235499
+
+ Unreviewed, reverting r275912.
+ rdar://77179042
+
+ Broke internal client
+
+ Reverted changeset:
+
+ "Remove support for NPAPI plugins in WebView"
+ https://bugs.webkit.org/show_bug.cgi?id=224449
+ https://commits.webkit.org/r275912
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276652 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-27 Alex Christensen <[email protected]>
+
+ Unreviewed, reverting r275912.
+ rdar://77179042
+
+ Broke internal client
+
+ Reverted changeset:
+
+ "Remove support for NPAPI plugins in WebView"
+ https://bugs.webkit.org/show_bug.cgi?id=224449
+ https://commits.webkit.org/r275912
+
2021-04-25 Tyler Wilcock <[email protected]>
jsonchecker.py validate_string uses Python 2 basestring type instead of Python 2/3 str type
Modified: branches/safari-612.1.12-branch/Tools/DumpRenderTree/TestOptions.cpp (276683 => 276684)
--- branches/safari-612.1.12-branch/Tools/DumpRenderTree/TestOptions.cpp 2021-04-28 00:44:06 UTC (rev 276683)
+++ branches/safari-612.1.12-branch/Tools/DumpRenderTree/TestOptions.cpp 2021-04-28 00:44:09 UTC (rev 276684)
@@ -63,7 +63,6 @@
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.
@@ -157,6 +156,7 @@
{ "ModernMediaControlsEnabled", true },
{ "NeedsStorageAccessFromFileURLsQuirk", false },
{ "OverscrollBehaviorEnabled", true },
+ { "PluginsEnabled", true },
{ "PrivateClickMeasurementEnabled", false },
{ "RequestIdleCallbackEnabled", false },
{ "ResizeObserverEnabled", false },
