Changeset 227282 in webkit

Timestamp:

Jan 21, 2018 10:41:05 PM (6 years ago)

Author:

rniwa@webkit.org

Message:

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.

Source/WebCore:

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):

Source/WebKit:

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:

Source/WebKitLegacy/mac:

Always disable custom pasteboard data in WebKit1. See r226156 for details.

• WebView/WebPreferences.mm:

(+[WebPreferences initialize]):

• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/DataTransfer.cpp (modified) (7 diffs)
• WebCore/dom/DataTransferItemList.cpp (modified) (2 diffs)
• WebCore/editing/Editor.cpp (modified) (3 diffs)
• WebCore/editing/cocoa/WebContentReaderCocoa.mm (modified) (3 diffs)
• WebCore/page/DeprecatedGlobalSettings.cpp (modified) (2 diffs)
• WebCore/page/DeprecatedGlobalSettings.h (modified) (1 diff)
• WebCore/page/RuntimeEnabledFeatures.h (modified) (2 diffs)
• WebCore/testing/InternalSettings.cpp (modified) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebPreferences.yaml (modified) (1 diff)
• WebKit/Shared/WebPreferencesDefaultValues.cpp (modified) (2 diffs)
• WebKit/Shared/WebPreferencesDefaultValues.h (modified) (1 diff)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebPreferences.mm (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebView.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-21  Ryosuke Niwa  <rniwa@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-21  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/dom/DataTransfer.cpp

@@ -31 +31 @@
 #include "DataTransferItem.h"
 #include "DataTransferItemList.h"
-#include "DeprecatedGlobalSettings.h"
 #include "DocumentFragment.h"
 #include "DragData.h"
@@ -42 +41 @@
 #include "Image.h"
 #include "Pasteboard.h"
+#include "RuntimeEnabledFeatures.h"
 #include "Settings.h"
 #include "StaticPasteboard.h"
@@ -158 +158 @@
     }
 
-    if (!DeprecatedGlobalSettings::customPasteboardDataEnabled())
+    if (!RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled())
         return m_pasteboard->readString(lowercaseType);
 
