Title: [171923] trunk/Source/WebCore
- Revision
- 171923
- Author
- timothy_hor...@apple.com
- Date
- 2014-08-01 11:16:19 -0700 (Fri, 01 Aug 2014)
Log Message
Build fix for iOS
* bindings/objc/DOM.mm:
(-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):
We use CGImageRef instead of NSImage here on iOS.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171922 => 171923)
--- trunk/Source/WebCore/ChangeLog 2014-08-01 17:46:27 UTC (rev 171922)
+++ trunk/Source/WebCore/ChangeLog 2014-08-01 18:16:19 UTC (rev 171923)
@@ -1,3 +1,11 @@
+2014-08-01 Tim Horton <timothy_hor...@apple.com>
+
+ Build fix for iOS
+
+ * bindings/objc/DOM.mm:
+ (-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):
+ We use CGImageRef instead of NSImage here on iOS.
+
2014-08-01 Renato Nagy <nagy.ren...@stud.u-szeged.hu>
ASSERTION FAILED: listNode in WebCore::RenderListItem::updateListMarkerNumbers
Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (171922 => 171923)
--- trunk/Source/WebCore/bindings/objc/DOM.mm 2014-08-01 17:46:27 UTC (rev 171922)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm 2014-08-01 18:16:19 UTC (rev 171923)
@@ -610,6 +610,8 @@
if (!frame)
return nil;
+ // iOS uses CGImageRef for drag images, which doesn't support separate logical/physical sizes.
+#if PLATFORM(MAC)
RetainPtr<NSImage> renderedImage = createDragImageForRange(*frame, *range, forceBlackText);
IntSize size([renderedImage size]);
@@ -617,6 +619,9 @@
[renderedImage setSize:size];
return renderedImage.autorelease();
+#else
+ return createDragImageForRange(*frame, *range, forceBlackText).autorelease();
+#endif
}
- (NSArray *)textRects
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
