Unreviewed, rolling out r214932.
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Apr 2017 20:16:47 +0000 (20:16 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Apr 2017 20:16:47 +0000 (20:16 +0000)
This change broke an internal build.

Reverted changeset:

"[ios-simulator] API test WebKit2.DataDetectionReferenceDate
timing out"
https://bugs.webkit.org/show_bug.cgi?id=161967
http://trac.webkit.org/changeset/214932

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@214964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm

index f3f2b94..b199074 100644 (file)
@@ -1,5 +1,18 @@
 2017-04-05  Ryan Haddad  <ryanhaddad@apple.com>
 
+        Unreviewed, rolling out r214932.
+
+        This change broke an internal build.
+
+        Reverted changeset:
+
+        "[ios-simulator] API test WebKit2.DataDetectionReferenceDate
+        timing out"
+        https://bugs.webkit.org/show_bug.cgi?id=161967
+        http://trac.webkit.org/changeset/214932
+
+2017-04-05  Ryan Haddad  <ryanhaddad@apple.com>
+
         Unreviewed, rolling out r214962.
 
         Roll r214937 back in because it wasn't at fault for the build
index 5335ef2..a0c3697 100644 (file)
@@ -106,8 +106,8 @@ extern NSString * const DDURLScheme;
 #define DDResultPropertyPassiveDisplay   (1 << 0)
 
 typedef struct __DDQueryOffset {
-    CFIndex queryIndex:32;
-    CFIndex offset:32;
+    CFIndex queryIndex;
+    CFIndex offset;
 } DDQueryOffset;
 
 typedef struct __DDQueryRange {
@@ -117,8 +117,6 @@ typedef struct __DDQueryRange {
 
 #endif // !USE(APPLE_INTERNAL_SDK)
 
-static_assert(sizeof(DDQueryOffset) == 8, "DDQueryOffset is no longer 8 bytes. Update the definition of DDQueryOffset in this file to match the new size.");
-
 typedef struct __DDScanQuery *DDScanQueryRef;
 typedef struct __DDScanner *DDScannerRef;
 
index 7bec154..b5728f8 100644 (file)
@@ -1,5 +1,18 @@
 2017-04-05  Ryan Haddad  <ryanhaddad@apple.com>
 
+        Unreviewed, rolling out r214932.
+
+        This change broke an internal build.
+
+        Reverted changeset:
+
+        "[ios-simulator] API test WebKit2.DataDetectionReferenceDate
+        timing out"
+        https://bugs.webkit.org/show_bug.cgi?id=161967
+        http://trac.webkit.org/changeset/214932
+
+2017-04-05  Ryan Haddad  <ryanhaddad@apple.com>
+
         Unreviewed, rolling out r214962.
 
         Roll r214937 back in because it wasn't at fault for the build
index 6d2f9d7..d1d13f9 100644 (file)
@@ -69,7 +69,7 @@ void expectLinkCount(WKWebView *webView, NSString *HTMLString, unsigned linkCoun
     ranScript = false;
 }
 
-TEST(WebKit2, DataDetectionReferenceDate)
+TEST(WebKit2, DISABLED_DataDetectionReferenceDate)
 {
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     [configuration setDataDetectorTypes:WKDataDetectorTypeCalendarEvent];