Title: [230716] trunk/Source/WebCore
- Revision
- 230716
- Author
- jlew...@apple.com
- Date
- 2018-04-17 10:02:00 -0700 (Tue, 17 Apr 2018)
Log Message
Unreviewed, rolling out r230713.
This caused internal build failures.
Reverted changeset:
"Implement checked cast for DDResultRef once
DDResultGetTypeID() is available"
https://bugs.webkit.org/show_bug.cgi?id=184554
https://trac.webkit.org/changeset/230713
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230715 => 230716)
--- trunk/Source/WebCore/ChangeLog 2018-04-17 16:59:34 UTC (rev 230715)
+++ trunk/Source/WebCore/ChangeLog 2018-04-17 17:02:00 UTC (rev 230716)
@@ -1,3 +1,16 @@
+2018-04-17 Matt Lewis <jlew...@apple.com>
+
+ Unreviewed, rolling out r230713.
+
+ This caused internal build failures.
+
+ Reverted changeset:
+
+ "Implement checked cast for DDResultRef once
+ DDResultGetTypeID() is available"
+ https://bugs.webkit.org/show_bug.cgi?id=184554
+ https://trac.webkit.org/changeset/230713
+
2018-04-17 Chris Dumez <cdu...@apple.com>
Add bindings code for RemoteDOMWindow
Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (230715 => 230716)
--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2018-04-17 16:59:34 UTC (rev 230715)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2018-04-17 17:02:00 UTC (rev 230716)
@@ -50,15 +50,10 @@
#import "VisibleUnits.h"
#import <pal/spi/ios/DataDetectorsUISPI.h>
#import <pal/spi/mac/DataDetectorsSPI.h>
-#import <wtf/cf/TypeCastsCF.h>
#import <wtf/text/StringBuilder.h>
#import "DataDetectorsCoreSoftLink.h"
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
-WTF_DECLARE_CF_TYPE_TRAIT(DDResult);
-#endif
-
namespace WebCore {
using namespace HTMLNames;
@@ -83,11 +78,8 @@
RefPtr<Range> mainResultRange;
CFIndex resultCount = CFArrayGetCount(results.get());
for (CFIndex i = 0; i < resultCount; i++) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
- DDResultRef result = checked_cf_cast<DDResultRef>(CFArrayGetValueAtIndex(results.get(), i));
-#else
+ // FIXME: <rdar://problem/36241894> Implement checked cast for DDResultRef once DDResultGetTypeID() is available
DDResultRef result = static_cast<DDResultRef>(const_cast<CF_BRIDGED_TYPE(id) void*>(CFArrayGetValueAtIndex(results.get(), i)));
-#endif
CFRange resultRangeInContext = DDResultGetRange(result);
if (hitLocation >= resultRangeInContext.location && (hitLocation - resultRangeInContext.location) < resultRangeInContext.length) {
mainResult = result;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
