From 1fcb9bdd4005f1fd4f80fc8d344c06eb2811caf0 Mon Sep 17 00:00:00 2001 From: "andersca@apple.com" Date: Thu, 7 May 2015 23:08:53 +0000 Subject: [PATCH] Build fix. * editing/mac/EditorMac.mm: (WebCore::dataInRTFDFormat): (WebCore::dataInRTFFormat): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183958 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 8 ++++++++ Source/WebCore/editing/mac/EditorMac.mm | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index caaac65eb8fe..def455de4bb9 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,11 @@ +2015-05-07 Anders Carlsson + + Build fix. + + * editing/mac/EditorMac.mm: + (WebCore::dataInRTFDFormat): + (WebCore::dataInRTFFormat): + 2015-05-07 Said Abou-Hallawa Applying a filter on an SVG element, which is larger than 4096 pixels, causes this element to be rendered shifted to the left diff --git a/Source/WebCore/editing/mac/EditorMac.mm b/Source/WebCore/editing/mac/EditorMac.mm index 5f32a35c5c86..725af4c7aa1b 100644 --- a/Source/WebCore/editing/mac/EditorMac.mm +++ b/Source/WebCore/editing/mac/EditorMac.mm @@ -341,7 +341,7 @@ static PassRefPtr dataInRTFDFormat(NSAttributedString *string) return nullptr; BEGIN_BLOCK_OBJC_EXCEPTIONS; - return SharedBuffer::wrapNSData([string RTFDFromRange:NSMakeRange(0, length) documentAttributes:nil]); + return SharedBuffer::wrapNSData([string RTFDFromRange:NSMakeRange(0, length) documentAttributes:@{ }]); END_BLOCK_OBJC_EXCEPTIONS; return nullptr; @@ -354,7 +354,7 @@ static PassRefPtr dataInRTFFormat(NSAttributedString *string) return nullptr; BEGIN_BLOCK_OBJC_EXCEPTIONS; - return SharedBuffer::wrapNSData([string RTFFromRange:NSMakeRange(0, length) documentAttributes:nil]); + return SharedBuffer::wrapNSData([string RTFFromRange:NSMakeRange(0, length) documentAttributes:@{ }]); END_BLOCK_OBJC_EXCEPTIONS; return nullptr; -- 2.36.0