Title: [201028] branches/safari-602.1.32-branch/Source/WebKit2
- Revision
- 201028
- Author
- [email protected]
- Date
- 2016-05-17 11:49:04 -0700 (Tue, 17 May 2016)
Log Message
Merge r200877. rdar://problem/26269611
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201027 => 201028)
--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 18:49:01 UTC (rev 201027)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 18:49:04 UTC (rev 201028)
@@ -1,5 +1,17 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200877. rdar://problem/26269611
+
+ 2016-05-13 Ryan Haddad <[email protected]>
+
+ Attempt to fix the iOS build after r200874
+
+ Unreviewed build fix.
+
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200874. rdar://problem/26269611
2016-05-13 Sam Weinig <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (201027 => 201028)
--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2016-05-17 18:49:01 UTC (rev 201027)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2016-05-17 18:49:04 UTC (rev 201028)
@@ -70,7 +70,7 @@
WKDataDetectorTypeTrackingNumber = 1 << 4,
WKDataDetectorTypeFlightNumber = 1 << 5,
WKDataDetectorTypeLookupSuggestion = 1 << 6,
- WKDataDetectorTypeAll = NSUIntegerMax
+ WKDataDetectorTypeAll = NSUIntegerMax,
WKDataDetectorTypeSpotlightSuggestion WK_ENUM_DEPRECATED(NA, NA, WK_IOS_TBA, WK_IOS_TBA, "Please use WKDataDetectorTypeLookupSuggestion") = WKDataDetectorTypeLookupSuggestion,
} WK_ENUM_AVAILABLE(NA, WK_IOS_TBA);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
