Title: [187823] branches/safari-601.1-branch/Source/WebKit/mac
- Revision
- 187823
- Author
- [email protected]
- Date
- 2015-08-04 00:01:48 -0700 (Tue, 04 Aug 2015)
Log Message
Merge r187669. rdar://problem/16839069
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog (187822 => 187823)
--- branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-08-04 07:01:45 UTC (rev 187822)
+++ branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-08-04 07:01:48 UTC (rev 187823)
@@ -1 +1,16 @@
+2015-08-03 Matthew Hanson <[email protected]>
+
+ Merge r187669. rdar://problem/16839069
+
+ 2015-07-31 Brady Eidson <[email protected]>
+
+ REGRESSION (r174791): Returning a zombie NSImage from sharingService:transitionImageForShareItem:contentRect:
+ <rdar://problem/22060183> and https://bugs.webkit.org/show_bug.cgi?id=147497
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::imageForCurrentSharingServicePickerItem): Don't return what is basically a temporary NSImage.
+ Instead do a [[retain] autorelease] on it while still valid.
+
== Rolled over to ChangeLog-2015-07-23 ==
Modified: branches/safari-601.1-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (187822 => 187823)
--- branches/safari-601.1-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-08-04 07:01:45 UTC (rev 187822)
+++ branches/safari-601.1-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-08-04 07:01:48 UTC (rev 187823)
@@ -486,7 +486,7 @@
if (!image)
return nil;
- return image->getNSImage();
+ return [[image->getNSImage() retain] autorelease];
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
