Title: [222609] trunk/Source/WebCore
Revision
222609
Author
wenson_hs...@apple.com
Date
2017-09-28 07:53:11 -0700 (Thu, 28 Sep 2017)

Log Message

Unreviewed, rolling out r222606.

The debug assertion hit in these API tests should be fixed by
r222608.

Reverted changeset:

"REGRESSION(r222595): Assertion failure in
_preLoadedDataConformingToType"
https://bugs.webkit.org/show_bug.cgi?id=177599
http://trac.webkit.org/changeset/222606

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (222608 => 222609)


--- trunk/Source/WebCore/ChangeLog	2017-09-28 14:47:59 UTC (rev 222608)
+++ trunk/Source/WebCore/ChangeLog	2017-09-28 14:53:11 UTC (rev 222609)
@@ -1,5 +1,19 @@
 2017-09-28  Wenson Hsieh  <wenson_hs...@apple.com>
 
+        Unreviewed, rolling out r222606.
+
+        The debug assertion hit in these API tests should be fixed by
+        r222608.
+
+        Reverted changeset:
+
+        "REGRESSION(r222595): Assertion failure in
+        _preLoadedDataConformingToType"
+        https://bugs.webkit.org/show_bug.cgi?id=177599
+        http://trac.webkit.org/changeset/222606
+
+2017-09-28  Wenson Hsieh  <wenson_hs...@apple.com>
+
         [iOS WK2] DataTransfer DataInteractionTests debug assert under -_preLoadedDataConformingToType:forItemProviderAtIndex:
         https://bugs.webkit.org/show_bug.cgi?id=177594
 

Modified: trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm (222608 => 222609)


--- trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	2017-09-28 14:47:59 UTC (rev 222608)
+++ trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	2017-09-28 14:53:11 UTC (rev 222609)
@@ -371,8 +371,10 @@
 
 - (NSData *)_preLoadedDataConformingToType:(NSString *)typeIdentifier forItemProviderAtIndex:(NSUInteger)index
 {
-    if (_loadResults.size() != [_itemProviders count])
+    if (_loadResults.size() != [_itemProviders count]) {
+        ASSERT_NOT_REACHED();
         return nil;
+    }
 
     WebItemProviderLoadResult *loadResult = _loadResults[index].get();
     for (NSString *loadedType in loadResult.loadedTypeIdentifiers) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to