Add WebKitSystemInterface for iOS 9.2

https://bugs.webkit.org/show_bug.cgi?id=153355

Rubber-stamped by David Kilzer.

Tools:

* Scripts/copy-webkitlibraries-to-product-directory:

WebKitLibraries:

* WebKitSystemInterface.h:
* WebKitSystemInterfaceIOS.h: Removed.
* libWebKitSystemInterfaceIOSDevice9.2.a: Added.
* libWebKitSystemInterfaceIOSSimulator9.2.a: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 5424838..67bbbfb 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,14 @@
 2016-01-26  Daniel Bates  <dabates@apple.com>
 
+        Add WebKitSystemInterface for iOS 9.2
+        https://bugs.webkit.org/show_bug.cgi?id=153355
+
+        Rubber-stamped by David Kilzer.
+
+        * Scripts/copy-webkitlibraries-to-product-directory:
+
+2016-01-26  Daniel Bates  <dabates@apple.com>
+
         WebKitTestRunner: Credential cache is not cleared between tests
         https://bugs.webkit.org/show_bug.cgi?id=153407
         <rdar://problem/24280834>

diff --git a/Tools/Scripts/copy-webkitlibraries-to-product-directory b/Tools/Scripts/copy-webkitlibraries-to-product-directory
index ff2b197..a1cc80a 100755 (executable)
--- a/Tools/Scripts/copy-webkitlibraries-to-product-directory
+++ b/Tools/Scripts/copy-webkitlibraries-to-product-directory
@@ -140,9 +140,6 @@ sub dittoHeaders
 if ($clean) {
     print "Cleaning.\n";    
     (system("rm", "-rf", File::Spec->catfile($productDir, "usr", "local", "include", "WebKitSystemInterface.h")) == 0) or die;
-    if (isIOSWebKit()) {
-        (system("rm", "-rf", File::Spec->catfile($productDir, "usr", "local", "include", "WebKitSystemInterfaceIOS.h")) == 0) or die;
-    }
     (system("rm", "-rf", "$productDir$llvmPrefix") == 0) or die;
     unlink glob "$productDir/libWebKitSystemInterface*" or die if glob "$productDir/libWebKitSystemInterface*";
     unlink glob "$productDir/usr/local/lib/libWebKitSystemInterface*" or die if glob "$productDir/usr/local/lib/libWebKitSystemInterface*";
@@ -169,6 +166,8 @@ if ($wksi) {
             "libWebKitSystemInterfaceIOSSimulator8.4.a",
             "libWebKitSystemInterfaceIOSDevice9.0.a",
             "libWebKitSystemInterfaceIOSSimulator9.0.a",
+            "libWebKitSystemInterfaceIOSDevice9.2.a",
+            "libWebKitSystemInterfaceIOSSimulator9.2.a",
         ));
     } else {
         push(@librariesToCopy, (
@@ -188,7 +187,6 @@ if ($wksi) {
     }
     
     dittoHeaders("WebKitLibraries/WebKitSystemInterface.h", "$productDir/usr/local/include/WebKitSystemInterface.h");
-    dittoHeaders("WebKitLibraries/WebKitSystemInterfaceIOS.h", "$productDir/usr/local/include/WebKitSystemInterfaceIOS.h") if isIOSWebKit();
 }
 
 if ($llvm) {

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 8093357..bbb6195 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,15 @@
+2016-01-26  Daniel Bates  <dabates@apple.com>
+
+        Add WebKitSystemInterface for iOS 9.2
+        https://bugs.webkit.org/show_bug.cgi?id=153355
+
+        Rubber-stamped by David Kilzer.
+
+        * WebKitSystemInterface.h:
+        * WebKitSystemInterfaceIOS.h: Removed.
+        * libWebKitSystemInterfaceIOSDevice9.2.a: Added.
+        * libWebKitSystemInterfaceIOSSimulator9.2.a: Added.
+
 2016-01-02  Andy Estes  <aestes@apple.com>
 
         Try to fix the Windows build

diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index 864f545..44031ed 100644 (file)
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -14,7 +14,6 @@
 #else
 #import <CoreImage/CoreImage.h>
 #import <CoreText/CoreText.h>
-#import <WebKitSystemInterfaceIOS.h>
 #endif
 
 @class AVAsset;
@@ -45,16 +44,9 @@ typedef enum {
 CFStringRef WKSignedPublicKeyAndChallengeString(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
 WKCertificateParseResult WKAddCertificatesToKeychainFromData(const void *bytes, unsigned length);
 
-NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response);
-NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *response);
-
-CFArrayRef WKCopyNSURLResponseCertificateChain(NSURLResponse *response);
-
 CFStringEncoding WKGetWebDefaultCFStringEncoding(void);
 
 void WKSetMetadataURL(NSString *URLString, NSString *referrer, NSString *path);
-void WKSetNSURLConnectionDefersCallbacks(NSURLConnection *connection, BOOL defers);
-void WKSetNSURLRequestShouldContentSniff(NSMutableURLRequest *request, BOOL shouldContentSniff);
     
 typedef enum {
     WKPlugInModuleLoadPolicyLoadNormally = 0,
@@ -70,31 +62,12 @@ BOOL WKIsPluginUpdateAvailable(NSString *bundleIdentifier);
 BOOL WKShouldBlockWebGL();
 BOOL WKShouldSuggestBlockingWebGL();
 
-BOOL WKCGContextGetShouldSmoothFonts(CGContextRef cgContext);
-
-void WKSetUpFontCache(void);
-
-void WKSetBaseCTM(CGContextRef, CGAffineTransform);
-void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint);
-CGAffineTransform WKGetUserToBaseCTM(CGContextRef);
-
-void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t);
-bool WKGetVerticalGlyphsForCharacters(CTFontRef, const UniChar[], CGGlyph[], size_t);
-
-CTLineRef WKCreateCTLineWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
-
-CTTypesetterRef WKCreateCTTypesetterWithUniCharProviderAndOptions(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
-
-CGSize WKCTRunGetInitialAdvance(CTRunRef);
-
 enum {
     WKCTFontTransformApplyShaping = (1 << 0),
     WKCTFontTransformApplyPositioning = (1 << 1)
 };
 typedef int WKCTFontTransformOptions;
 
-bool WKCTFontTransformGlyphs(CTFontRef font, CGGlyph glyphs[], CGSize advances[], CFIndex count, WKCTFontTransformOptions options);
-
 typedef enum {
     WKPatternTilingNoDistortion,
     WKPatternTilingConstantSpacingMinimalDistortion,
@@ -102,7 +75,6 @@ typedef enum {
 } WKPatternTiling;
 
 CGPatternRef WKCGPatternCreateWithImageAndTransform(CGImageRef image, CGAffineTransform transform, int tiling);
-void WKCGContextResetClip(CGContextRef);
 
 BOOL WKCGContextIsBitmapContext(CGContextRef context);
 bool WKCGContextIsPDFContext(CGContextRef context);
@@ -113,22 +85,15 @@ typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
 CFURLStorageSessionRef WKCreatePrivateStorageSession(CFStringRef);
 NSURLRequest *WKCopyRequestWithStorageSession(CFURLStorageSessionRef, NSURLRequest *);
 NSCachedURLResponse *WKCachedResponseForRequest(CFURLStorageSessionRef, NSURLRequest *);
-void WKSetRequestStorageSession(CFURLStorageSessionRef, CFMutableURLRequestRef);
 
 typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
-CFHTTPCookieStorageRef WKCopyHTTPCookieStorage(CFURLStorageSessionRef);
 unsigned WKGetHTTPCookieAcceptPolicy(CFHTTPCookieStorageRef);
-void WKSetHTTPCookieAcceptPolicy(CFHTTPCookieStorageRef, unsigned policy);
 NSArray *WKHTTPCookies(CFHTTPCookieStorageRef);
 NSArray *WKHTTPCookiesForURL(CFHTTPCookieStorageRef, NSURL *, NSURL *);
 void WKSetHTTPCookiesForURL(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
 void WKDeleteAllHTTPCookies(CFHTTPCookieStorageRef);
 void WKDeleteHTTPCookie(CFHTTPCookieStorageRef, NSHTTPCookie *);
 
-CFHTTPCookieStorageRef WKGetDefaultHTTPCookieStorage(void);
-WKCFURLCredentialRef WKCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef);
-void WKSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool flag);
-
 CFURLRef WKCopyBundleURLForExecutableURL(CFURLRef);
 
 
@@ -136,23 +101,10 @@ CALayer *WKMakeRenderLayer(uint32_t contextID);
 
 typedef struct __WKCAContextRef *WKCAContextRef;
 WKCAContextRef WKCAContextMakeRemoteWithServerPort(mach_port_t port);
-void WKCAContextInvalidate(WKCAContextRef);
-uint32_t WKCAContextGetContextId(WKCAContextRef);
-void WKCAContextSetLayer(WKCAContextRef, CALayer *);
-CALayer *WKCAContextGetLayer(WKCAContextRef);
-void WKCAContextSetColorSpace(WKCAContextRef, CGColorSpaceRef);
-CGColorSpaceRef WKCAContextGetColorSpace(WKCAContextRef);
 void WKDestroyRenderingResources(void);
 
 void WKCALayerEnumerateRectsBeingDrawnWithBlock(CALayer *layer, CGContextRef context, void (^block)(CGRect rect));
 
-unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount);
-int WKGetHTTPRequestPriority(CFURLRequestRef);
-void WKSetHTTPRequestMaximumPriority(int maximumPriority);
-void WKSetHTTPRequestPriority(CFURLRequestRef, int priority);
-void WKSetHTTPRequestMinimumFastLanePriority(int priority);
-void WKHTTPRequestEnablePipelining(CFURLRequestRef);
-
 void WKSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
 void WKSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
 CFHTTPMessageRef WKCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
@@ -162,18 +114,9 @@ NSURLRequest *WKNSURLRequestFromSerializableRepresentation(CFDictionaryRef repre
 CFDictionaryRef WKCFURLRequestCreateSerializableRepresentation(CFURLRequestRef cfRequest, CFTypeRef tokenNull);
 CFURLRequestRef WKCreateCFURLRequestFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull);
 
-CFDictionaryRef WKNSURLResponseCreateSerializableRepresentation(NSURLResponse *response, CFTypeRef tokenNull);
-NSURLResponse *WKNSURLResponseFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull);
-
 CFArrayRef WKCFURLCacheCopyAllHostNamesInPersistentStore(void);
 void WKCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostArray);    
 
