Changeset 219128 in webkit

Timestamp:

Jul 5, 2017, 8:59:45 AM (9 years ago)

Author:

Matt Lewis

Message:

Unreviewed, rolling out r219070.

This revision caused consistent failures of the API test
UIPasteboardTests.DoNotPastePlainTextAsURL on iOS.

Reverted changeset:

"Pasting single words copied to UIPasteboard inserts URLs in
editable areas"
​https://bugs.webkit.org/show_bug.cgi?id=174082
​http://trac.webkit.org/changeset/219070

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/PlatformPasteboard.h (modified) (1 diff)
• Source/WebCore/platform/ios/AbstractPasteboard.h (modified) (1 diff)
• Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (modified) (3 diffs)
• Source/WebCore/platform/ios/WebItemProviderPasteboard.h (modified) (1 diff)
• Source/WebCore/platform/ios/WebItemProviderPasteboard.mm (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-05  Matt Lewis  <jlewis3@apple.com>
+
+        Unreviewed, rolling out r219070.
+
+        This revision caused consistent failures of the API test
+        UIPasteboardTests.DoNotPastePlainTextAsURL on iOS.
+
+        Reverted changeset:
+
+        "Pasting single words copied to UIPasteboard inserts URLs in
+        editable areas"
+        https://bugs.webkit.org/show_bug.cgi?id=174082
+        http://trac.webkit.org/changeset/219070
+
 2017-07-05  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/PlatformPasteboard.h

@@ -103 +103 @@
     WEBCORE_EXPORT void writeObjectRepresentations(const String& pasteboardType, const String& text);
     WEBCORE_EXPORT void writeObjectRepresentations(const PasteboardURL&);
-    bool allowReadingURLAtIndex(const URL&, int index) const;
 #endif
 

trunk/Source/WebCore/platform/ios/AbstractPasteboard.h

@@ -35 +35 @@
 @property (readonly, nonatomic) NSInteger numberOfItems;
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
-@property (nonatomic, copy, nullable) NSArray<__kindof NSItemProvider *> *itemProviders;
-#endif
-
 - (NSArray<NSString *> *)pasteboardTypes;
 - (NSArray *)dataForPasteboardType:(NSString *)pasteboardType inItemSet:(NSIndexSet *)itemSet;

trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm

@@ -216 +216 @@
 }
 
-bool PlatformPasteboard::allowReadingURLAtIndex(const URL& url, int index) const
-{
-    NSItemProvider *itemProvider = (NSUInteger)index < [m_pasteboard itemProviders].count ? [[m_pasteboard itemProviders] objectAtIndex:index] : nil;
-    for (NSString *type in itemProvider.registeredTypeIdentifiers) {
-        if (UTTypeConformsTo((CFStringRef)type, kUTTypeURL))
-            return true;
-    }
-
-    return url.isValid();
-}
-
-#else
-
-bool PlatformPasteboard::allowReadingURLAtIndex(const URL&, int) const
-{
-    return true;
-}
-
 #endif
 
@@ -445 +427 @@
     } else if (type == String(kUTTypeURL)) {
         ASSERT([value isKindOfClass:[NSURL class]]);
-        if ([value isKindOfClass:[NSURL class]] && allowReadingURLAtIndex((NSURL *)value, index))
+        if ([value isKindOfClass:[NSURL class]])
             return [(NSURL *)value absoluteString];
     }
@@ -466 +448 @@
         return URL();
 
-    if (!allowReadingURLAtIndex((NSURL *)value, index))
-        return { };
-
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
     title = [value _title];

trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h

@@ -80 +80 @@
 - (UIItemProvider *)itemProviderAtIndex:(NSUInteger)index;
 
-@property (copy, nonatomic, nullable) NSArray<__kindof NSItemProvider *> *itemProviders;
+@property (copy, nonatomic, nullable) NSArray<UIItemProvider *> *itemProviders;
 @property (readonly, nonatomic) NSInteger numberOfItems;
 @property (readonly, nonatomic) NSInteger changeCount;

trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm

@@ -223 +223 @@
 }
 
-- (NSArray<__kindof NSItemProvider *> *)itemProviders
+- (NSArray<UIItemProvider *> *)itemProviders
 {
     return _itemProviders.get();
 }
 
-- (void)setItemProviders:(NSArray<__kindof NSItemProvider *> *)itemProviders
+- (void)setItemProviders:(NSArray<UIItemProvider *> *)itemProviders
 {
     itemProviders = itemProviders ?: [NSArray array];

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-05  Matt Lewis  <jlewis3@apple.com>
+
+        Unreviewed, rolling out r219070.
+
+        This revision caused consistent failures of the API test
+        UIPasteboardTests.DoNotPastePlainTextAsURL on iOS.
+
+        Reverted changeset:
+
+        "Pasting single words copied to UIPasteboard inserts URLs in
+        editable areas"
+        https://bugs.webkit.org/show_bug.cgi?id=174082
+        http://trac.webkit.org/changeset/219070
+
 2017-07-05  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm

@@ -628 +628 @@
 }
 
