Diff
Modified: trunk/Source/WebCore/ChangeLog (176447 => 176448)
--- trunk/Source/WebCore/ChangeLog 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 16:40:55 UTC (rev 176448)
@@ -1,3 +1,20 @@
+2014-11-21 Daniel Bates <[email protected]>
+
+ [iOS] WebKit2 fails to build with public SDK due to missing SPI from CFNetwork, QuartzCore, MediaPlayer, XPC
+ https://bugs.webkit.org/show_bug.cgi?id=138930
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.xcodeproj/project.pbxproj: Rename header MPAVRoutingControllerSPI.h to MediaPlayerSPI.h.
+ * loader/cocoa/SubresourceLoaderCocoa.mm: Move NSCachedURLResponse forward declarations to file
+ CFNetworkSPI.h and include header CFNetworkSPI.h.
+ * loader/mac/ResourceLoaderMac.mm: Ditto.
+ * platform/audio/ios/MediaSessionManagerIOS.mm: Substitute MediaPlayerSPI.h for MPAVRoutingControllerSPI.h.
+ * platform/spi/cf/CFNetworkSPI.h: Add more SPI.
+ * platform/spi/cg/CoreGraphicsSPI.h: Ditto.
+ * platform/spi/cocoa/QuartzCoreSPI.h: Ditto.
+ * platform/spi/ios/MediaPlayerSPI.h: Renamed from Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h.
+
2014-11-21 Chris Fleizach <[email protected]>
AX: MathML expressions are misread by VoiceOver
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (176447 => 176448)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-21 16:40:55 UTC (rev 176448)
@@ -5759,7 +5759,7 @@
CE12523B1A16711000864480 /* NSFileManagerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523A1A16711000864480 /* NSFileManagerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE12523F1A16AE1200864480 /* AVKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523E1A16AE1200864480 /* AVKitSPI.h */; };
- CE1252411A16B1B600864480 /* MPAVRoutingControllerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252401A16B1B600864480 /* MPAVRoutingControllerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252401A16B1B600864480 /* MediaPlayerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE1252431A16C01A00864480 /* CoreUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252421A16C01A00864480 /* CoreUISPI.h */; };
CE1252451A16C22500864480 /* DynamicLinkerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252441A16C22500864480 /* DynamicLinkerSPI.h */; };
CE1252471A16C2C200864480 /* NSPointerFunctionsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252461A16C2C200864480 /* NSPointerFunctionsSPI.h */; };
@@ -13265,7 +13265,7 @@
CE12523A1A16711000864480 /* NSFileManagerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSFileManagerSPI.h; sourceTree = "<group>"; };
CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuartzCoreSPI.h; sourceTree = "<group>"; };
CE12523E1A16AE1200864480 /* AVKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AVKitSPI.h; path = ios/AVKitSPI.h; sourceTree = "<group>"; };
- CE1252401A16B1B600864480 /* MPAVRoutingControllerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MPAVRoutingControllerSPI.h; path = ios/MPAVRoutingControllerSPI.h; sourceTree = "<group>"; };
+ CE1252401A16B1B600864480 /* MediaPlayerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaPlayerSPI.h; path = ios/MediaPlayerSPI.h; sourceTree = "<group>"; };
CE1252421A16C01A00864480 /* CoreUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreUISPI.h; path = ios/CoreUISPI.h; sourceTree = "<group>"; };
CE1252441A16C22500864480 /* DynamicLinkerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerSPI.h; sourceTree = "<group>"; };
CE1252461A16C2C200864480 /* NSPointerFunctionsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSPointerFunctionsSPI.h; sourceTree = "<group>"; };
@@ -18519,8 +18519,8 @@
A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */,
CE12523E1A16AE1200864480 /* AVKitSPI.h */,
CE1252421A16C01A00864480 /* CoreUISPI.h */,
- CE1252401A16B1B600864480 /* MPAVRoutingControllerSPI.h */,
CE1252481A16C3BC00864480 /* MobileGestaltSPI.h */,
+ CE1252401A16B1B600864480 /* MediaPlayerSPI.h */,
CE1252381A166FA000864480 /* QuickLookSPI.h */,
);
name = ios;
@@ -25482,7 +25482,7 @@
935C476309AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h in Headers */,
85031B480A44EFC700F992E0 /* MouseRelatedEvent.h in Headers */,
93309DFC099E64920056E581 /* MoveSelectionCommand.h in Headers */,
- CE1252411A16B1B600864480 /* MPAVRoutingControllerSPI.h in Headers */,
+ CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */,
FDB1700614A2BAB200A2B5D9 /* MultiChannelResampler.h in Headers */,
C6F0900A14327B6100685849 /* MutationCallback.h in Headers */,
85031B4A0A44EFC700F992E0 /* MutationEvent.h in Headers */,
Modified: trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm (176447 => 176448)
--- trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm 2014-11-21 16:40:55 UTC (rev 176448)
@@ -26,16 +26,13 @@
#include "config.h"
#include "SubresourceLoader.h"
+#include "CFNetworkSPI.h"
#include "CachedResource.h"
#include "DiskCacheMonitorCocoa.h"
#include "ResourceHandle.h"
#include "ResourceLoader.h"
#include "SharedBuffer.h"
-@interface NSCachedURLResponse (Details)
--(CFCachedURLResponseRef)_CFCachedURLResponse;
-@end
-
namespace WebCore {
#if USE(CFNETWORK)
Modified: trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm (176447 => 176448)
--- trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2014-11-21 16:40:55 UTC (rev 176448)
@@ -29,6 +29,7 @@
#include "config.h"
#include "ResourceLoader.h"
+#include "CFNetworkSPI.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "SharedBuffer.h"
@@ -37,13 +38,6 @@
#include "InspectorInstrumentation.h"
#endif
-#if USE(CFNETWORK)
-@interface NSCachedURLResponse (Details)
--(id)_initWithCFCachedURLResponse:(CFCachedURLResponseRef)cachedResponse;
--(CFCachedURLResponseRef)_CFCachedURLResponse;
-@end
-#endif
-
namespace WebCore {
#if USE(CFNETWORK)
Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (176447 => 176448)
--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-11-21 16:40:55 UTC (rev 176448)
@@ -29,8 +29,8 @@
#if PLATFORM(IOS)
#import "Logging.h"
-#import "MPAVRoutingControllerSPI.h"
#import "MediaPlayer.h"
+#import "MediaPlayerSPI.h"
#import "MediaSession.h"
#import "SoftLinking.h"
#import "WebCoreSystemInterface.h"
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (176447 => 176448)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
@@ -61,6 +61,13 @@
typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
#endif
+#ifdef __OBJC__
+@interface NSCachedURLResponse (Details)
+-(id)_initWithCFCachedURLResponse:(CFCachedURLResponseRef)cachedResponse;
+-(CFCachedURLResponseRef)_CFCachedURLResponse;
+@end
+#endif
+
#endif // PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
EXTERN_C void CFURLRequestSetShouldStartSynchronously(CFURLRequestRef, Boolean);
Modified: trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (176447 => 176448)
--- trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
@@ -135,6 +135,8 @@
EXTERN_C void CGImageSetCachingFlags(CGImageRef, CGImageCachingFlags);
EXTERN_C CGImageCachingFlags CGImageGetCachingFlags(CGImageRef);
+EXTERN_C CGDataProviderRef CGPDFDocumentGetDataProvider(CGPDFDocumentRef);
+
#if PLATFORM(COCOA)
EXTERN_C CGSRegionEnumeratorObj CGSRegionEnumerator(CGRegionRef);
EXTERN_C CGRect* CGSNextRect(const CGSRegionEnumeratorObj);
Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (176447 => 176448)
--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
@@ -28,6 +28,7 @@
#if USE(APPLE_INTERNAL_SDK)
#include <QuartzCore/CAColorMatrix.h>
+#include <QuartzCore/CARenderServer.h>
#ifdef __OBJC__
#import <QuartzCore/CALayerPrivate.h>
@@ -60,6 +61,11 @@
+ (id)objectForSlot:(uint32_t)name;
- (uint32_t)createImageSlot:(CGSize)size hasAlpha:(BOOL)flag;
- (void)deleteSlot:(uint32_t)name;
+- (void)invalidate;
+- (void)setFencePort:(mach_port_t)port;
+@property (readonly) uint32_t contextId;
+@property (strong) CALayer *layer;
+@property CGColorSpaceRef colorSpace;
@end
@interface CALayer (Details)
@@ -103,6 +109,9 @@
#endif
+EXTERN_C void CARenderServerCaptureLayerWithTransform(mach_port_t serverPort, uint32_t clientId, uint64_t layerId,
+ uint32_t slotId, int32_t ox, int32_t oy, const CATransform3D *);
+
EXTERN_C NSString * const kCATiledLayerRemoveImmediately;
EXTERN_C NSString * const kCAFilterColorInvert;
@@ -111,6 +120,7 @@
EXTERN_C NSString * const kCAFilterColorHueRotate;
EXTERN_C NSString * const kCAFilterColorSaturate;
EXTERN_C NSString * const kCAFilterGaussianBlur;
+EXTERN_C NSString * const kCAFilterPlusD;
EXTERN_C NSString * const kCAFilterNormalBlendMode;
@@ -127,3 +137,5 @@
EXTERN_C NSString * const kCAFilterExclusionBlendMode;
EXTERN_C NSString * const kCAContextDisplayName;
+EXTERN_C NSString * const kCAContextDisplayId;
+EXTERN_C NSString * const kCAContextIgnoresHitTest;
Deleted: trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h (176447 => 176448)
--- trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <MediaPlayer/MPAVRoutingController.h>
-
-#else
-
-enum {
- MPRouteDiscoveryModeDisabled = 0,
- MPRouteDiscoveryModePresence = 1,
- MPRouteDiscoveryModeDetailed = 2,
-};
-typedef NSInteger MPRouteDiscoveryMode;
-
-@interface MPAVRoutingController : NSObject
-@end
-
-@interface MPAVRoutingController (Details)
-- (instancetype)initWithName:(NSString *)name;
-@property (nonatomic, assign) MPRouteDiscoveryMode discoveryMode;
-@end
-
-#endif
Copied: trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h (from rev 176447, trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h) (0 => 176448)
--- trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <MediaPlayer/MPAVRoutingController.h>
+#import <MediaPlayer/MPAudioVideoRoutingActionSheet.h>
+#import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
+
+#else
+
+enum {
+ MPAVItemTypeUnknown = 0,
+ MPAVItemTypeAudio = 1,
+ MPAVItemTypeVideo = 2,
+};
+typedef NSUInteger MPAVItemType;
+
+enum {
+ MPRouteDiscoveryModeDisabled = 0,
+ MPRouteDiscoveryModePresence = 1,
+ MPRouteDiscoveryModeDetailed = 2,
+};
+typedef NSInteger MPRouteDiscoveryMode;
+
+@interface MPAVRoutingController : NSObject
+@end
+
+@interface MPAVRoutingController (Details)
+- (instancetype)initWithName:(NSString *)name;
+@property (nonatomic, assign) MPRouteDiscoveryMode discoveryMode;
+@end
+
+@interface MPAudioVideoRoutingPopoverController : UIPopoverController
+@end
+
+@interface MPAudioVideoRoutingPopoverController (Details)
+- (id)initWithType:(MPAVItemType)avItemType;
+@end
+
+@interface MPAudioVideoRoutingActionSheet : UIActionSheet
+@end
+
+@interface MPAudioVideoRoutingActionSheet (Details)
+- (id)initWithType:(MPAVItemType)avItemType;
+- (void)showWithValidInterfaceOrientationMaskBlock:(UIInterfaceOrientationMask (^)(void))block completionHandler:(void (^)())completionHandler;
+@end
+
+#endif
Modified: trunk/Source/WebKit2/ChangeLog (176447 => 176448)
--- trunk/Source/WebKit2/ChangeLog 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-21 16:40:55 UTC (rev 176448)
@@ -1,3 +1,24 @@
+2014-11-21 Daniel Bates <[email protected]>
+
+ [iOS] WebKit2 fails to build with public SDK due to missing SPI from CFNetwork, QuartzCore, MediaPlayer, XPC
+ https://bugs.webkit.org/show_bug.cgi?id=138930
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm: Remove forward declaration for NSCachedURLResponse
+ methods as this functionality was incorporated into CFNetworkSPI.h, which is included by this file.
+ * Platform/mac/LayerHostingContext.mm: Moved QuartzCore forward declarations from this file to file
+ QuartzCoreSPI.h and included header QuartzCoreSPI.h.
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h: Include header XPCSPI.h.
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm: Remove forward declarations of
+ XPC SPI since these declarations are part of XCPSPI.h, which is included by header XPCServiceEntryPoint.h.
+ * UIProcess/API/Cocoa/WKWebView.mm: Remove unnecessary include of header QuartzCore/CARenderServer.h
+ as it will be included by header QuartzCoreSPI.h.
+ * UIProcess/Network/NetworkProcessProxy.cpp: Include header XPCSPI.h when building for iOS with
+ USE(XPC_SERVICES) enabled.
+ * UIProcess/ios/forms/WKAirPlayRoutePicker.mm: Include header MediaPlayerSPI.h instead of including
+ MediaPlayer private headers directly. Also sort the list of #import directives.
+
2014-11-20 Dan Bernstein <[email protected]>
Build fix.
Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (176447 => 176448)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2014-11-21 16:40:55 UTC (rev 176448)
@@ -36,10 +36,6 @@
using namespace WebCore;
-@interface NSCachedURLResponse (NSCachedURLResponseDetails)
--(CFCachedURLResponseRef)_CFCachedURLResponse;
-@end
-
namespace WebKit {
#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
Modified: trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm (176447 => 176448)
--- trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2014-11-21 16:40:55 UTC (rev 176448)
@@ -26,26 +26,9 @@
#import "config.h"
#import "LayerHostingContext.h"
+#import <WebCore/QuartzCoreSPI.h>
#import <WebKitSystemInterface.h>
-#if __has_include(<QuartzCore/CAContext.h>)
-#import <QuartzCore/CAContext.h>
-#else
-@interface CAContext : NSObject
-@end
-
-@interface CAContext (Details)
-- (void)invalidate;
-@property (readonly) uint32_t contextId;
-@property (strong) CALayer *layer;
-@property CGColorSpaceRef colorSpace;
-- (void)setFencePort:(mach_port_t)port;
-+ (CAContext *)remoteContextWithOptions:(NSDictionary *)dict;
-@end
-#endif
-
-extern NSString * const kCAContextIgnoresHitTest;
-
namespace WebKit {
std::unique_ptr<LayerHostingContext> LayerHostingContext::createForPort(mach_port_t serverPort)
Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h (176447 => 176448)
--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2014-11-21 16:40:55 UTC (rev 176448)
@@ -29,6 +29,7 @@
#import "ChildProcess.h"
#import "WebKit2Initialize.h"
#import <wtf/OSObjectPtr.h>
+#import <wtf/spi/darwin/XPCSPI.h>
#if HAVE(VOUCHERS)
#if __has_include(<os/voucher_private.h>)
Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm (176447 => 176448)
--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm 2014-11-21 16:40:55 UTC (rev 176448)
@@ -29,13 +29,6 @@
#import "SandboxUtilities.h"
#import "XPCServiceEntryPoint.h"
-#if __has_include(<xpc/private.h>)
-#import <xpc/private.h>
-#else
-extern "C" xpc_object_t xpc_connection_copy_entitlement_value(xpc_connection_t connection, const char *entitlement);
-extern "C" mach_port_t xpc_dictionary_copy_mach_send(xpc_object_t, const char*);
-#endif
-
namespace WebKit {
XPCServiceInitializerDelegate::~XPCServiceInitializerDelegate()
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176447 => 176448)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-21 16:40:55 UTC (rev 176448)
@@ -95,7 +95,6 @@
#import <UIKit/UIDevice_Private.h>
#import <UIKit/UIPeripheralHost_Private.h>
#import <UIKit/UIWindow_Private.h>
-#import <QuartzCore/CARenderServer.h>
#import <WebCore/CoreGraphicsSPI.h>
#import <WebCore/InspectorOverlay.h>
#import <WebCore/QuartzCoreSPI.h>
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (176447 => 176448)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-11-21 16:40:55 UTC (rev 176448)
@@ -41,6 +41,10 @@
#include "SecItemShimProxy.h"
#endif
+#if PLATFORM(IOS) && USE(XPC_SERVICES)
+#include <wtf/spi/darwin/XPCSPI.h>
+#endif
+
#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, connection())
using namespace WebCore;
Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (176447 => 176448)
--- trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-21 16:40:55 UTC (rev 176448)
@@ -31,13 +31,10 @@
#import "WKContentView.h"
#import "WKContentViewInteraction.h"
#import "WebPageProxy.h"
-#import <MediaPlayer/MPAVItem.h>
-#import <MediaPlayer/MPAudioVideoRoutingActionSheet.h>
-#import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
-#import <WebCore/MPAVRoutingControllerSPI.h>
-#import <WebCore/SoftLinking.h>
#import <UIKit/UIApplication_Private.h>
#import <UIKit/UIWindow_Private.h>
+#import <WebCore/MediaPlayerSPI.h>
+#import <WebCore/SoftLinking.h>
#import <wtf/RetainPtr.h>
SOFT_LINK_FRAMEWORK(MediaPlayer)
