Title: [161729] trunk/Source/WebCore
- Revision
- 161729
- Author
- simon.fra...@apple.com
- Date
- 2014-01-10 20:41:33 -0800 (Fri, 10 Jan 2014)
Log Message
Fix iOS build.
* bindings/objc/DOM.mm:
(-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):
* bindings/objc/DOMExtensions.h:
* platform/DragImage.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161728 => 161729)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 04:41:31 UTC (rev 161728)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 04:41:33 UTC (rev 161729)
@@ -1,6 +1,15 @@
2014-01-10 Simon Fraser <simon.fra...@apple.com>
Fix iOS build.
+
+ * bindings/objc/DOM.mm:
+ (-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):
+ * bindings/objc/DOMExtensions.h:
+ * platform/DragImage.h:
+
+2014-01-10 Simon Fraser <simon.fra...@apple.com>
+
+ Fix iOS build.
Generated DOMTouch* and DOMGesture* files need to be in the project.
Exclude them on Mac via EXCLUDED_SOURCE_FILE_NAMES_macosx.
Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (161728 => 161729)
--- trunk/Source/WebCore/bindings/objc/DOM.mm 2014-01-11 04:41:31 UTC (rev 161728)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm 2014-01-11 04:41:33 UTC (rev 161729)
@@ -610,7 +610,11 @@
if (!frame)
return nil;
+#if PLATFORM(IOS)
+ return createDragImageForRange(*frame, *range, forceBlackText).leakRef();
+#else
return [createDragImageForRange(*frame, *range, forceBlackText).leakRef() autorelease];
+#endif
}
- (NSArray *)textRects
Modified: trunk/Source/WebCore/bindings/objc/DOMExtensions.h (161728 => 161729)
--- trunk/Source/WebCore/bindings/objc/DOMExtensions.h 2014-01-11 04:41:31 UTC (rev 161728)
+++ trunk/Source/WebCore/bindings/objc/DOMExtensions.h 2014-01-11 04:41:33 UTC (rev 161729)
@@ -48,7 +48,9 @@
#endif
@class NSArray;
+#if !TARGET_OS_IPHONE
@class NSImage;
+#endif
@class NSURL;
@@ -110,7 +112,7 @@
@end
@interface DOMElement (DOMElementAppKitExtensions)
-#if TARGET_OS_MAC
+#if !TARGET_OS_IPHONE
- (NSImage *)image WEBKIT_AVAILABLE_MAC(10_5);
#endif
@end
Modified: trunk/Source/WebCore/platform/DragImage.h (161728 => 161729)
--- trunk/Source/WebCore/platform/DragImage.h 2014-01-11 04:41:31 UTC (rev 161728)
+++ trunk/Source/WebCore/platform/DragImage.h 2014-01-11 04:41:33 UTC (rev 161729)
@@ -33,8 +33,11 @@
#include "IntSize.h"
#include <wtf/Forward.h>
-#if PLATFORM(MAC)
+#if PLATFORM(IOS)
#include <wtf/RetainPtr.h>
+typedef struct CGImage *CGImageRef;
+#elif PLATFORM(MAC)
+#include <wtf/RetainPtr.h>
OBJC_CLASS NSImage;
#elif PLATFORM(WIN)
typedef struct HBITMAP__* HBITMAP;
@@ -54,7 +57,9 @@
class Range;
class URL;
-#if PLATFORM(MAC)
+#if PLATFORM(IOS)
+typedef RetainPtr<CGImageRef> DragImageRef;
+#elif PLATFORM(MAC)
typedef RetainPtr<NSImage> DragImageRef;
#elif PLATFORM(WIN)
typedef HBITMAP DragImageRef;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
