Changeset 239107 in webkit

Timestamp:

Dec 12, 2018 9:06:49 AM (5 years ago)

Author:

Wenson Hsieh

Message:

[iOS] A few API tests are failing after r239086
​https://bugs.webkit.org/show_bug.cgi?id=192608

Reviewed by Zalan Bujtas.

These test failures were caused by a missing Vector size check in Pasteboard::readFilePaths before accessing
the first item. Fix this by adding a helper method on PasteboardItemInfo to grab the file path for the highest
fidelity pasteboard item (returning the null string if there are none), and use this in a few places that grab
the highest fidelity path using Vector::first().

While Pasteboard::readRespectingUTIFidelities does have a bounds check before accessing the list of paths,
this patch still replaces it with a call to pathForHighestFidelityItem(), so that the intent is more clear.

• platform/PasteboardItemInfo.h:

(WebCore::PasteboardItemInfo::pathForHighestFidelityItem const):

• platform/ios/PasteboardIOS.mm:

(WebCore::Pasteboard::readRespectingUTIFidelities):
(WebCore::Pasteboard::readFilePaths):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/PasteboardItemInfo.h (modified) (1 diff)
• platform/ios/PasteboardIOS.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-12  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] A few API tests are failing after r239086
+        https://bugs.webkit.org/show_bug.cgi?id=192608
+
+        Reviewed by Zalan Bujtas.
+
+        These test failures were caused by a missing Vector size check in `Pasteboard::readFilePaths` before accessing
+        the first item. Fix this by adding a helper method on PasteboardItemInfo to grab the file path for the highest
+        fidelity pasteboard item (returning the null string if there are none), and use this in a few places that grab
+        the highest fidelity path using Vector::first().
+
+        While `Pasteboard::readRespectingUTIFidelities` does have a bounds check before accessing the list of paths,
+        this patch still replaces it with a call to `pathForHighestFidelityItem()`, so that the intent is more clear.
+
+        * platform/PasteboardItemInfo.h:
+        (WebCore::PasteboardItemInfo::pathForHighestFidelityItem const):
+        * platform/ios/PasteboardIOS.mm:
+        (WebCore::Pasteboard::readRespectingUTIFidelities):
+        (WebCore::Pasteboard::readFilePaths):
+
 2018-12-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/PasteboardItemInfo.h

@@ -56 +56 @@
     }
 
+    String pathForHighestFidelityItem() const
+    {
+        if (pathsForFileUpload.isEmpty())
+            return { };
+
+        ASSERT(!pathsForFileUpload.first().isEmpty());
+        return pathsForFileUpload.first();
+    }
+
     template<class Encoder> void encode(Encoder&) const;
     template<class Decoder> static std::optional<PasteboardItemInfo> decode(Decoder&);

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

@@ -295 +295 @@
 #if ENABLE(ATTACHMENT_ELEMENT)
         auto info = strategy.informationForItemAtIndex(index, m_pasteboardName);
-        bool canReadAttachment = policy == WebContentReadingPolicy::AnyType && RuntimeEnabledFeatures::sharedFeatures().attachmentElementEnabled() && !info.pathsForFileUpload.isEmpty();
+        auto attachmentFilePath = info.pathForHighestFidelityItem();
+        bool canReadAttachment = policy == WebContentReadingPolicy::AnyType && RuntimeEnabledFeatures::sharedFeatures().attachmentElementEnabled() && !attachmentFilePath.isEmpty();
         if (canReadAttachment && info.preferredPresentationStyle == PasteboardItemPresentationStyle::Attachment) {
-            reader.readFilePaths({ info.pathsForFileUpload.first() });
+            reader.readFilePaths({ WTFMove(attachmentFilePath) });
             continue;
         }
@@ -318 +319 @@
 #if ENABLE(ATTACHMENT_ELEMENT)
         if (canReadAttachment && result == ReaderResult::DidNotReadType)
-            reader.readFilePaths({ info.pathsForFileUpload.first() });
+            reader.readFilePaths({ WTFMove(attachmentFilePath) });
 #endif
     }
@@ -460 +461 @@
     for (NSUInteger index = 0, numberOfItems = strategy.getPasteboardItemsCount(m_pasteboardName); index < numberOfItems; ++index) {
         // Currently, drag and drop is the only case on iOS where the "pasteboard" may contain file paths.
-        auto filePath = strategy.informationForItemAtIndex(index, m_pasteboardName).pathsForFileUpload.first();
+        auto filePath = strategy.informationForItemAtIndex(index, m_pasteboardName).pathForHighestFidelityItem();
         if (!filePath.isEmpty())
             filePaths.append(WTFMove(filePath));