Diff
Modified: trunk/Source/WebCore/ChangeLog (176277 => 176278)
--- trunk/Source/WebCore/ChangeLog 2014-11-18 20:12:53 UTC (rev 176277)
+++ trunk/Source/WebCore/ChangeLog 2014-11-18 20:56:31 UTC (rev 176278)
@@ -1,3 +1,21 @@
+2014-11-18 Daniel Bates <[email protected]>
+
+ [iOS] Make WebCore build and link with public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=136487
+
+ Reviewed by David Kilzer.
+
+ * bindings/objc/DOMInternal.mm: Include header NSMapTableSPI.h.
+ * bindings/objc/WebScriptObject.mm: Ditto; Also fix style nit, substitute
+ #import for #include when importing header WTFString.h.
+ * bridge/objc/objc_instance.mm: Include header NSMapTableSPI.h and remove
+ #import NSMapTable.h as the former will import the latter.
+ * platform/ios/PlatformEventFactoryIOS.mm: Include header wtf/CurrentTime.h
+ for the declaration of WTF::currentTime().
+ * platform/ios/wak/WebCoreThread.mm: Remove unnecessary include of header CoreFoundation/CFPriv.h.
+ * platform/spi/ios/AVKitSPI.h: Add more SPI.
+ * platform/spi/ios/MPAVRoutingControllerSPI.h: Ditto.
+
2014-11-18 Myles C. Maxfield <[email protected]>
Subclass CachedFont for SVG fonts
Modified: trunk/Source/WebCore/bindings/objc/DOMInternal.mm (176277 => 176278)
--- trunk/Source/WebCore/bindings/objc/DOMInternal.mm 2014-11-18 20:12:53 UTC (rev 176277)
+++ trunk/Source/WebCore/bindings/objc/DOMInternal.mm 2014-11-18 20:56:31 UTC (rev 176278)
@@ -34,6 +34,7 @@
#import "WebScriptObjectPrivate.h"
#import "runtime_root.h"
#import <wtf/NeverDestroyed.h>
+#import <wtf/spi/cocoa/NSMapTableSPI.h>
#if PLATFORM(IOS)
#define NEEDS_WRAPPER_CACHE_LOCK 1
Modified: trunk/Source/WebCore/bindings/objc/WebScriptObject.mm (176277 => 176278)
--- trunk/Source/WebCore/bindings/objc/WebScriptObject.mm 2014-11-18 20:12:53 UTC (rev 176277)
+++ trunk/Source/WebCore/bindings/objc/WebScriptObject.mm 2014-11-18 20:56:31 UTC (rev 176278)
@@ -50,7 +50,8 @@
#import <runtime/Completion.h>
#import <wtf/TCSpinLock.h>
#import <wtf/Threading.h>
-#include <wtf/text/WTFString.h>
+#import <wtf/spi/cocoa/NSMapTableSPI.h>
+#import <wtf/text/WTFString.h>
using namespace JSC::Bindings;
using namespace WebCore;
Modified: trunk/Source/WebCore/bridge/objc/objc_instance.mm (176277 => 176278)
--- trunk/Source/WebCore/bridge/objc/objc_instance.mm 2014-11-18 20:12:53 UTC (rev 176277)
+++ trunk/Source/WebCore/bridge/objc/objc_instance.mm 2014-11-18 20:56:31 UTC (rev 176278)
@@ -37,11 +37,8 @@
#import <runtime/JSLock.h>
#import <runtime/ObjectPrototype.h>
#import <wtf/Assertions.h>
+#import <wtf/spi/cocoa/NSMapTableSPI.h>
-#if PLATFORM(IOS)
-#import <Foundation/NSMapTable.h>
-#endif
-
#ifdef NDEBUG
#define OBJC_LOG(formatAndArgs...) ((void)0)
#else
Modified: trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm (176277 => 176278)
--- trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm 2014-11-18 20:12:53 UTC (rev 176277)
+++ trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm 2014-11-18 20:56:31 UTC (rev 176278)
@@ -31,6 +31,7 @@
#import "Logging.h"
#import "WAKAppKitStubs.h"
#import "WebEvent.h"
+#import <wtf/CurrentTime.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm (176277 => 176278)
--- trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm 2014-11-18 20:12:53 UTC (rev 176277)
+++ trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm 2014-11-18 20:56:31 UTC (rev 176278)
@@ -45,7 +45,6 @@
#import <wtf/Threading.h>
#import <wtf/text/AtomicString.h>
-#import <CoreFoundation/CFPriv.h>
#import <Foundation/NSInvocation.h>
#import <libkern/OSAtomic.h>
#import <objc/runtime.h>
Modified: trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h (176277 => 176278)
--- trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h 2014-11-18 20:12:53 UTC (rev 176277)
+++ trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h 2014-11-18 20:56:31 UTC (rev 176278)
@@ -76,11 +76,17 @@
- (BOOL)playerViewController:(AVPlayerViewController *)playerViewController shouldExitFullScreenWithReason:(AVPlayerViewControllerExitFullScreenReason)reason;
@end
+typedef NSInteger AVPlayerViewControllerOptimizedFullscreenStopReason;
+
@interface AVPlayerViewController (Details)
- (instancetype)initWithVideoLayer:(CALayer <AVVideoLayer> *)videoLayer;
- (void)enterFullScreenWithCompletionHandler:(void (^)(BOOL success, NSError *))completionHandler;
- (void)exitFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError *))completionHandler;
- (void)exitFullScreenWithCompletionHandler:(void (^)(BOOL success, NSError *))completionHandler;
+
+- (void)startOptimizedFullscreenWithStartCompletionHandler:(void (^)(BOOL success, NSError*))startCompletionHandler stopCompletionHandler:(void (^)(AVPlayerViewControllerOptimizedFullscreenStopReason))stopCompletionHandler;
+- (void)stopOptimizedFullscreen;
+
@property (nonatomic, strong) AVPlayerController *playerController;
@property (nonatomic, weak) id <AVPlayerViewControllerDelegate> delegate;
@end
Modified: trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h (176277 => 176278)
--- trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h 2014-11-18 20:12:53 UTC (rev 176277)
+++ trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h 2014-11-18 20:56:31 UTC (rev 176278)
@@ -32,6 +32,7 @@
#else
enum {
+ MPRouteDiscoveryModeDisabled = 0,
MPRouteDiscoveryModePresence = 1,
MPRouteDiscoveryModeDetailed = 2,
};
