Changeset 222119 in webkit

Timestamp:

Sep 15, 2017 4:59:35 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

iOS: Use blob URL instead of a WebKit fake URL when pasting an image
​https://bugs.webkit.org/show_bug.cgi?id=176986
<rdar://problem/34455052>

Reviewed by Wenson Hsieh.

Source/WebCore:

Fixed the bug that pasting an image on iOS resulted in an img element with src attribute
set to a WebKit fake URL so that the Web content could never save it.

Like r208451 on Mac, use a Blob URL instead.

This patch also removes createFragmentForImageResourceAndAddResource since it's no longer used.

Tests: LayoutTests/editing/pasteboard/paste-image-as-blob-url.html

• editing/cocoa/WebContentReaderCocoa.mm:

(WebCore::WebContentReader::readImage): Moved the code here from WebContentReaderMac.mm.

• editing/ios/WebContentReaderIOS.mm:

(WebCore::WebContentReader::readImage): Deleted. This is the code

• editing/mac/WebContentReaderMac.mm:

(WebCore::WebContentReader::readImage): Moved to WebContentReaderCocoa.mm. Note that
typeAsFilenameWithExtension was dead code after r208451

• editing/markup.cpp:

(WebCore::createFragmentForImageResourceAndAddResource): Deleted.

• editing/markup.h:

LayoutTests:

Removed the failing expectation on the test added by r208451 now that it passes on iOS.

• platform/ios/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm (modified) (2 diffs)
• Source/WebCore/editing/ios/WebContentReaderIOS.mm (modified) (2 diffs)
• Source/WebCore/editing/mac/WebContentReaderMac.mm (modified) (2 diffs)
• Source/WebCore/editing/markup.cpp (modified) (1 diff)
• Source/WebCore/editing/markup.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-09-15  Ryosuke Niwa  <rniwa@webkit.org>
+
+        iOS: Use blob URL instead of a WebKit fake URL when pasting an image
+        https://bugs.webkit.org/show_bug.cgi?id=176986
+        <rdar://problem/34455052>
+
+        Reviewed by Wenson Hsieh.
+
+        Removed the failing expectation on the test added by r208451 now that it passes on iOS.
+
+        * platform/ios/TestExpectations:
+
 2017-09-15  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -2259 +2259 @@
 editing/pasteboard/paste-blockquote-3.html [ Failure ]
 editing/pasteboard/paste-global-selection.html [ Failure ]
-editing/pasteboard/paste-image-as-blob-url.html [ Failure ]
 editing/pasteboard/paste-list-004.html [ Failure ]
 editing/pasteboard/paste-placeholder-input.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-09-15  Ryosuke Niwa  <rniwa@webkit.org>
+
+        iOS: Use blob URL instead of a WebKit fake URL when pasting an image
+        https://bugs.webkit.org/show_bug.cgi?id=176986
+        <rdar://problem/34455052>
+
+        Reviewed by Wenson Hsieh.
+
+        Fixed the bug that pasting an image on iOS resulted in an img element with src attribute
+        set to a WebKit fake URL so that the Web content could never save it.
+
+        Like r208451 on Mac, use a Blob URL instead.
+
+        This patch also removes createFragmentForImageResourceAndAddResource since it's no longer used.
+
+        Tests: LayoutTests/editing/pasteboard/paste-image-as-blob-url.html
+
+        * editing/cocoa/WebContentReaderCocoa.mm:
+        (WebCore::WebContentReader::readImage): Moved the code here from WebContentReaderMac.mm.
+        * editing/ios/WebContentReaderIOS.mm:
+        (WebCore::WebContentReader::readImage): Deleted. This is the code 
+        * editing/mac/WebContentReaderMac.mm:
+        (WebCore::WebContentReader::readImage): Moved to WebContentReaderCocoa.mm. Note that
+        typeAsFilenameWithExtension was dead code after r208451
+        * editing/markup.cpp:
+        (WebCore::createFragmentForImageResourceAndAddResource): Deleted.
+        * editing/markup.h:
+
 2017-09-15  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -28 +28 @@
 
 #include "ArchiveResource.h"
+#include "Blob.h"
 #include "CachedResourceLoader.h"
+#include "DOMURL.h"
 #include "Document.h"
 #include "DocumentFragment.h"
@@ -167 +169 @@
 }
 
