Title: [207452] tags/Safari-603.1.9.0.1/Source/WebCore
- Revision
- 207452
- Author
- bshaf...@apple.com
- Date
- 2016-10-17 18:25:54 -0700 (Mon, 17 Oct 2016)
Log Message
Merged r207446. rdar://problem/28786160
Modified Paths
Diff
Modified: tags/Safari-603.1.9.0.1/Source/WebCore/ChangeLog (207451 => 207452)
--- tags/Safari-603.1.9.0.1/Source/WebCore/ChangeLog 2016-10-18 01:22:07 UTC (rev 207451)
+++ tags/Safari-603.1.9.0.1/Source/WebCore/ChangeLog 2016-10-18 01:25:54 UTC (rev 207452)
@@ -1,3 +1,20 @@
+2016-10-17 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r207446.
+
+ 2016-10-17 Dean Jackson <d...@apple.com>
+
+ Remove dependency cycle with UIKit
+ https://bugs.webkit.org/show_bug.cgi?id=163577
+ <rdar://problem/28786160>
+
+ Reviewed by Tim Horton.
+
+ Soft link against UIKit.
+
+ * Configurations/WebCoreTestSupport.xcconfig:
+ * testing/Internals.mm:
+
2016-10-13 Matthew Hanson <matthew_han...@apple.com>
Merge r207305. rdar://problem/28756748
Modified: tags/Safari-603.1.9.0.1/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (207451 => 207452)
--- tags/Safari-603.1.9.0.1/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2016-10-18 01:22:07 UTC (rev 207451)
+++ tags/Safari-603.1.9.0.1/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2016-10-18 01:25:54 UTC (rev 207452)
@@ -50,6 +50,6 @@
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit;
-OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -framework UIKit -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
+OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -framework UIKit -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
SECT_ORDER_FLAGS = ;
Modified: tags/Safari-603.1.9.0.1/Source/WebCore/testing/Internals.mm (207451 => 207452)
--- tags/Safari-603.1.9.0.1/Source/WebCore/testing/Internals.mm 2016-10-18 01:22:07 UTC (rev 207451)
+++ tags/Safari-603.1.9.0.1/Source/WebCore/testing/Internals.mm 2016-10-18 01:25:54 UTC (rev 207452)
@@ -31,9 +31,11 @@
#include "Editor.h"
#include "EditorClient.h"
#include "Frame.h"
+#include "SoftLinking.h"
#if PLATFORM(IOS)
-#import <UIKit/UIKit.h>
+SOFT_LINK_FRAMEWORK(UIKit)
+SOFT_LINK(UIKit, UIAccessibilityIsReduceMotionEnabled, BOOL, (void), ())
#endif
namespace WebCore {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
