Changeset 207712 in webkit

Timestamp:

Oct 22, 2016, 9:26:36 AM (9 years ago)

Author:

Darin Adler

Message:

[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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/cocoa/EditorCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-22  Darin Adler  <darin@apple.com>
+
+        [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-22  Nael Ouedraogo  <nael.ouedraogo@crf.canon.fr>
 

trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm

@@ -41 +41 @@
 #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))