Diff
Modified: trunk/Source/WTF/ChangeLog (293784 => 293785)
--- trunk/Source/WTF/ChangeLog 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WTF/ChangeLog 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,3 +1,16 @@
+2022-05-04 Brent Fulgham <bfulg...@apple.com>
+
+ Remove deprecated 'JavaEnabled' feature flag and related code
+ https://bugs.webkit.org/show_bug.cgi?id=240044
+
+ Reviewed by Darin Adler.
+
+ We removed support for Java Plug-Ins in macOS 10.15, but never removed the preference. To reduce code complexity
+ and build times we should remove this unused preference, leaving non-functional stubs to avoid breaking binaries
+ that expect to call their accessor methods.
+
+ * Scripts/Preferences/WebPreferences.yaml:
+
2022-05-04 Joonghun Park <jh718.p...@samsung.com>
Unreviewed. Remove the build warning below since r293729.
Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml (293784 => 293785)
--- trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Apple Inc. All rights reserved.
+# Copyright (c) 2020-2022 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -1071,29 +1071,6 @@
WebKit:
default: false
-JavaEnabled:
- type: bool
- webcoreGetter: isJavaEnabled
- defaultValue:
- WebKitLegacy:
- "PLATFORM(IOS_FAMILY)": false
- default: true
- WebKit:
- default: false
- WebCore:
- default: false
-
-JavaEnabledForLocalFiles:
- type: bool
- webcoreGetter: isJavaEnabledForLocalFiles
- defaultValue:
- WebKitLegacy:
- default: true
- WebKit:
- default: false
- WebCore:
- default: true
-
_javascript_CanAccessClipboard:
type: bool
defaultValue:
Modified: trunk/Source/WebCore/ChangeLog (293784 => 293785)
--- trunk/Source/WebCore/ChangeLog 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebCore/ChangeLog 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,3 +1,23 @@
+2022-05-04 Brent Fulgham <bfulg...@apple.com>
+
+ Remove deprecated 'JavaEnabled' feature flag and related code
+ https://bugs.webkit.org/show_bug.cgi?id=240044
+
+ Reviewed by Darin Adler.
+
+ We removed support for Java Plug-Ins in macOS 10.15, but never removed the preference. To reduce code complexity
+ and build times we should remove this unused preference, leaving non-functional stubs to avoid breaking binaries
+ that expect to call their accessor methods.
+
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::navigatorAPIEnumToString):
+ * loader/ResourceLoadStatistics.h:
+ * loader/SubframeLoader.cpp:
+ (WebCore::FrameLoader::SubframeLoader::pluginIsLoadable):
+ * page/Navigator.cpp:
+ (WebCore::Navigator::javaEnabled const): Deleted.
+ * page/Navigator.h:
+
2022-05-04 Mark Lam <mark....@apple.com>
Use IterationStatus in more places.
Modified: trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp (293784 => 293785)
--- trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -378,8 +378,6 @@
static ASCIILiteral navigatorAPIEnumToString(ResourceLoadStatistics::NavigatorAPI navigatorEnum)
{
switch (navigatorEnum) {
- case ResourceLoadStatistics::NavigatorAPI::JavaEnabled:
- return "javaEnabled"_s;
case ResourceLoadStatistics::NavigatorAPI::MimeTypes:
return "mimeTypes"_s;
case ResourceLoadStatistics::NavigatorAPI::CookieEnabled:
Modified: trunk/Source/WebCore/loader/ResourceLoadStatistics.h (293784 => 293785)
--- trunk/Source/WebCore/loader/ResourceLoadStatistics.h 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebCore/loader/ResourceLoadStatistics.h 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -109,7 +109,6 @@
Plugins = 1 << 2,
MimeTypes = 1 << 3,
CookieEnabled = 1 << 4,
- JavaEnabled = 1 << 5,
};
enum class ScreenAPI : uint64_t {
Height = 1 << 0,
@@ -144,8 +143,7 @@
WebCore::ResourceLoadStatistics::NavigatorAPI::UserAgent,
WebCore::ResourceLoadStatistics::NavigatorAPI::Plugins,
WebCore::ResourceLoadStatistics::NavigatorAPI::MimeTypes,
- WebCore::ResourceLoadStatistics::NavigatorAPI::CookieEnabled,
- WebCore::ResourceLoadStatistics::NavigatorAPI::JavaEnabled
+ WebCore::ResourceLoadStatistics::NavigatorAPI::CookieEnabled
>;
};
Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (293784 => 293785)
--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2022 Apple Inc. All rights reserved.
* Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
* Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
* Copyright (C) 2008 Alp Toker <a...@atoker.com>
@@ -124,17 +124,9 @@
return shouldUsePlugin(completedURL, mimeType, false, useFallback);
}
-bool FrameLoader::SubframeLoader::pluginIsLoadable(const URL& url, const String& mimeType)
+bool FrameLoader::SubframeLoader::pluginIsLoadable(const URL& url)
{
auto* document = m_frame.document();
-
- if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType)) {
- if (!m_frame.settings().isJavaEnabled())
- return false;
- if (document && document->securityOrigin().isLocal() && !m_frame.settings().isJavaEnabledForLocalFiles())
- return false;
- }
-
if (document) {
if (document->isSandboxed(SandboxPlugins))
return false;
@@ -189,7 +181,7 @@
if (!(m_frame.arePluginsEnabled() || MIMETypeRegistry::isApplicationPluginMIMEType(mimeType)))
return false;
- if (!pluginIsLoadable(url, explicitMIMEType))
+ if (!pluginIsLoadable(url))
return false;
ASSERT(ownerElement.hasTagName(objectTag) || ownerElement.hasTagName(embedTag));
Modified: trunk/Source/WebCore/loader/SubframeLoader.h (293784 => 293785)
--- trunk/Source/WebCore/loader/SubframeLoader.h 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebCore/loader/SubframeLoader.h 2022-05-04 20:22:05 UTC (rev 293785)
@@ -66,7 +66,7 @@
bool loadPlugin(HTMLPlugInImageElement&, const URL&, const String& mimeType, const Vector<AtomString>& paramNames, const Vector<AtomString>& paramValues, bool useFallback);
bool shouldUsePlugin(const URL&, const String& mimeType, bool hasFallback, bool& useFallback);
- bool pluginIsLoadable(const URL&, const String& mimeType);
+ bool pluginIsLoadable(const URL&);
URL completeURL(const String&) const;
Modified: trunk/Source/WebCore/page/Navigator.cpp (293784 => 293785)
--- trunk/Source/WebCore/page/Navigator.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebCore/page/Navigator.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -2,7 +2,7 @@
* Copyright (C) 2000 Harri Porten (por...@kde.org)
* Copyright (c) 2000 Daniel Molkentin (molken...@kde.org)
* Copyright (c) 2000 Stefan Schimanski (schi...@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006 Apple Inc.
+ * Copyright (C) 2003-2022 Apple Inc.
* Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
*
* This library is free software; you can redistribute it and/or
@@ -320,23 +320,6 @@
return page->cookieJar().cookiesEnabled(*document);
}
-bool Navigator::javaEnabled() const
-{
- auto* frame = this->frame();
- if (!frame)
- return false;
-
- if (RuntimeEnabledFeatures::sharedFeatures().webAPIStatisticsEnabled())
- ResourceLoadObserver::shared().logNavigatorAPIAccessed(*frame->document(), ResourceLoadStatistics::NavigatorAPI::JavaEnabled);
-
- if (!frame->settings().isJavaEnabled())
- return false;
- if (frame->document()->securityOrigin().isLocal() && !frame->settings().isJavaEnabledForLocalFiles())
- return false;
-
- return true;
-}
-
#if PLATFORM(IOS_FAMILY)
bool Navigator::standalone() const
Modified: trunk/Source/WebCore/page/Navigator.h (293784 => 293785)
--- trunk/Source/WebCore/page/Navigator.h 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebCore/page/Navigator.h 2022-05-04 20:22:05 UTC (rev 293785)
@@ -44,7 +44,7 @@
DOMPluginArray& plugins();
DOMMimeTypeArray& mimeTypes();
bool cookieEnabled() const;
- bool javaEnabled() const;
+ bool javaEnabled() const { return false; }
const String& userAgent() const final;
String platform() const final;
void userAgentChanged();
Modified: trunk/Source/WebKit/ChangeLog (293784 => 293785)
--- trunk/Source/WebKit/ChangeLog 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKit/ChangeLog 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,3 +1,33 @@
+2022-05-04 Brent Fulgham <bfulg...@apple.com>
+
+ Remove deprecated 'JavaEnabled' feature flag and related code
+ https://bugs.webkit.org/show_bug.cgi?id=240044
+
+ Reviewed by Darin Adler.
+
+ We removed support for Java Plug-Ins in macOS 10.15, but never removed the preference. To reduce code complexity
+ and build times we should remove this unused preference, leaving non-functional stubs to avoid breaking binaries
+ that expect to call their accessor methods.
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetJavaEnabled):
+ (WKPreferencesGetJavaEnabled):
+ (WKPreferencesSetJavaEnabledForLocalFiles):
+ (WKPreferencesGetJavaEnabledForLocalFiles):
+ * UIProcess/API/C/WKPreferencesRef.h:
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences encodeWithCoder:]):
+ (-[WKPreferences initWithCoder:]):
+ (-[WKPreferences javaEnabled]):
+ (-[WKPreferences setJavaEnabled:]):
+ (-[WKPreferences _setJavaEnabledForLocalFiles:]):
+ (-[WKPreferences _javaEnabledForLocalFiles]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * UIProcess/API/glib/WebKitSettings.cpp:
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::createWithLegacyDefaults):
+
2022-05-03 Ben Nham <n...@apple.com>
Add push service result logging
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (293784 => 293785)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -204,26 +204,6 @@
return toImpl(preferencesRef)->pluginsEnabled();
}
-void WKPreferencesSetJavaEnabled(WKPreferencesRef preferencesRef, bool javaEnabled)
-{
- toImpl(preferencesRef)->setJavaEnabled(javaEnabled);
-}
-
-bool WKPreferencesGetJavaEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->javaEnabled();
-}
-
-void WKPreferencesSetJavaEnabledForLocalFiles(WKPreferencesRef preferencesRef, bool javaEnabledForLocalFiles)
-{
- toImpl(preferencesRef)->setJavaEnabledForLocalFiles(javaEnabledForLocalFiles);
-}
-
-bool WKPreferencesGetJavaEnabledForLocalFiles(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->javaEnabledForLocalFiles();
-}
-
void WKPreferencesSetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferencesRef, bool _javascript_CanOpenWindowsAutomatically)
{
toImpl(preferencesRef)->setJavaScriptCanOpenWindowsAutomatically(_javascript_CanOpenWindowsAutomatically);
@@ -2211,3 +2191,12 @@
{
return false;
}
+
+void WKPreferencesSetJavaEnabled(WKPreferencesRef, bool)
+{
+}
+
+bool WKPreferencesGetJavaEnabled(WKPreferencesRef)
+{
+ return false;
+}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h (293784 => 293785)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -103,9 +103,9 @@
WK_EXPORT void WKPreferencesSetPluginsEnabled(WKPreferencesRef preferences, bool pluginsEnabled);
WK_EXPORT bool WKPreferencesGetPluginsEnabled(WKPreferencesRef preferences);
-// Defaults to true.
-WK_EXPORT void WKPreferencesSetJavaEnabled(WKPreferencesRef preferences, bool javaEnabled);
-WK_EXPORT bool WKPreferencesGetJavaEnabled(WKPreferencesRef preferences);
+// Deprecated; Does nothing, always returns false.
+WK_EXPORT void WKPreferencesSetJavaEnabled(WKPreferencesRef preferences, bool javaEnabled) WK_C_API_DEPRECATED;
+WK_EXPORT bool WKPreferencesGetJavaEnabled(WKPreferencesRef preferences) WK_C_API_DEPRECATED;
// Defaults to true.
WK_EXPORT void WKPreferencesSetJavaScriptCanOpenWindowsAutomatically(WKPreferencesRef preferences, bool _javascript_CanOpenWindowsAutomatically);
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h (293784 => 293785)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -211,10 +211,6 @@
WK_EXPORT void WKPreferencesSetMockScrollbarsEnabled(WKPreferencesRef preferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetMockScrollbarsEnabled(WKPreferencesRef preferencesRef);
-// Defaults to true.
-WK_EXPORT void WKPreferencesSetJavaEnabledForLocalFiles(WKPreferencesRef preferences, bool javaEnabled);
-WK_EXPORT bool WKPreferencesGetJavaEnabledForLocalFiles(WKPreferencesRef preferences);
-
// Defaults to false
WK_EXPORT void WKPreferencesSetDiagnosticLoggingEnabled(WKPreferencesRef preferencesRef, bool enabled);
WK_EXPORT bool WKPreferencesGetDiagnosticLoggingEnabled(WKPreferencesRef preferencesRef);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm (293784 => 293785)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -76,9 +76,6 @@
ALLOW_DEPRECATED_DECLARATIONS_END
#if PLATFORM(MAC)
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- [coder encodeBool:self.javaEnabled forKey:@"javaEnabled"];
-ALLOW_DEPRECATED_DECLARATIONS_END
[coder encodeBool:self.tabFocusesLinks forKey:@"tabFocusesLinks"];
#endif
[coder encodeBool:self.textInteractionEnabled forKey:@"textInteractionEnabled"];
@@ -97,9 +94,6 @@
ALLOW_DEPRECATED_DECLARATIONS_END
#if PLATFORM(MAC)
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- self.javaEnabled = [coder decodeBoolForKey:@"javaEnabled"];
-ALLOW_DEPRECATED_DECLARATIONS_END
self.tabFocusesLinks = [coder decodeBoolForKey:@"tabFocusesLinks"];
#endif
if ([coder containsValueForKey:@"textInteractionEnabled"])
@@ -954,16 +948,6 @@
}
#if PLATFORM(MAC)
-- (void)_setJavaEnabledForLocalFiles:(BOOL)enabled
-{
- _preferences->setJavaEnabledForLocalFiles(enabled);
-}
-
-- (BOOL)_javaEnabledForLocalFiles
-{
- return _preferences->javaEnabledForLocalFiles();
-}
-
- (void)_setCanvasUsesAcceleratedDrawing:(BOOL)enabled
{
_preferences->setCanvasUsesAcceleratedDrawing(enabled);
@@ -1588,12 +1572,11 @@
- (BOOL)javaEnabled
{
- return _preferences->javaEnabled();
+ return NO;
}
- (void)setJavaEnabled:(BOOL)javaEnabled
{
- _preferences->setJavaEnabled(javaEnabled);
}
- (BOOL)plugInsEnabled
@@ -1654,4 +1637,15 @@
#endif
+#if PLATFORM(MAC)
+- (void)_setJavaEnabledForLocalFiles:(BOOL)enabled
+{
+}
+
+- (BOOL)_javaEnabledForLocalFiles
+{
+ return NO;
+}
+#endif
+
@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h (293784 => 293785)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -183,7 +183,6 @@
#if !TARGET_OS_IPHONE
@property (nonatomic, setter=_setWebGLEnabled:) BOOL _webGLEnabled WK_API_AVAILABLE(macos(10.13.4));
-@property (nonatomic, setter=_setJavaEnabledForLocalFiles:) BOOL _javaEnabledForLocalFiles WK_API_AVAILABLE(macos(10.13.4));
@property (nonatomic, setter=_setCanvasUsesAcceleratedDrawing:) BOOL _canvasUsesAcceleratedDrawing WK_API_AVAILABLE(macos(10.13.4));
@property (nonatomic, setter=_setDefaultTextEncodingName:) NSString *_defaultTextEncodingName WK_API_AVAILABLE(macos(10.13.4));
@property (nonatomic, setter=_setAuthorAndUserStylesEnabled:) BOOL _authorAndUserStylesEnabled WK_API_AVAILABLE(macos(10.13.4));
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (293784 => 293785)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1916,13 +1916,13 @@
*
* Get the #WebKitSettings:enable-java property.
*
- * Returns: %TRUE If Java is enabled or %FALSE otherwise.
+ * Returns: %FALSE always.
*/
gboolean webkit_settings_get_enable_java(WebKitSettings* settings)
{
g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
- return settings->priv->preferences->javaEnabled();
+ return FALSE;
}
/**
@@ -1930,19 +1930,11 @@
* @settings: a #WebKitSettings
* @enabled: Value to be set
*
- * Set the #WebKitSettings:enable-java property.
+ * Set the #WebKitSettings:enable-java property. Deprecated function that does nothing.
*/
-void webkit_settings_set_enable_java(WebKitSettings* settings, gboolean enabled)
+void webkit_settings_set_enable_java(WebKitSettings* settings, gboolean)
{
g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
-
- WebKitSettingsPrivate* priv = settings->priv;
- bool currentValue = priv->preferences->javaEnabled();
- if (currentValue == enabled)
- return;
-
- priv->preferences->setJavaEnabled(enabled);
- g_object_notify_by_pspec(G_OBJECT(settings), sObjProperties[PROP_ENABLE_JAVA]);
}
/**
Modified: trunk/Source/WebKit/UIProcess/WebPreferences.cpp (293784 => 293785)
--- trunk/Source/WebKit/UIProcess/WebPreferences.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKit/UIProcess/WebPreferences.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -50,8 +50,6 @@
auto preferences = WebPreferences::create(identifier, keyPrefix, globalDebugKeyPrefix);
// FIXME: The registerDefault...ValueForKey machinery is unnecessarily heavyweight and complicated.
// We can just compute different defaults for modern and legacy APIs in WebPreferencesDefinitions.h macros.
- preferences->registerDefaultBoolValueForKey(WebPreferencesKey::javaEnabledKey(), true);
- preferences->registerDefaultBoolValueForKey(WebPreferencesKey::javaEnabledForLocalFilesKey(), true);
preferences->registerDefaultBoolValueForKey(WebPreferencesKey::pluginsEnabledKey(), true);
preferences->registerDefaultUInt32ValueForKey(WebPreferencesKey::storageBlockingPolicyKey(), static_cast<uint32_t>(WebCore::StorageBlockingPolicy::AllowAll));
return preferences;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (293784 => 293785)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,3 +1,22 @@
+2022-05-04 Brent Fulgham <bfulg...@apple.com>
+
+ Remove deprecated 'JavaEnabled' feature flag and related code
+ https://bugs.webkit.org/show_bug.cgi?id=240044
+
+ Reviewed by Darin Adler.
+
+ We removed support for Java Plug-Ins in macOS 10.15, but never removed the preference. To reduce code complexity
+ and build times we should remove this unused preference, leaving non-functional stubs to avoid breaking binaries
+ that expect to call their accessor methods.
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ (-[WebInspectorWindowController init]):
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.h:
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences isJavaEnabled]):
+ (-[WebPreferences setJavaEnabled:]):
+
2022-04-28 Brent Fulgham <bfulg...@apple.com>
Remove the AVFoundationNSURLSessionEnabled preference
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm (293784 => 293785)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -481,7 +481,6 @@
[preferences setAutosaves:NO];
[preferences setDefaultFixedFontSize:11];
[preferences setFixedFontFamily:@"Menlo"];
- [preferences setJavaEnabled:NO];
[preferences setJavaScriptEnabled:YES];
[preferences setLoadsImagesAutomatically:YES];
[preferences setMinimumFontSize:0];
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h (293784 => 293785)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -49,7 +49,6 @@
#define WebKitTextAreasAreResizablePreferenceKey @"WebKitTextAreasAreResizable"
#endif
#define WebKitShrinksStandaloneImagesToFitPreferenceKey @"WebKitShrinksStandaloneImagesToFit"
-#define WebKitJavaEnabledPreferenceKey @"WebKitJavaEnabled"
#define WebKitJavaScriptEnabledPreferenceKey @"WebKitJavaScriptEnabled"
#define WebKitJavaScriptMarkupEnabledPreferenceKey @"WebKitJavaScriptMarkupEnabled"
#define WebKitWebSecurityEnabledPreferenceKey @"WebKitWebSecurityEnabled"
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.h (293784 => 293785)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.h 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.h 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2004, 2005, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -168,8 +168,9 @@
/*!
@property javaEnabled
+ @discussion Deprecated function that does nothing and always returns false.
*/
-@property (nonatomic, getter=isJavaEnabled) BOOL javaEnabled;
+@property (nonatomic, getter=isJavaEnabled) BOOL javaEnabled WEBKIT_DEPRECATED_MAC(10_3, 10_15);
/*!
@property _javascript_Enabled
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (293784 => 293785)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2022 Apple Inc. All rights reserved.
* (C) 2006 Graham Dennis (graham.den...@gmail.com)
*
* Redistribution and use in source and binary forms, with or without
@@ -859,16 +859,6 @@
}
#endif
-- (BOOL)isJavaEnabled
-{
- return [self _boolValueForKey: WebKitJavaEnabledPreferenceKey];
-}
-
-- (void)setJavaEnabled:(BOOL)flag
-{
- [self _setBoolValue: flag forKey: WebKitJavaEnabledPreferenceKey];
-}
-
- (BOOL)isJavaScriptEnabled
{
return [self _boolValueForKey: WebKitJavaScriptEnabledPreferenceKey];
@@ -3474,4 +3464,13 @@
{
}
+- (BOOL)isJavaEnabled
+{
+ return NO;
+}
+
+- (void)setJavaEnabled:(BOOL)flag
+{
+}
+
@end
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (293784 => 293785)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,3 +1,24 @@
+2022-05-04 Brent Fulgham <bfulg...@apple.com>
+
+ Remove deprecated 'JavaEnabled' feature flag and related code
+ https://bugs.webkit.org/show_bug.cgi?id=240044
+
+ Reviewed by Darin Adler.
+
+ We removed support for Java Plug-Ins in macOS 10.15, but never removed the preference. To reduce code complexity
+ and build times we should remove this unused preference, leaving non-functional stubs to avoid breaking binaries
+ that expect to call their accessor methods.
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorClient::openLocalFrontend):
+ * WebPreferenceKeysPrivate.h:
+ * WebPreferences.cpp:
+ (WebPreferences::initializeDefaultSettings):
+ (WebPreferences::isJavaEnabled):
+ (WebPreferences::setJavaEnabled):
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
2022-04-22 Chris Dumez <cdu...@apple.com>
Move global AtomStrings to a common header to promote reuse
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp (293784 => 293785)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebInspectorClient.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2010, 2014, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -131,8 +131,6 @@
return 0;
if (FAILED(preferences->setPlugInsEnabled(FALSE)))
return 0;
- if (FAILED(preferences->setJavaEnabled(FALSE)))
- return 0;
if (FAILED(preferences->setUserStyleSheetEnabled(FALSE)))
return 0;
if (FAILED(preferences->setTabsToLinks(FALSE)))
Modified: trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h (293784 => 293785)
--- trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h 2022-05-04 20:22:05 UTC (rev 293785)
@@ -48,7 +48,6 @@
#define WebKitUserStyleSheetLocationPreferenceKey "WebKitUserStyleSheetLocationPreferenceKey"
#define WebKitShouldPrintBackgroundsPreferenceKey "WebKitShouldPrintBackgroundsPreferenceKey"
#define WebKitTextAreasAreResizablePreferenceKey "WebKitTextAreasAreResizable"
-#define WebKitJavaEnabledPreferenceKey "WebKitJavaEnabled"
#define WebKitJavaScriptEnabledPreferenceKey "WebKitJavaScriptEnabled"
#define WebKitJavaScriptRuntimeFlagsPreferenceKey "WebKitJavaScriptRuntimeFlags"
#define WebKitWebSecurityEnabledPreferenceKey "WebKitWebSecurityEnabled"
Modified: trunk/Source/WebKitLegacy/win/WebPreferences.cpp (293784 => 293785)
--- trunk/Source/WebKitLegacy/win/WebPreferences.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -248,7 +248,6 @@
CFDictionaryAddValue(defaults.get(), CFSTR(WebKitUserStyleSheetLocationPreferenceKey), CFSTR(""));
CFDictionaryAddValue(defaults.get(), CFSTR(WebKitShouldPrintBackgroundsPreferenceKey), kCFBooleanFalse);
CFDictionaryAddValue(defaults.get(), CFSTR(WebKitTextAreasAreResizablePreferenceKey), kCFBooleanFalse);
- CFDictionaryAddValue(defaults.get(), CFSTR(WebKitJavaEnabledPreferenceKey), kCFBooleanTrue);
CFDictionaryAddValue(defaults.get(), CFSTR(WebKitJavaScriptEnabledPreferenceKey), kCFBooleanTrue);
CFDictionaryAddValue(defaults.get(), CFSTR(WebKitJavaScriptRuntimeFlagsPreferenceKey), CFSTR("0"));
CFDictionaryAddValue(defaults.get(), CFSTR(WebKitWebSecurityEnabledPreferenceKey), kCFBooleanTrue);
@@ -928,13 +927,12 @@
{
if (!enabled)
return E_POINTER;
- *enabled = boolValueForKey(WebKitJavaEnabledPreferenceKey);
+ *enabled = FALSE;
return S_OK;
}
-HRESULT WebPreferences::setJavaEnabled(BOOL enabled)
+HRESULT WebPreferences::setJavaEnabled(BOOL)
{
- setBoolValue(WebKitJavaEnabledPreferenceKey, enabled);
return S_OK;
}
Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (293784 => 293785)
--- trunk/Source/WebKitLegacy/win/WebView.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2019 Apple, Inc. All rights reserved.
+ * Copyright (C) 2006-2022 Apple, Inc. All rights reserved.
* Copyright (C) 2009, 2010, 2011 Appcelerator, Inc. All rights reserved.
* Copyright (C) 2011 Brent Fulgham. All rights reserved.
*
@@ -4986,11 +4986,6 @@
settings.setPictographFontFamily(toAtomString(str));
str.clear();
- hr = preferences->isJavaEnabled(&enabled);
- if (FAILED(hr))
- return hr;
- settings.setJavaEnabled(!!enabled);
-
hr = preferences->isJavaScriptEnabled(&enabled);
if (FAILED(hr))
return hr;
Modified: trunk/Tools/ChangeLog (293784 => 293785)
--- trunk/Tools/ChangeLog 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Tools/ChangeLog 2022-05-04 20:22:05 UTC (rev 293785)
@@ -1,3 +1,25 @@
+2022-05-04 Brent Fulgham <bfulg...@apple.com>
+
+ Remove deprecated 'JavaEnabled' feature flag and related code
+ https://bugs.webkit.org/show_bug.cgi?id=240044
+
+ Reviewed by Darin Adler.
+
+ We removed support for Java Plug-Ins in macOS 10.15, but never removed the preference. To reduce code complexity
+ and build times we should remove this unused preference, leaving non-functional stubs to avoid breaking binaries
+ that expect to call their accessor methods.
+
+ * DumpRenderTree/TestOptions.cpp:
+ (WTR::TestOptions::defaults):
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebPreferencesToConsistentValues):
+ * TestWebKitAPI/Tests/WebKit/WKPreferences.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/Coding.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/Copying.mm:
+ (TEST):
+
2022-05-04 Jonathan Bedard <jbed...@apple.com>
[git-webkit] Populate commit message with bug details
Modified: trunk/Tools/DumpRenderTree/TestOptions.cpp (293784 => 293785)
--- trunk/Tools/DumpRenderTree/TestOptions.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Tools/DumpRenderTree/TestOptions.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -79,7 +79,6 @@
{ "GamepadsEnabled", true },
{ "HiddenPageCSSAnimationSuspensionEnabled", false },
{ "InlineMediaPlaybackRequiresPlaysInlineAttribute", false },
- { "JavaEnabled", false },
{ "_javascript_CanAccessClipboard", true },
{ "_javascript_CanOpenWindowsAutomatically", true },
{ "LargeImageAsyncDecodingEnabled", false },
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (293784 => 293785)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -877,7 +877,6 @@
preferences->setDefaultFixedFontSize(13);
preferences->setMinimumFontSize(0);
preferences->setDefaultTextEncodingName(_bstr_t(L"ISO-8859-1"));
- preferences->setJavaEnabled(FALSE);
preferences->setJavaScriptEnabled(TRUE);
preferences->setEditableLinkBehavior(WebKitEditableLinkOnlyLiveWithShiftKey);
preferences->setDOMPasteAllowed(TRUE);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp (293784 => 293785)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp 2022-05-04 20:22:05 UTC (rev 293785)
@@ -81,7 +81,6 @@
EXPECT_TRUE(WKPreferencesGetLocalStorageEnabled(preference));
EXPECT_FALSE(WKPreferencesGetFrameFlatteningEnabled(preference));
EXPECT_TRUE(WKPreferencesGetPluginsEnabled(preference));
- EXPECT_TRUE(WKPreferencesGetJavaEnabled(preference));
EXPECT_TRUE(WKPreferencesGetJavaScriptCanOpenWindowsAutomatically(preference));
EXPECT_TRUE(WKPreferencesGetHyperlinkAuditingEnabled(preference));
EXPECT_WK_STREQ(expectedStandardFontFamily, adoptWK(WKPreferencesCopyStandardFontFamily(preference)));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Coding.mm (293784 => 293785)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Coding.mm 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Coding.mm 2022-05-04 20:22:05 UTC (rev 293785)
@@ -53,7 +53,6 @@
[a setJavaScriptCanOpenWindowsAutomatically:YES];
#else
[a setJavaScriptCanOpenWindowsAutomatically:NO];
- [a setJavaEnabled:YES];
[a setPlugInsEnabled:YES];
[a setTabFocusesLinks:YES];
#endif
@@ -65,7 +64,6 @@
EXPECT_EQ([a _javascript_CanOpenWindowsAutomatically], [b _javascript_CanOpenWindowsAutomatically]);
#if PLATFORM(MAC)
- EXPECT_EQ([a javaEnabled], [b javaEnabled]);
EXPECT_EQ([a plugInsEnabled], [b plugInsEnabled]);
EXPECT_EQ([a tabFocusesLinks], [b tabFocusesLinks]);
#endif
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Copying.mm (293784 => 293785)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Copying.mm 2022-05-04 20:20:24 UTC (rev 293784)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Copying.mm 2022-05-04 20:22:05 UTC (rev 293785)
@@ -37,7 +37,6 @@
[a setJavaScriptCanOpenWindowsAutomatically:YES];
#else
[a setJavaScriptCanOpenWindowsAutomatically:NO];
- [a setJavaEnabled:YES];
[a setPlugInsEnabled:YES];
[a setTabFocusesLinks:YES];
#endif
@@ -60,7 +59,6 @@
[b setJavaScriptCanOpenWindowsAutomatically:NO];
#else
[b setJavaScriptCanOpenWindowsAutomatically:YES];
- [b setJavaEnabled:NO];
[b setPlugInsEnabled:NO];
[b setTabFocusesLinks:NO];
#endif
@@ -70,7 +68,6 @@
EXPECT_NE([a _javascript_Enabled], [b _javascript_Enabled]);
EXPECT_NE([a _javascript_CanOpenWindowsAutomatically], [b _javascript_CanOpenWindowsAutomatically]);
#if PLATFORM(MAC)
- EXPECT_NE([a javaEnabled], [b javaEnabled]);
EXPECT_EQ([a plugInsEnabled], [b plugInsEnabled]);
EXPECT_NE([a tabFocusesLinks], [b tabFocusesLinks]);
#endif