+bool WebContentReader::readImage(Ref<SharedBuffer>&& buffer, const String& type)
+{
+    Vector<uint8_t> data;
+    data.append(buffer->data(), buffer->size());
+    auto blob = Blob::create(WTFMove(data), type);
+    ASSERT(frame.document());
+    auto& document = *frame.document();
+    String blobURL = DOMURL::createObjectURL(document, blob);
+    addFragment(createFragmentForImageAndURL(document, blobURL));
+    return true;
 }
+
+}

trunk/Source/WebCore/editing/ios/WebContentReaderIOS.mm

@@ -28 +28 @@
 
 #import "ArchiveResource.h"
-#import "DOMURL.h"
 #import "Document.h"
 #import "DocumentFragment.h"
@@ -63 +62 @@
 }
 
-bool WebContentReader::readImage(Ref<SharedBuffer>&& buffer, const String& type)
-{
-    RetainPtr<CFStringRef> stringType = type.createCFString();
-    RetainPtr<NSString> filenameExtension = adoptNS((NSString *)UTTypeCopyPreferredTagWithClass(stringType.get(), kUTTagClassFilenameExtension));
-    NSString *relativeURLPart = [@"image" stringByAppendingString:filenameExtension.get()];
-    String mimeType = MIMETypeFromUTI(type);
-
-    // FIXME: Use a blob URL instead.
-    auto archive = ArchiveResource::create(WTFMove(buffer), URL::fakeURLWithRelativePart(relativeURLPart), mimeType, emptyString(), emptyString());
-    ASSERT(archive);
-    auto fragment = createFragmentForImageResourceAndAddResource(frame, *archive);
-    if (!fragment)
-        return false;
-    addFragment(fragment.releaseNonNull());
-    return true;
-}
-
 bool WebContentReader::readURL(const URL& url, const String& title)
 {

trunk/Source/WebCore/editing/mac/WebContentReaderMac.mm

@@ -28 +28 @@
 
 #import "ArchiveResource.h"
-#import "DOMURL.h"
 #import "Document.h"
 #import "DocumentFragment.h"
@@ -101 +100 @@
 }
 
-bool WebContentReader::readImage(Ref<SharedBuffer>&& buffer, const String& type)
-{
-    ASSERT(type.contains('/'));
-    String typeAsFilenameWithExtension = type;
-    typeAsFilenameWithExtension.replace('/', '.');
-
-    Vector<uint8_t> data;
-    data.append(buffer->data(), buffer->size());
-    auto blob = Blob::create(WTFMove(data), type);
-    ASSERT(frame.document());
-    Document& document = *frame.document();
-    String blobURL = DOMURL::createObjectURL(document, blob);
-
-    fragment = createFragmentForImageAndURL(document, blobURL);
-    return fragment;
-}
-
 bool WebContentReader::readURL(const URL& url, const String& title)
 {

trunk/Source/WebCore/editing/markup.cpp

@@ -934 +934 @@
 }
 
-RefPtr<DocumentFragment> createFragmentForImageResourceAndAddResource(Frame& frame, Ref<ArchiveResource>&& resource)
-{
-    if (!frame.document())
-        return nullptr;
-
-    Ref<Document> document = *frame.document();
-    String resourceURL = resource->url().string();
-
-    if (DocumentLoader* loader = frame.loader().documentLoader())
-        loader->addArchiveResource(WTFMove(resource));
-
-    auto imageElement = HTMLImageElement::create(document.get());
-    imageElement->setAttributeWithoutSynchronization(HTMLNames::srcAttr, resourceURL);
-
-    auto fragment = document->createDocumentFragment();
-    fragment->appendChild(imageElement);
-
-    return WTFMove(fragment);
-}
-
 static Vector<Ref<HTMLElement>> collectElementsToRemoveFromFragment(ContainerNode& container)
 {

trunk/Source/WebCore/editing/markup.h

@@ -54 +54 @@
 RefPtr<DocumentFragment> createFragmentForTransformToFragment(Document&, const String& sourceString, const String& sourceMIMEType);
 Ref<DocumentFragment> createFragmentForImageAndURL(Document&, const String&);
-RefPtr<DocumentFragment> createFragmentForImageResourceAndAddResource(Frame&, Ref<ArchiveResource>&&);
 ExceptionOr<Ref<DocumentFragment>> createContextualFragment(Element&, const String& markup, ParserContentPolicy);