-CFStringRef WKGetCFURLResponseMIMEType(CFURLResponseRef);
-CFURLRef WKGetCFURLResponseURL(CFURLResponseRef);
-CFHTTPMessageRef WKGetCFURLResponseHTTPResponse(CFURLResponseRef);
-CFStringRef WKCopyCFURLResponseSuggestedFilename(CFURLResponseRef);
-void WKSetCFURLResponseMIMEType(CFURLResponseRef, CFStringRef mimeType);
-
 typedef enum {
     WKSandboxExtensionTypeReadOnly,
     WKSandboxExtensionTypeReadWrite,
@@ -191,11 +134,6 @@ WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* s
 
 void WKSetCrashReportApplicationSpecificInformation(CFStringRef);
 
-void WKCGPathAddRoundedRect(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
-
-void WKCFURLRequestAllowAllPostCaching(CFURLRequestRef);
-void WKCFNetworkSetOverrideSystemProxySettings(CFDictionaryRef);
-
 bool WKIsPublicSuffix(NSString *domain);
 
 CFArrayRef WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(CFStringRef partition);
@@ -243,7 +181,6 @@ NSArray *WKSpeechSynthesisGetVoiceIdentifiers(void);
 NSString *WKSpeechSynthesisGetDefaultVoiceIdentifierForLocale(NSLocale*);
 
 // Remote Accessibility API.
-void WKAXRegisterRemoteApp(void);
 void WKAXInitializeElementWithPresenterPid(id, pid_t);
 NSData *WKAXRemoteTokenForElement(id);
 id WKAXRemoteElementForToken(NSData *);
@@ -251,8 +188,6 @@ void WKAXSetWindowForRemoteElement(id remoteWindow, id remoteElement);
 void WKAXRegisterRemoteProcess(bool registerProcess, pid_t);
 pid_t WKAXRemoteProcessIdentifier(id remoteElement);
 
-void WKDrawCapsLockIndicator(CGContextRef, CGRect);
-
 // The CG context's current path is the focus ring's path.
 // Color and radius are ignored. Older versions of WebKit expected to
 // be able to change the rendering of the system focus ring.
@@ -268,10 +203,6 @@ void WKPopupMenu(NSMenu*, NSPoint location, float width, NSView*, int selectedIt
 void WKPopupContextMenu(NSMenu *menu, NSPoint screenLocation);
 void WKSendUserChangeNotifications(void);
 
-NSFont *WKGetFontInLanguageForRange(NSFont *font, NSString *string, NSRange range);
-NSFont *WKGetFontInLanguageForCharacter(NSFont *font, UniChar ch);
-void WKSetCGFontRenderingMode(CGContextRef cgContext, NSFont *font, BOOL shouldSubpixelQuantize);
-
 bool WKCGContextDrawsWithCorrectShadowOffsets(CGContextRef);
 
 CGContextRef WKNSWindowOverrideCGContext(NSWindow *, CGContextRef);
@@ -296,9 +227,7 @@ void WKQTMovieSelectPreferredAlternates(QTMovie* movie);
 
 unsigned WKQTIncludeOnlyModernMediaFileTypes(void);
 float WKQTMovieMaxTimeLoaded(QTMovie* movie);
-float WKQTMovieMaxTimeSeekable(QTMovie* movie);
 NSString *WKQTMovieMaxTimeLoadedChangeNotification(void);
-void WKQTMovieViewSetDrawSynchronously(QTMovieView* view, BOOL sync);
 void WKQTMovieDisableComponent(uint32_t[5]);
 NSURL *WKQTMovieResolvedURL(QTMovie* movie);
 
@@ -395,7 +324,6 @@ CFStringRef WKCopyDefaultSearchProviderDisplayName(void);
 NSCursor *WKCursor(const char *name);
 
 bool WKExecutableWasLinkedOnOrBeforeLion(void);
-bool WKExecutableWasLinkedOnOrBeforeMountainLion(void);
 
 CGFloat WKNSElasticDeltaForTimeDelta(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
 CGFloat WKNSElasticDeltaForReboundDelta(CGFloat delta);
@@ -415,7 +343,6 @@ typedef uint32_t WKWindowID;
 typedef void (*WKOcclusionNotificationHandler)(uint32_t, void* data, uint32_t dataLength, void*, uint32_t);
 
 bool WKRegisterOcclusionNotificationHandler(WKOcclusionNotificationType, WKOcclusionNotificationHandler);
-bool WKUnregisterOcclusionNotificationHandler(WKOcclusionNotificationType, WKOcclusionNotificationHandler);
 bool WKEnableWindowOcclusionNotifications(NSInteger windowID, bool *outCurrentOcclusionState);
 
 #if defined(__x86_64__)

diff --git a/WebKitLibraries/WebKitSystemInterfaceIOS.h b/WebKitLibraries/WebKitSystemInterfaceIOS.h
deleted file mode 100644 (file)
index fa022dd..0000000
--- a/WebKitLibraries/WebKitSystemInterfaceIOS.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  WebKitSystemInterfaceIOS.h
- *  Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
- */
-
-#import <CoreGraphics/CoreGraphics.h>
-
-#ifdef __OBJC__
-@class UIScreen;
-@class UIViewController;
-#else
-class UIScreen;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool WKExecutableWasLinkedOnOrAfterIOSVersion(int);
-
-bool WKIsGB18030ComplianceRequired(void);
-
-typedef enum {
-    WKDeviceClassInvalid = -1,
-    WKDeviceClassiPad,
-    WKDeviceClassiPhone,
-    WKDeviceClassiPod,
-} WKDeviceClass;
-int WKGetDeviceClass(void);
-
-CFStringRef WKGetUserAgent(void);
-CFStringRef WKGetOSNameForUserAgent(void);
-CFStringRef WKGetDeviceName(void);
-CFStringRef WKGetPlatformNameForNavigator(void);
-CFStringRef WKGetVendorNameForNavigator(void);
-
-CGSize WKGetScreenSize(void);
-CGSize WKGetAvailableScreenSize(void);
-
-float WKGetMinimumZoomFontSize(void);
-
-float WKGetScreenScaleFactor(void);
-float WKGetScaleFactorForScreen(UIScreen *);
-
-#ifdef __OBJC__
-NSData *WKAXRemoteToken(CFUUIDRef);
-void WKAXStoreRemoteConnectionInformation(id, pid_t, mach_port_t, CFUUIDRef);
-void WKAXRegisterRemoteApp(void);
-#endif
-
-bool WKIsOptimizedFullscreenSupported(void);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/WebKitLibraries/libWebKitSystemInterfaceIOSDevice9.2.a b/WebKitLibraries/libWebKitSystemInterfaceIOSDevice9.2.a
new file mode 100644 (file)
index 0000000..4ea406a
Binary files /dev/null and b/WebKitLibraries/libWebKitSystemInterfaceIOSDevice9.2.a differ

diff --git a/WebKitLibraries/libWebKitSystemInterfaceIOSSimulator9.2.a b/WebKitLibraries/libWebKitSystemInterfaceIOSSimulator9.2.a
new file mode 100644 (file)
index 0000000..aef8599
Binary files /dev/null and b/WebKitLibraries/libWebKitSystemInterfaceIOSSimulator9.2.a differ