@@ -189 +189 @@
 bool DataTransfer::shouldSuppressGetAndSetDataToAvoidExposingFilePaths() const
 {
-    if (!forFileDrag() && !DeprecatedGlobalSettings::customPasteboardDataEnabled())
+    if (!forFileDrag() && !RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled())
         return false;
     return m_pasteboard->containsFiles();
@@ -213 +213 @@
     RELEASE_ASSERT(is<StaticPasteboard>(*m_pasteboard));
 
-    if (!DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+    if (!RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled()) {
         m_pasteboard->writeString(type, data);
         return;
@@ -275 +275 @@
         return { };
     
-    if (!DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+    if (!RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled()) {
         auto types = m_pasteboard->typesForLegacyUnsafeBindings();
         ASSERT(!types.contains("Files"));
@@ -383 +383 @@
     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);

trunk/Source/WebCore/dom/DataTransferItemList.cpp

@@ -28 +28 @@
 
 #include "DataTransferItem.h"
-#include "DeprecatedGlobalSettings.h"
 #include "FileList.h"
 #include "Pasteboard.h"
+#include "RuntimeEnabledFeatures.h"
 #include "Settings.h"
 
@@ -57 +57 @@
 static bool shouldExposeTypeInItemList(const String& type)
 {
-    return DeprecatedGlobalSettings::customPasteboardDataEnabled() || Pasteboard::isSafeTypeForDOMToReadAndWrite(type);
+    return RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled() || Pasteboard::isSafeTypeForDOMToReadAndWrite(type);
 }
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -39 +39 @@
 #include "DataTransfer.h"
 #include "DeleteSelectionCommand.h"
-#include "DeprecatedGlobalSettings.h"
 #include "DictationAlternative.h"
 #include "DictationCommand.h"
@@ -84 +83 @@
 #include "ReplaceRangeWithTextCommand.h"
 #include "ReplaceSelectionCommand.h"
+#include "RuntimeEnabledFeatures.h"
 #include "Settings.h"
 #include "ShadowRoot.h"
@@ -361 +361 @@
         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);

trunk/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm

@@ -32 +32 @@
 #import "CachedResourceLoader.h"
 #import "DOMURL.h"
-#import "DeprecatedGlobalSettings.h"
 #import "Document.h"
 #import "DocumentFragment.h"
@@ -327 +326 @@
         return nullptr;
 
-    if (!DeprecatedGlobalSettings::customPasteboardDataEnabled()) {
+    if (!RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled()) {
         if (DocumentLoader* loader = frame.loader().documentLoader()) {
             for (auto& resource : fragmentAndResources.resources)
@@ -458 +457 @@
         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())

trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp

@@ -40 +40 @@
 #endif
 
-#if PLATFORM(COCOA)
-#include <wtf/spi/darwin/dyldSPI.h>
-#endif
-
 namespace WebCore {
 
@@ -83 +79 @@
 #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)

trunk/Source/WebCore/page/DeprecatedGlobalSettings.h

@@ -109 +109 @@
     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)

trunk/Source/WebCore/page/RuntimeEnabledFeatures.h

@@ -83 +83 @@
     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; }
@@ -263 +266 @@
     bool m_isDirectoryUploadEnabled { false };
     bool m_areDataTransferItemsEnabled { false };
+    bool m_isCustomPasteboardDataEnabled { false };
     bool m_inputEventsEnabled { true };
 

trunk/Source/WebCore/testing/InternalSettings.cpp

@@ -120 +120 @@
     , m_shouldManageAudioSessionCategory(DeprecatedGlobalSettings::shouldManageAudioSessionCategory())
 #endif
-    , m_customPasteboardDataEnabled(DeprecatedGlobalSettings::customPasteboardDataEnabled())
+    , m_customPasteboardDataEnabled(RuntimeEnabledFeatures::sharedFeatures().customPasteboardDataEnabled())
 {
 }
@@ -217 +217 @@
     RuntimeEnabledFeatures::sharedFeatures().setScreenCaptureEnabled(m_setScreenCaptureEnabled);
 #endif
+    RuntimeEnabledFeatures::sharedFeatures().setCustomPasteboardDataEnabled(m_customPasteboardDataEnabled);
 
 #if USE(AUDIO_SESSION)
     DeprecatedGlobalSettings::setShouldManageAudioSessionCategory(m_shouldManageAudioSessionCategory);
 #endif
-    DeprecatedGlobalSettings::setCustomPasteboardDataEnabled(m_customPasteboardDataEnabled);
 }
 
@@ -880 +880 @@
 ExceptionOr<void> InternalSettings::setCustomPasteboardDataEnabled(bool enabled)
 {
-    DeprecatedGlobalSettings::setCustomPasteboardDataEnabled(enabled);
+    RuntimeEnabledFeatures::sharedFeatures().setCustomPasteboardDataEnabled(enabled);
     return { };
 }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-21  Ryosuke Niwa  <rniwa@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-21  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/Shared/WebPreferences.yaml

@@ -780 +780 @@
 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:

trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "WebPreferencesDefaultValues.h"
+#import <WebCore/RuntimeApplicationChecks.h>
+
+#if PLATFORM(COCOA)
+#include <wtf/spi/darwin/dyldSPI.h>
+#endif
 
 #if PLATFORM(IOS)
@@ -39 +44 @@
 #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
+}
+

trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h

@@ -187 +187 @@
 
 bool defaultPassiveTouchListenersAsDefaultOnDocument();
+bool defaultCustomPasteboardDataEnabled();

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2018-01-21  Ryosuke Niwa  <rniwa@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-21  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm

@@ -623 +623 @@
         [NSNumber numberWithBool:YES], WebKitCustomElementsEnabledPreferenceKey,
         [NSNumber numberWithBool:YES], WebKitDataTransferItemsEnabledPreferenceKey,
-        [NSNumber numberWithBool:DeprecatedGlobalSettings::defaultCustomPasteboardDataEnabled()], WebKitCustomPasteboardDataEnabledPreferenceKey,
+        [NSNumber numberWithBool:NO], WebKitCustomPasteboardDataEnabledPreferenceKey,
         [NSNumber numberWithBool:YES], WebKitModernMediaControlsEnabledPreferenceKey,
 #if ENABLE(WEBGL2)

trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

@@ -2995 +2995 @@
     RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled([preferences customElementsEnabled]);
     RuntimeEnabledFeatures::sharedFeatures().setDataTransferItemsEnabled([preferences dataTransferItemsEnabled]);
+    RuntimeEnabledFeatures::sharedFeatures().setCustomPasteboardDataEnabled([preferences customPasteboardDataEnabled]);
 
 #if ENABLE(ATTACHMENT_ELEMENT)
@@ -3073 +3074 @@
     [WAKView _setInterpolationQuality:[preferences _interpolationQuality]];
 #endif
-
-    DeprecatedGlobalSettings::setCustomPasteboardDataEnabled([preferences customPasteboardDataEnabled]);
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)