Title: [161714] trunk/Source/WebCore
- Revision
- 161714
- Author
- [email protected]
- Date
- 2014-01-10 18:25:33 -0800 (Fri, 10 Jan 2014)
Log Message
Use TARGET_OS_IPHONE in this API file, and #if TARGET_OS_MAC
for a non-iOS function.
* bindings/objc/DOMExtensions.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161713 => 161714)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 02:19:33 UTC (rev 161713)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 02:25:33 UTC (rev 161714)
@@ -1,3 +1,10 @@
+2014-01-10 Simon Fraser <[email protected]>
+
+ Use TARGET_OS_IPHONE in this API file, and #if TARGET_OS_MAC
+ for a non-iOS function.
+
+ * bindings/objc/DOMExtensions.h:
+
2014-01-10 David Kilzer <[email protected]>
Clean up architectures in xcconfig files
Modified: trunk/Source/WebCore/bindings/objc/DOMExtensions.h (161713 => 161714)
--- trunk/Source/WebCore/bindings/objc/DOMExtensions.h 2014-01-11 02:19:33 UTC (rev 161713)
+++ trunk/Source/WebCore/bindings/objc/DOMExtensions.h 2014-01-11 02:25:33 UTC (rev 161714)
@@ -43,7 +43,7 @@
#import <WebCore/DOMRGBColor.h>
#import <WebCore/DOMRange.h>
-#if defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED
+#if TARGET_OS_IPHONE
#import <CoreGraphics/CoreGraphics.h>
#endif
@@ -52,7 +52,7 @@
@class NSURL;
-#if defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED
+#if TARGET_OS_IPHONE
@interface DOMHTMLElement (DOMHTMLElementExtensions)
- (int)scrollXOffset;
- (int)scrollYOffset;
@@ -62,7 +62,7 @@
@end
#endif
-#if defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED
+#if TARGET_OS_IPHONE
typedef struct _WKQuad {
CGPoint p1;
CGPoint p2;
@@ -82,14 +82,14 @@
#endif
@interface DOMNode (DOMNodeExtensions)
-#if defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED
+#if TARGET_OS_IPHONE
- (CGRect)boundingBox;
#else
- (NSRect)boundingBox WEBKIT_AVAILABLE_MAC(10_5);
#endif
- (NSArray *)lineBoxRects WEBKIT_AVAILABLE_MAC(10_5);
-#if defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED
+#if TARGET_OS_IPHONE
- (CGRect)boundingBoxUsingTransforms; // takes transforms into account
- (WKQuad)absoluteQuad;
@@ -110,7 +110,7 @@
@end
@interface DOMElement (DOMElementAppKitExtensions)
-#if !defined(TARGET_OS_EMBEDDED) || !TARGET_OS_EMBEDDED
+#if TARGET_OS_MAC
- (NSImage *)image WEBKIT_AVAILABLE_MAC(10_5);
#endif
@end
@@ -120,7 +120,7 @@
- (DOMDocumentFragment *)createDocumentFragmentWithText:(NSString *)text WEBKIT_AVAILABLE_MAC(10_5);
@end
-#if defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED
+#if TARGET_OS_IPHONE
@interface DOMHTMLAreaElement (DOMHTMLAreaElementExtensions)
- (CGRect)boundingFrameForOwner:(DOMNode *)anOwner;
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
