[webkit-changes] [184300] branches/safari-601.1.32-branch/Source/WebCore

[bshafiei]

Title: [184300] branches/safari-601.1.32-branch/Source/WebCore

Revision

184300

Author

bshaf...@apple.com

Date

2015-05-13 13:08:35 -0700 (Wed, 13 May 2015)

Log Message

Merged r183958.

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/editing/mac/EditorMac.mm

Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184299 => 184300)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 19:59:35 UTC (rev 184299)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 20:08:35 UTC (rev 184300)
@@ -1,5 +1,17 @@
 2015-05-13  Babak Shafiei  <bshaf...@apple.com>
 
+        Merge r183958.
+
+    2015-05-07  Anders Carlsson  <ander...@apple.com>
+
+            Build fix.
+
+            * editing/mac/EditorMac.mm:
+            (WebCore::dataInRTFDFormat):
+            (WebCore::dataInRTFFormat):
+
+2015-05-13  Babak Shafiei  <bshaf...@apple.com>
+
         Merge r183980.
 
     2015-05-07  Chris Dumez  <cdu...@apple.com>

Modified: branches/safari-601.1.32-branch/Source/WebCore/editing/mac/EditorMac.mm (184299 => 184300)

--- branches/safari-601.1.32-branch/Source/WebCore/editing/mac/EditorMac.mm	2015-05-13 19:59:35 UTC (rev 184299)
+++ branches/safari-601.1.32-branch/Source/WebCore/editing/mac/EditorMac.mm	2015-05-13 20:08:35 UTC (rev 184300)
@@ -341,7 +341,7 @@
         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 @@
         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;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes