Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (227391 => 227392)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-23 04:08:48 UTC (rev 227392)
@@ -1,5 +1,45 @@
2018-01-22 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r227282. rdar://problem/36746077
+
+ 2018-01-21 Ryosuke Niwa <rn...@webkit.org>
+
+ Turning off custom pasteboard data doesn't actually turn it off in WK2
+ https://bugs.webkit.org/show_bug.cgi?id=181920
+ <rdar://problem/36686429>
+
+ Reviewed by Wenson Hsieh.
+
+ Replaced the global settings for custom pasteboard data by regular runtime enabled flags.
+
+ * dom/DataTransfer.cpp:
+ (WebCore::DataTransfer::getDataForItem const):
+ (WebCore::DataTransfer::shouldSuppressGetAndSetDataToAvoidExposingFilePaths const):
+ (WebCore::DataTransfer::setDataFromItemList):
+ (WebCore::DataTransfer::types const):
+ (WebCore::DataTransfer::commitToPasteboard):
+ * dom/DataTransferItemList.cpp:
+ (WebCore::shouldExposeTypeInItemList):
+ * editing/Editor.cpp:
+ (WebCore::createDataTransferForClipboardEvent):
+ * editing/cocoa/WebContentReaderCocoa.mm:
+ (WebCore::createFragmentAndAddResources):
+ (WebCore::WebContentReader::readWebArchive):
+ * page/DeprecatedGlobalSettings.cpp:
+ (WebCore::DeprecatedGlobalSettings::defaultCustomPasteboardDataEnabled): Deleted.
+ * page/DeprecatedGlobalSettings.h:
+ (WebCore::DeprecatedGlobalSettings::setCustomPasteboardDataEnabled): Deleted.
+ (WebCore::DeprecatedGlobalSettings::customPasteboardDataEnabled): Deleted.
+ * page/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::setCustomPasteboardDataEnabled):
+ (WebCore::RuntimeEnabledFeatures::customPasteboardDataEnabled const):
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::setCustomPasteboardDataEnabled):
+
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r227339. rdar://problem/36745908
2018-01-22 Youenn Fablet <you...@apple.com>
Modified: branches/safari-605-branch/Source/WebCore/dom/DataTransfer.cpp (227391 => 227392)
--- branches/safari-605-branch/Source/WebCore/dom/DataTransfer.cpp 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebCore/dom/DataTransfer.cpp 2018-01-23 04:08:48 UTC (rev 227392)
@@ -30,7 +30,6 @@
#include "CachedImageClient.h"
#include "DataTransferItem.h"
#include "DataTransferItemList.h"
-#include "DeprecatedGlobalSettings.h"
#include "DocumentFragment.h"
#include "DragData.h"
#include "Editor.h"
@@ -41,6 +40,7 @@
#include "HTMLParserIdioms.h"
#include "Image.h"
#include "Pasteboard.h"
+#include "RuntimeEnabledFeatures.h"
#include "Settings.h"
#include "StaticPasteboard.h"
#include "URLParser.h"
@@ -157,7 +157,7 @@
return { };
}
- if (!DeprecatedGlobalSettings::customPasteboardDataEnabled())
+ if (!RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled())
return m_pasteboard->readString(lowercaseType);
// StaticPasteboard is only used to stage data written by websites before being committed to the system pasteboard.
@@ -188,7 +188,7 @@
bool DataTransfer::shouldSuppressGetAndSetDataToAvoidExposingFilePaths() const
{
- if (!forFileDrag() && !DeprecatedGlobalSettings::customPasteboardDataEnabled())
+ if (!forFileDrag() && !RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled())
return false;
return m_pasteboard->containsFiles();
}
@@ -212,7 +212,7 @@
ASSERT(canWriteData());
RELEASE_ASSERT(is<StaticPasteboard>(*m_pasteboard));
- if (!DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+ if (!RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled()) {
m_pasteboard->writeString(type, data);
return;
}
@@ -274,7 +274,7 @@
if (!canReadTypes())
return { };
- if (!DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+ if (!RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled()) {
auto types = m_pasteboard->typesForLegacyUnsafeBindings();
ASSERT(!types.contains("Files"));
if (m_pasteboard->containsFiles() && addFilesType == AddFilesType::Yes)
@@ -382,7 +382,7 @@
{
ASSERT(is<StaticPasteboard>(*m_pasteboard) && !is<StaticPasteboard>(nativePasteboard));
PasteboardCustomData customData = downcast<StaticPasteboard>(*m_pasteboard).takeCustomData();
- if (DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+ if (RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled()) {
customData.origin = m_originIdentifier;
nativePasteboard.writeCustomData(customData);
return;
Modified: branches/safari-605-branch/Source/WebCore/dom/DataTransferItemList.cpp (227391 => 227392)
--- branches/safari-605-branch/Source/WebCore/dom/DataTransferItemList.cpp 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebCore/dom/DataTransferItemList.cpp 2018-01-23 04:08:48 UTC (rev 227392)
@@ -27,9 +27,9 @@
#include "DataTransferItemList.h"
#include "DataTransferItem.h"
-#include "DeprecatedGlobalSettings.h"
#include "FileList.h"
#include "Pasteboard.h"
+#include "RuntimeEnabledFeatures.h"
#include "Settings.h"
namespace WebCore {
@@ -56,7 +56,7 @@
static bool shouldExposeTypeInItemList(const String& type)
{
- return DeprecatedGlobalSettings::customPasteboardDataEnabled() || Pasteboard::isSafeTypeForDOMToReadAndWrite(type);
+ return RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled() || Pasteboard::isSafeTypeForDOMToReadAndWrite(type);
}
ExceptionOr<RefPtr<DataTransferItem>> DataTransferItemList::add(const String& data, const String& type)
Modified: branches/safari-605-branch/Source/WebCore/editing/Editor.cpp (227391 => 227392)
--- branches/safari-605-branch/Source/WebCore/editing/Editor.cpp 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebCore/editing/Editor.cpp 2018-01-23 04:08:48 UTC (rev 227392)
@@ -38,7 +38,6 @@
#include "CreateLinkCommand.h"
#include "DataTransfer.h"
#include "DeleteSelectionCommand.h"
-#include "DeprecatedGlobalSettings.h"
#include "DictationAlternative.h"
#include "DictationCommand.h"
#include "DocumentFragment.h"
@@ -83,6 +82,7 @@
#include "RenderedPosition.h"
#include "ReplaceRangeWithTextCommand.h"
#include "ReplaceSelectionCommand.h"
+#include "RuntimeEnabledFeatures.h"
#include "Settings.h"
#include "ShadowRoot.h"
#include "SimplifyMarkupCommand.h"
@@ -360,7 +360,7 @@
case ClipboardEventKind::Cut:
return DataTransfer::createForCopyAndPaste(document, DataTransfer::StoreMode::ReadWrite, std::make_unique<StaticPasteboard>());
case ClipboardEventKind::PasteAsPlainText:
- if (DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+ if (RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled()) {
auto plainTextType = ASCIILiteral("text/plain");
auto plainText = Pasteboard::createForCopyAndPaste()->readString(plainTextType);
auto pasteboard = std::make_unique<StaticPasteboard>();
Modified: branches/safari-605-branch/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm (227391 => 227392)
--- branches/safari-605-branch/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm 2018-01-23 04:08:48 UTC (rev 227392)
@@ -31,7 +31,6 @@
#import "BlobURL.h"
#import "CachedResourceLoader.h"
#import "DOMURL.h"
-#import "DeprecatedGlobalSettings.h"
#import "Document.h"
#import "DocumentFragment.h"
#import "DocumentLoader.h"
@@ -304,7 +303,7 @@
if (!fragmentAndResources.fragment)
return nullptr;
- if (!DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+ if (!RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled()) {
if (DocumentLoader* loader = frame.loader().documentLoader()) {
for (auto& resource : fragmentAndResources.resources)
loader->addArchiveResource(resource.copyRef());
@@ -429,7 +428,7 @@
if (!result)
return false;
- if (!DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+ if (!RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled()) {
fragment = createFragmentFromMarkup(*frame.document(), result->markup, result->mainResource->url(), DisallowScriptingAndPluginContent);
if (DocumentLoader* loader = frame.loader().documentLoader())
loader->addAllArchiveResources(result->archive.get());
Modified: branches/safari-605-branch/Source/WebCore/page/DeprecatedGlobalSettings.cpp (227391 => 227392)
--- branches/safari-605-branch/Source/WebCore/page/DeprecatedGlobalSettings.cpp 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebCore/page/DeprecatedGlobalSettings.cpp 2018-01-23 04:08:48 UTC (rev 227392)
@@ -39,10 +39,6 @@
#endif
#endif
-#if PLATFORM(COCOA)
-#include <wtf/spi/darwin/dyldSPI.h>
-#endif
-
namespace WebCore {
#if USE(AVFOUNDATION)
@@ -82,23 +78,7 @@
bool DeprecatedGlobalSettings::gShouldOptOutOfNetworkStateObservation = false;
#endif
bool DeprecatedGlobalSettings::gManageAudioSession = false;
-bool DeprecatedGlobalSettings::gCustomPasteboardDataEnabled = false;
-bool DeprecatedGlobalSettings::defaultCustomPasteboardDataEnabled()
-{
- if (!isInWebProcess())
- return false;
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300
- return IOSApplication::isMobileSafari() || dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_11_3;
-#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
- return MacApplication::isSafari() || dyld_get_program_sdk_version() > DYLD_MACOSX_VERSION_10_13;
-#elif PLATFORM(MAC)
- return MacApplication::isSafari();
-#else
- return false;
-#endif
-}
-
#if PLATFORM(WIN)
void DeprecatedGlobalSettings::setShouldUseHighResolutionTimers(bool shouldUseHighResolutionTimers)
{
Modified: branches/safari-605-branch/Source/WebCore/page/DeprecatedGlobalSettings.h (227391 => 227392)
--- branches/safari-605-branch/Source/WebCore/page/DeprecatedGlobalSettings.h 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebCore/page/DeprecatedGlobalSettings.h 2018-01-23 04:08:48 UTC (rev 227392)
@@ -108,10 +108,6 @@
static void setShouldManageAudioSessionCategory(bool flag) { gManageAudioSession = flag; }
static bool shouldManageAudioSessionCategory() { return gManageAudioSession; }
#endif
-
- static void setCustomPasteboardDataEnabled(bool enabled) { gCustomPasteboardDataEnabled = enabled; }
- static bool customPasteboardDataEnabled() { return gCustomPasteboardDataEnabled; }
- WEBCORE_EXPORT static bool defaultCustomPasteboardDataEnabled();
#if ENABLE(MEDIA_STREAM)
static bool mockCaptureDevicesEnabled();
Modified: branches/safari-605-branch/Source/WebCore/page/RuntimeEnabledFeatures.h (227391 => 227392)
--- branches/safari-605-branch/Source/WebCore/page/RuntimeEnabledFeatures.h 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebCore/page/RuntimeEnabledFeatures.h 2018-01-23 04:08:48 UTC (rev 227392)
@@ -82,6 +82,9 @@
void setDataTransferItemsEnabled(bool areEnabled) { m_areDataTransferItemsEnabled = areEnabled; }
bool dataTransferItemsEnabled() const { return m_areDataTransferItemsEnabled; }
+ void setCustomPasteboardDataEnabled(bool isEnabled) { m_isCustomPasteboardDataEnabled = isEnabled; }
+ bool customPasteboardDataEnabled() const { return m_isCustomPasteboardDataEnabled; }
+
#if ENABLE(ATTACHMENT_ELEMENT)
void setAttachmentElementEnabled(bool areEnabled) { m_isAttachmentElementEnabled = areEnabled; }
bool attachmentElementEnabled() const { return m_isAttachmentElementEnabled; }
@@ -262,6 +265,7 @@
bool m_isMenuItemElementEnabled { false };
bool m_isDirectoryUploadEnabled { false };
bool m_areDataTransferItemsEnabled { false };
+ bool m_isCustomPasteboardDataEnabled { false };
bool m_inputEventsEnabled { true };
#if ENABLE(ATTACHMENT_ELEMENT)
Modified: branches/safari-605-branch/Source/WebCore/testing/InternalSettings.cpp (227391 => 227392)
--- branches/safari-605-branch/Source/WebCore/testing/InternalSettings.cpp 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebCore/testing/InternalSettings.cpp 2018-01-23 04:08:48 UTC (rev 227392)
@@ -119,7 +119,7 @@
#if USE(AUDIO_SESSION)
, m_shouldManageAudioSessionCategory(DeprecatedGlobalSettings::shouldManageAudioSessionCategory())
#endif
- , m_customPasteboardDataEnabled(DeprecatedGlobalSettings::customPasteboardDataEnabled())
+ , m_customPasteboardDataEnabled(RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled())
{
}
@@ -216,11 +216,11 @@
#if ENABLE(MEDIA_STREAM)
RuntimeEnabledFeatures::sharedFeatures().setScreenCaptureEnabled(m_setScreenCaptureEnabled);
#endif
+ RuntimeEnabledFeatures::sharedFeatures().setCustomPasteboardDataEnabled(m_customPasteboardDataEnabled);
#if USE(AUDIO_SESSION)
DeprecatedGlobalSettings::setShouldManageAudioSessionCategory(m_shouldManageAudioSessionCategory);
#endif
- DeprecatedGlobalSettings::setCustomPasteboardDataEnabled(m_customPasteboardDataEnabled);
}
class InternalSettingsWrapper : public Supplement<Page> {
@@ -879,7 +879,7 @@
ExceptionOr<void> InternalSettings::setCustomPasteboardDataEnabled(bool enabled)
{
- DeprecatedGlobalSettings::setCustomPasteboardDataEnabled(enabled);
+ RuntimeEnabledFeatures::sharedFeatures().setCustomPasteboardDataEnabled(enabled);
return { };
}
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (227391 => 227392)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-23 04:08:48 UTC (rev 227392)
@@ -1,5 +1,25 @@
2018-01-22 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r227282. rdar://problem/36746077
+
+ 2018-01-21 Ryosuke Niwa <rn...@webkit.org>
+
+ Turning off custom pasteboard data doesn't actually turn it off in WK2
+ https://bugs.webkit.org/show_bug.cgi?id=181920
+ <rdar://problem/36686429>
+
+ Reviewed by Wenson Hsieh.
+
+ Moved the code to decide when to enable custom pasteboard data from WebCore
+ since we never enable this feature in WebKit1.
+
+ * Shared/WebPreferences.yaml:
+ * Shared/WebPreferencesDefaultValues.cpp:
+ (defaultCustomPasteboardDataEnabled): Added.
+ * Shared/WebPreferencesDefaultValues.h:
+
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r227298. rdar://problem/36746084
2018-01-22 Youenn Fablet <you...@apple.com>
Modified: branches/safari-605-branch/Source/WebKit/Shared/WebPreferences.yaml (227391 => 227392)
--- branches/safari-605-branch/Source/WebKit/Shared/WebPreferences.yaml 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebKit/Shared/WebPreferences.yaml 2018-01-23 04:08:48 UTC (rev 227392)
@@ -779,10 +779,10 @@
CustomPasteboardDataEnabled:
type: bool
- defaultValue: WebCore::DeprecatedGlobalSettings::defaultCustomPasteboardDataEnabled()
+ defaultValue: defaultCustomPasteboardDataEnabled()
humanReadableName: "Custom pateboard data"
humanReadableDescription: "Enable custom clipboard types and better security model for clipboard API."
- webcoreBinding: DeprecatedGlobalSettings
+ webcoreBinding: RuntimeEnabledFeatures
WebVREnabled:
type: bool
Modified: branches/safari-605-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (227391 => 227392)
--- branches/safari-605-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2018-01-23 04:08:48 UTC (rev 227392)
@@ -25,7 +25,12 @@
#include "config.h"
#include "WebPreferencesDefaultValues.h"
+#import <WebCore/RuntimeApplicationChecks.h>
+#if PLATFORM(COCOA)
+#include <wtf/spi/darwin/dyldSPI.h>
+#endif
+
#if PLATFORM(IOS)
#include "VersionChecks.h"
#endif
@@ -38,3 +43,17 @@
return true;
#endif
}
+
+bool defaultCustomPasteboardDataEnabled()
+{
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300
+ return WebCore::IOSApplication::isMobileSafari() || dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_11_3;
+#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
+ return WebCore::MacApplication::isSafari() || dyld_get_program_sdk_version() > DYLD_MACOSX_VERSION_10_13;
+#elif PLATFORM(MAC)
+ return WebCore::MacApplication::isSafari();
+#else
+ return false;
+#endif
+}
+
Modified: branches/safari-605-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h (227391 => 227392)
--- branches/safari-605-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2018-01-23 04:08:48 UTC (rev 227392)
@@ -186,3 +186,4 @@
#endif
bool defaultPassiveTouchListenersAsDefaultOnDocument();
+bool defaultCustomPasteboardDataEnabled();
Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog (227391 => 227392)
--- branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog 2018-01-23 04:08:48 UTC (rev 227392)
@@ -1,5 +1,24 @@
2018-01-22 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r227282. rdar://problem/36746077
+
+ 2018-01-21 Ryosuke Niwa <rn...@webkit.org>
+
+ Turning off custom pasteboard data doesn't actually turn it off in WK2
+ https://bugs.webkit.org/show_bug.cgi?id=181920
+ <rdar://problem/36686429>
+
+ Reviewed by Wenson Hsieh.
+
+ Always disable custom pasteboard data in WebKit1. See r226156 for details.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r227274. rdar://problem/36722660
2018-01-20 Andy Estes <aes...@apple.com>
Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (227391 => 227392)
--- branches/safari-605-branch/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2018-01-23 04:08:48 UTC (rev 227392)
@@ -622,7 +622,7 @@
[NSNumber numberWithBool:YES], WebKitShadowDOMEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitCustomElementsEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitDataTransferItemsEnabledPreferenceKey,
- [NSNumber numberWithBool:DeprecatedGlobalSettings::defaultCustomPasteboardDataEnabled()], WebKitCustomPasteboardDataEnabledPreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitCustomPasteboardDataEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitModernMediaControlsEnabledPreferenceKey,
#if ENABLE(WEBGL2)
[NSNumber numberWithBool:NO], WebKitWebGL2EnabledPreferenceKey,
Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/WebView/WebView.mm (227391 => 227392)
--- branches/safari-605-branch/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-01-23 04:08:42 UTC (rev 227391)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-01-23 04:08:48 UTC (rev 227392)
@@ -3004,6 +3004,7 @@
RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled([preferences shadowDOMEnabled]);
RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled([preferences customElementsEnabled]);
RuntimeEnabledFeatures::sharedFeatures().setDataTransferItemsEnabled([preferences dataTransferItemsEnabled]);
+ RuntimeEnabledFeatures::sharedFeatures().setCustomPasteboardDataEnabled([preferences customPasteboardDataEnabled]);
#if ENABLE(ATTACHMENT_ELEMENT)
RuntimeEnabledFeatures::sharedFeatures().setAttachmentElementEnabled([preferences attachmentElementEnabled]);
@@ -3083,8 +3084,6 @@
[WAKView _setInterpolationQuality:[preferences _interpolationQuality]];
#endif
- DeprecatedGlobalSettings::setCustomPasteboardDataEnabled([preferences customPasteboardDataEnabled]);
-
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
settings.setMediaKeysStorageDirectory([preferences mediaKeysStorageDirectory]);
#endif
