Title: [164931] trunk/Source
- Revision
- 164931
- Author
- [email protected]
- Date
- 2014-03-01 15:31:03 -0800 (Sat, 01 Mar 2014)
Log Message
[iOS] selectionImageForcingBlackText should return autoreleased object
https://bugs.webkit.org/show_bug.cgi?id=129437
<rdar://problem/15810384>
Reviewed by Darin Adler.
Source/WebCore:
* bindings/objc/DOM.mm:
(-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):
Source/WebKit/mac:
* WebView/WebHTMLView.mm:
(-[WebHTMLView selectionImageForcingBlackText:selectionImageForcingBlackText:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164930 => 164931)
--- trunk/Source/WebCore/ChangeLog 2014-03-01 23:30:51 UTC (rev 164930)
+++ trunk/Source/WebCore/ChangeLog 2014-03-01 23:31:03 UTC (rev 164931)
@@ -1,3 +1,14 @@
+2014-03-01 Pratik Solanki <[email protected]>
+
+ [iOS] selectionImageForcingBlackText should return autoreleased object
+ https://bugs.webkit.org/show_bug.cgi?id=129437
+ <rdar://problem/15810384>
+
+ Reviewed by Darin Adler.
+
+ * bindings/objc/DOM.mm:
+ (-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):
+
2014-03-01 Yoav Weiss <[email protected]>
Fix srcset related bugs
Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (164930 => 164931)
--- trunk/Source/WebCore/bindings/objc/DOM.mm 2014-03-01 23:30:51 UTC (rev 164930)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm 2014-03-01 23:31:03 UTC (rev 164931)
@@ -611,7 +611,8 @@
return nil;
#if PLATFORM(IOS)
- return createDragImageForRange(*frame, *range, forceBlackText).leakRef();
+ CGImageRef dragImage = createDragImageForRange(*frame, *range, forceBlackText).leakRef();
+ return dragImage ? (CGImageRef)CFAutorelease(dragImage) : nil;
#else
return [createDragImageForRange(*frame, *range, forceBlackText).leakRef() autorelease];
#endif
Modified: trunk/Source/WebKit/mac/ChangeLog (164930 => 164931)
--- trunk/Source/WebKit/mac/ChangeLog 2014-03-01 23:30:51 UTC (rev 164930)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-01 23:31:03 UTC (rev 164931)
@@ -1,3 +1,14 @@
+2014-03-01 Pratik Solanki <[email protected]>
+
+ [iOS] selectionImageForcingBlackText should return autoreleased object
+ https://bugs.webkit.org/show_bug.cgi?id=129437
+ <rdar://problem/15810384>
+
+ Reviewed by Darin Adler.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView selectionImageForcingBlackText:selectionImageForcingBlackText:]):
+
2014-02-28 Dan Bernstein <[email protected]>
[Mac] Remove MailQuirksUserScript.js
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (164930 => 164931)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-03-01 23:30:51 UTC (rev 164930)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-03-01 23:31:03 UTC (rev 164931)
@@ -6569,7 +6569,8 @@
return nil;
#if PLATFORM(IOS)
- return createDragImageForSelection(*coreFrame, forceBlackText).leakRef();
+ CGImageRef dragImage = createDragImageForSelection(*coreFrame, forceBlackText).leakRef();
+ return dragImage ? (CGImageRef)CFAutorelease(dragImage) : nil;
#else
return [createDragImageForSelection(*coreFrame, forceBlackText).leakRef() autorelease];
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
