Title: [175129] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175129
- Author
- [email protected]
- Date
- 2014-10-23 10:55:15 -0700 (Thu, 23 Oct 2014)
Log Message
Merge r175127. <rdar://problem/18717767>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175128 => 175129)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 17:52:58 UTC (rev 175128)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 17:55:15 UTC (rev 175129)
@@ -1,5 +1,20 @@
2014-10-23 Matthew Hanson <[email protected]>
+ Merge r175127. <rdar://problem/18717767>
+
+ 2014-10-23 Tim Horton <[email protected]>
+
+ 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 Matthew Hanson <[email protected]>
+
Correcting the merge for r175075. <rdar://problem/18717767>
Rubber-stamped by Tim Horton.
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (175128 => 175129)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-10-23 17:52:58 UTC (rev 175128)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-10-23 17:55:15 UTC (rev 175129)
@@ -158,7 +158,7 @@
- (NSMenu *)menu;
@end
-SOFT_LINK_FRAMEWORK(ImageKit)
+SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, ImageKit)
SOFT_LINK_CLASS(ImageKit, IKSlideshow)
using namespace WebKit;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
