Title: [161671] trunk/Source/WebCore
- Revision
- 161671
- Author
- aes...@apple.com
- Date
- 2014-01-10 13:37:19 -0800 (Fri, 10 Jan 2014)
Log Message
Fix some iOS build errors during bindings generation.
* bindings/objc/PublicDOMInterfaces.h: Included
WebKitAdditions/PublicDOMInterfacesIOS.h and change
-[DOMRGBColor color] to return a CGColorRef on iOS.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161670 => 161671)
--- trunk/Source/WebCore/ChangeLog 2014-01-10 21:31:42 UTC (rev 161670)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 21:37:19 UTC (rev 161671)
@@ -1,3 +1,11 @@
+2014-01-10 Andy Estes <aes...@apple.com>
+
+ Fix some iOS build errors during bindings generation.
+
+ * bindings/objc/PublicDOMInterfaces.h: Included
+ WebKitAdditions/PublicDOMInterfacesIOS.h and change
+ -[DOMRGBColor color] to return a CGColorRef on iOS.
+
2014-01-10 Timothy Hatcher <timo...@apple.com>
Prevent some resources from showing up in Web Inspector as years in duration.
Modified: trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h (161670 => 161671)
--- trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h 2014-01-10 21:31:42 UTC (rev 161670)
+++ trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h 2014-01-10 21:37:19 UTC (rev 161671)
@@ -953,7 +953,11 @@
@property (readonly, strong) DOMCSSPrimitiveValue *green;
@property (readonly, strong) DOMCSSPrimitiveValue *blue;
@property (readonly, strong) DOMCSSPrimitiveValue *alpha;
+#if !PLATFORM(IOS)
@property (readonly, copy) NSColor *color WEBKIT_AVAILABLE_MAC(10_5);
+#else
+- (CGColorRef)color;
+#endif
@end
@interface DOMCSSRule : DOMObject 10_4
@@ -1245,3 +1249,7 @@
@protocol DOMXPathNSResolver <NSObject> 10_5
- (NSString *)lookupNamespaceURI:(NSString *)prefix;
@end
+
+#if PLATFORM(IOS)
+#include <WebKitAdditions/PublicDOMInterfacesIOS.h>
+#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
