Changeset 207452 in webkit

Timestamp:

Oct 17, 2016 6:25:54 PM (8 years ago)

Author:

bshafiei@apple.com

Message:

Merged r207446. rdar://problem/28786160

Location:

tags/Safari-603.1.9.0.1/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebCoreTestSupport.xcconfig (modified) (1 diff)
• testing/Internals.mm (modified) (1 diff)

tags/Safari-603.1.9.0.1/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-17  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r207446.
+
+    2016-10-17  Dean Jackson  <dino@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_hanson@apple.com>
 

tags/Safari-603.1.9.0.1/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig

@@ -51 +51 @@
 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 = ;

tags/Safari-603.1.9.0.1/Source/WebCore/testing/Internals.mm

@@ -32 +32 @@
 #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