Title: [175132] trunk/Source/WebKit/mac
- Revision
- 175132
- Author
- [email protected]
- Date
- 2014-10-23 12:03:38 -0700 (Thu, 23 Oct 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (175131 => 175132)
--- trunk/Source/WebKit/mac/ChangeLog 2014-10-23 18:28:56 UTC (rev 175131)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-10-23 19:03:38 UTC (rev 175132)
@@ -1,3 +1,14 @@
+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-22 Chris Dumez <[email protected]>
[Mac][WK2] Fix applicationIsSafari() detection
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm (175131 => 175132)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm 2014-10-23 18:28:56 UTC (rev 175131)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm 2014-10-23 19:03:38 UTC (rev 175132)
@@ -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
