Title: [175305] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 175305
- Author
- [email protected]
- Date
- 2014-10-28 21:34:32 -0700 (Tue, 28 Oct 2014)
Log Message
Merge r175132. <rdar://problem/18753175>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175304 => 175305)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 04:32:27 UTC (rev 175304)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 04:34:32 UTC (rev 175305)
@@ -1,5 +1,20 @@
2014-10-28 Dana Burkart <[email protected]>
+ Merge r175132. <rdar://problem/18753175>
+
+ 2014-10-23 Tim Horton <[email protected]>
+
+ Crashes under WebSelectionServiceController::hasRelevantSelectionServices
+ https://bugs.webkit.org/show_bug.cgi?id=138013
+
+ Reviewed by Dan Bernstein.
+
+ * WebCoreSupport/WebSelectionServiceController.mm:
+ (WebSelectionServiceController::hasRelevantSelectionServices):
+ Don't adopt this autoreleased object.
+
+2014-10-28 Dana Burkart <[email protected]>
+
Merge r174841. <rdar://problem/18753175>
2014-10-17 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm (175304 => 175305)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm 2014-10-29 04:32:27 UTC (rev 175304)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm 2014-10-29 04:34:32 UTC (rev 175305)
@@ -99,7 +99,7 @@
RetainPtr<NSImage> image = adoptNS([[NSImage alloc] init]);
NSTextAttachmentCell *cell = [[NSTextAttachmentCell alloc] initImageCell:image.get()];
[attachment setAttachmentCell:cell];
- RetainPtr<NSMutableAttributedString> attributedStringWithRichContent = adoptNS((NSMutableAttributedString *)[NSMutableAttributedString attributedStringWithAttachment:attachment]);
+ RetainPtr<NSMutableAttributedString> attributedStringWithRichContent = (NSMutableAttributedString *)[NSMutableAttributedString attributedStringWithAttachment:attachment];
[attributedStringWithRichContent appendAttributedString:attributedString.get()];
bool hasRichContentServices = hasCompatibleServicesForItems(@[ attributedStringWithRichContent.get() ]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