-- (void)_setDOMPasteAllowed:(BOOL)domPasteAllowed
-{
-    _preferences->setDOMPasteAllowed(domPasteAllowed);
-}
-
-- (BOOL)_domPasteAllowed
-{
-    return _preferences->domPasteAllowed();
-}
-
 - (void)_setMediaDocumentEntersFullscreenAutomatically:(BOOL)mediaDocumentEntersFullscreenAutomatically
 {

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h

@@ -108 +108 @@
 
 @property (nonatomic, setter=_setJavaScriptCanAccessClipboard:) BOOL _javaScriptCanAccessClipboard WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
-@property (nonatomic, setter=_setDOMPasteAllowed:) BOOL _domPasteAllowed WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 @property (nonatomic, setter=_setMediaDocumentEntersFullscreenAutomatically:) BOOL _mediaDocumentEntersFullscreenAutomatically WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));

trunk/Tools/ChangeLog

@@ +1 @@
+2017-07-05  Matt Lewis  <jlewis3@apple.com>
+
+        Unreviewed, rolling out r219070.
+
+        This revision caused consistent failures of the API test
+        UIPasteboardTests.DoNotPastePlainTextAsURL on iOS.
+
+        Reverted changeset:
+
+        "Pasting single words copied to UIPasteboard inserts URLs in
+        editable areas"
+        https://bugs.webkit.org/show_bug.cgi?id=174082
+        http://trac.webkit.org/changeset/219070
+
 2017-07-04  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm

@@ -32 +32 @@
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <UIKit/UIPasteboard.h>
-#import <WebCore/SoftLinking.h>
 #import <WebKit/WKPreferencesPrivate.h>
 #import <WebKit/WKWebViewPrivate.h>
-
-SOFT_LINK_FRAMEWORK(UIKit)
-SOFT_LINK(UIKit, UIApplicationInitialize, void, (void), ())
 
 namespace TestWebKitAPI {
@@ -48 +44 @@
 RetainPtr<TestWKWebView> setUpWebViewForPasteboardTests()
 {
-    // UIPasteboard's type coercion codepaths only take effect when the UIApplication has been initialized.
-    UIApplicationInitialize();
-
     [UIPasteboard generalPasteboard].items = @[];
     EXPECT_TRUE(!dataForPasteboardType(kUTTypeUTF8PlainText).length);
@@ -56 +49 @@
 
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
-    WKPreferences *preferences = [webView configuration].preferences;
-    preferences._javaScriptCanAccessClipboard = YES;
-    preferences._domPasteAllowed = YES;
+    [webView configuration].preferences._javaScriptCanAccessClipboard = YES;
     [webView synchronouslyLoadTestPageNamed:@"rich-and-plain-text"];
     return webView;
@@ -87 +78 @@
 }
 
-TEST(UIPasteboardTests, DoNotPastePlainTextAsURL)
-{
-    auto webView = setUpWebViewForPasteboardTests();
-
-    NSString *testString = @"[helloworld]";
-    [UIPasteboard generalPasteboard].string = testString;
-
-    [webView stringByEvaluatingJavaScript:@"selectPlainText()"];
-    [webView stringByEvaluatingJavaScript:@"document.execCommand('paste')"];
-    EXPECT_WK_STREQ(testString, [webView stringByEvaluatingJavaScript:@"plain.value"]);
-
-    [webView stringByEvaluatingJavaScript:@"selectRichText()"];
-    [webView stringByEvaluatingJavaScript:@"document.execCommand('paste')"];
-    EXPECT_WK_STREQ(testString, [webView stringByEvaluatingJavaScript:@"rich.textContent"]);
-    EXPECT_FALSE([webView stringByEvaluatingJavaScript:@"!!rich.querySelector('a')"].boolValue);
-}
-
-TEST(UIPasteboardTests, PastePlainTextAsURL)
-{
-    auto webView = setUpWebViewForPasteboardTests();
-
-    NSString *testString = @"https://www.apple.com/iphone";
-    [UIPasteboard generalPasteboard].string = testString;
-
-    [webView stringByEvaluatingJavaScript:@"selectPlainText()"];
-    [webView stringByEvaluatingJavaScript:@"document.execCommand('paste')"];
-    EXPECT_WK_STREQ(testString, [webView stringByEvaluatingJavaScript:@"plain.value"]);
-
-    [webView stringByEvaluatingJavaScript:@"selectRichText()"];
-    [webView stringByEvaluatingJavaScript:@"document.execCommand('paste')"];
-    EXPECT_WK_STREQ(testString, [webView stringByEvaluatingJavaScript:@"rich.textContent"]);
-    EXPECT_TRUE([webView stringByEvaluatingJavaScript:@"!!rich.querySelector('a')"].boolValue);
-}
-
-TEST(UIPasteboardTests, PasteURLWithPlainTextAsURL)
-{
-    auto webView = setUpWebViewForPasteboardTests();
-
-    NSString *testString = @"thisisdefinitelyaurl";
-    [UIPasteboard generalPasteboard].URL = [NSURL URLWithString:testString];
-
-    [webView stringByEvaluatingJavaScript:@"selectPlainText()"];
-    [webView stringByEvaluatingJavaScript:@"document.execCommand('paste')"];
-    EXPECT_WK_STREQ(testString, [webView stringByEvaluatingJavaScript:@"plain.value"]);
-
-    [webView stringByEvaluatingJavaScript:@"selectRichText()"];
-    [webView stringByEvaluatingJavaScript:@"document.execCommand('paste')"];
-    EXPECT_WK_STREQ(testString, [webView stringByEvaluatingJavaScript:@"rich.textContent"]);
-    EXPECT_TRUE([webView stringByEvaluatingJavaScript:@"!!rich.querySelector('a')"].boolValue);
-}
-
 } // namespace TestWebKitAPI