Assertion failures in ImageKit soft linking
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Oct 2014 17:46:40 +0000 (17:46 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Oct 2014 17:46:40 +0000 (17:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=138009

Reviewed by Anders Carlsson.

* UIProcess/API/mac/WKView.mm:
Soft-link ImageKit correctly.
ImageKit is inside the Quartz umbrella framework.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@175127 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/mac/WKView.mm

index 7902e37ddebe067d0f0fd79e972dee75aebcfbdf..f7a940ce3bc12912e9fc69dafd23c27187c25227 100644 (file)
@@ -1,3 +1,14 @@
+2014-10-23  Tim Horton  <timothy_horton@apple.com>
+
+        Assertion failures in ImageKit soft linking
+        https://bugs.webkit.org/show_bug.cgi?id=138009
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/mac/WKView.mm:
+        Soft-link ImageKit correctly.
+        ImageKit is inside the Quartz umbrella framework.
+
 2014-10-23  Daniel Bates  <dabates@apple.com>
 
         [iOS] Fix the build after <http://trac.webkit.org/changeset/175079>
index bb9b193e126686a8d8bd0da1944953646fd14ffe..e1e18c39593c9d3c95b5d5d9314a7d064afe85c7 100644 (file)
@@ -158,7 +158,7 @@ CGError CGSGetScreenRectForWindow(CGSConnectionID cid, CGSWindowID wid, CGRect *
 - (NSMenu *)menu;
 @end
 
-SOFT_LINK_FRAMEWORK(ImageKit)
+SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, ImageKit)
 SOFT_LINK_CLASS(ImageKit, IKSlideshow)
 
 using namespace WebKit;