Title: [207867] tags/Safari-603.1.10.0.2/Source/WebCore
- Revision
- 207867
- Author
- [email protected]
- Date
- 2016-10-25 22:11:55 -0700 (Tue, 25 Oct 2016)
Log Message
Merged r207712. rdar://problem/28187870
Modified Paths
Diff
Modified: tags/Safari-603.1.10.0.2/Source/WebCore/ChangeLog (207866 => 207867)
--- tags/Safari-603.1.10.0.2/Source/WebCore/ChangeLog 2016-10-26 05:10:17 UTC (rev 207866)
+++ tags/Safari-603.1.10.0.2/Source/WebCore/ChangeLog 2016-10-26 05:11:55 UTC (rev 207867)
@@ -1,3 +1,17 @@
+2016-10-25 Babak Shafiei <[email protected]>
+
+ Merge r207712.
+
+ 2016-10-22 Darin Adler <[email protected]>
+
+ [Cocoa] REGRESSION (r204508): Crash in init_WebCreateFragment when pasting (seen in multiple apps using legacy WebKit)
+ https://bugs.webkit.org/show_bug.cgi?id=163839
+
+ Reviewed by Dan Bernstein.
+
+ * editing/cocoa/EditorCocoa.mm: Use the appropriate SOFT_LINK macros to find
+ the WebKitLegacy platform in the correct location for iOS and macOS.
+
2016-10-21 Matthew Hanson <[email protected]>
Merge r207700. rdar://problem/28897179
Modified: tags/Safari-603.1.10.0.2/Source/WebCore/editing/cocoa/EditorCocoa.mm (207866 => 207867)
--- tags/Safari-603.1.10.0.2/Source/WebCore/editing/cocoa/EditorCocoa.mm 2016-10-26 05:10:17 UTC (rev 207866)
+++ tags/Safari-603.1.10.0.2/Source/WebCore/editing/cocoa/EditorCocoa.mm 2016-10-26 05:11:55 UTC (rev 207867)
@@ -40,8 +40,14 @@
#import "Text.h"
#import "htmlediting.h"
-SOFT_LINK_FRAMEWORK(WebKitLegacy)
+#if PLATFORM(IOS)
+SOFT_LINK_PRIVATE_FRAMEWORK(WebKitLegacy)
+#endif
+#if PLATFORM(MAC)
+SOFT_LINK_FRAMEWORK_IN_UMBRELLA(WebKit, WebKitLegacy)
+#endif
+
SOFT_LINK(WebKitLegacy, _WebCreateFragment, void, (WebCore::Document& document, NSAttributedString *string, WebCore::FragmentAndResources& result), (document, string, result))
namespace WebCore {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
