Remove support for WebKitSystemInterface
authorkrollin@apple.com <krollin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Mar 2020 21:50:22 +0000 (21:50 +0000)
committerkrollin@apple.com <krollin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Mar 2020 21:50:22 +0000 (21:50 +0000)
https://bugs.webkit.org/show_bug.cgi?id=208894
<rdar://problem/60297590>

Reviewed by Brent Fulgham.

This project provided support for facilities that are now handled
elsewhere and is no longer needed.

.:

* .gitignore:
* Source/PlatformWin.cmake:
* Source/cmake/OptionsAppleWin.cmake:

Tools:

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

WebKitLibraries:

* Makefile:
* WebKitSystemInterface.h: Removed.
* win/include/WebKitSystemInterface/WebKitSystemInterface.h: Removed.
* win/lib32/WebKitSystemInterface.lib: Removed.

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

.gitignore
ChangeLog
Source/PlatformWin.cmake
Source/cmake/OptionsAppleWin.cmake
Tools/ChangeLog
Tools/Scripts/copy-webkitlibraries-to-product-directory
WebKitLibraries/ChangeLog
WebKitLibraries/Makefile
WebKitLibraries/WebKitSystemInterface.h [deleted file]
WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h [deleted file]
WebKitLibraries/win/lib32/WebKitSystemInterface.lib [deleted file]

index 5da2c2d..b061035 100644 (file)
@@ -33,8 +33,6 @@ __cmake_systeminformation/
 # Ignore files installed by WebKitSupportLibrary/WebKitAuxiliaryLibrary/WinCairoRequirements
 /WebKitSupportLibrary.zip
 /WebKitLibraries/win/
-!/WebKitLibraries/win/include/WebKitSystemInterface/
-!/WebKitLibraries/win/lib32/WebKitSystemInterface.lib
 !/WebKitLibraries/win/tools/scripts/
 
 # Ignore files generated by Qt Creator:
index a42d69e..cbff477 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2020-03-16  Keith Rollin  <krollin@apple.com>
+
+        Remove support for WebKitSystemInterface
+        https://bugs.webkit.org/show_bug.cgi?id=208894
+        <rdar://problem/60297590>
+
+        Reviewed by Brent Fulgham.
+
+        This project provided support for facilities that are now handled
+        elsewhere and is no longer needed.
+
+        * .gitignore:
+        * Source/PlatformWin.cmake:
+        * Source/cmake/OptionsAppleWin.cmake:
+
 2020-03-13  Sergio Villar Senin  <svillar@igalia.com>
 
         [WebXR] IDLs, stubs and build configuration for WPE
index 3911bc7..4df64fd 100644 (file)
@@ -10,10 +10,6 @@ add_custom_target(
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
-if (EXISTS ${CMAKE_SOURCE_DIR}/../Internal/WebKit/WebKitSystemInterface/win/CMakeLists.txt)
-    add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/WebKit/WebKitSystemInterface/win ${CMAKE_CURRENT_BINARY_DIR}/WebKitSystemInterface)
-endif ()
-
 if (EXISTS ${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser/CMakeLists.txt)
     add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser ${CMAKE_CURRENT_BINARY_DIR}/WKTestBrowser)
 endif ()
index 7962e01..459efab 100644 (file)
@@ -1,5 +1,8 @@
-# The static runtime is required for AppleWin due to WebKitSystemInterface.lib
-# being compiled with a static runtime.
+# The static runtime used to be required for AppleWin due to
+# WebKitSystemInterface.lib being compiled with a static runtime. That library
+# is no longer used, but we keep building with static runtime for backward
+# compatibility. But if someone decides that it's OK to require existing
+# projects to build with the runtime DLLs, that's now technically possible.
 set(MSVC_STATIC_RUNTIME ON)
 
 if (DEFINED ENV{AppleApplicationSupportSDK})
index 230a8eb..e243d9b 100644 (file)
@@ -1,3 +1,16 @@
+2020-03-16  Keith Rollin  <krollin@apple.com>
+
+        Remove support for WebKitSystemInterface
+        https://bugs.webkit.org/show_bug.cgi?id=208894
+        <rdar://problem/60297590>
+
+        Reviewed by Brent Fulgham.
+
+        This project provided support for facilities that are now handled
+        elsewhere and is no longer needed.
+
+        * Scripts/copy-webkitlibraries-to-product-directory:
+
 2020-03-16  Per Arne Vollan  <pvollan@apple.com>
 
         [macOS] Accessibility sandbox regressions
index fea32a6..121807a 100755 (executable)
@@ -32,7 +32,6 @@ use lib $FindBin::Bin;
 use webkitdirs;
 
 my $showHelp = 0;
-my $wksi = 0;
 my $clean = 0;
 my $useFullLibPaths = 0;
 my $osxVersion;
@@ -44,7 +43,6 @@ my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName [options]
   --help                        Show this help message
-  --[no-]wksi                   Obsolete. Does nothing. Remove once we are sure nobody passes this option any more.
   --clean                       Clean the libraries (default: $clean)
   --[no-]use-full-lib-paths     Toggle using full library paths
   --sdk=<sdk>                   Use a specific Xcode SDK
@@ -56,7 +54,6 @@ EOF
 
 GetOptions(
     'help' => \$showHelp,
-    'wksi!' => \$wksi,
     'clean' => \$clean,
     'use-full-lib-paths!' => \$useFullLibPaths,
     'osx-version=s' => \$osxVersion,
index b1ce9aa..623d314 100644 (file)
@@ -1,3 +1,19 @@
+2020-03-16  Keith Rollin  <krollin@apple.com>
+
+        Remove support for WebKitSystemInterface
+        https://bugs.webkit.org/show_bug.cgi?id=208894
+        <rdar://problem/60297590>
+
+        Reviewed by Brent Fulgham.
+
+        This project provided support for facilities that are now handled
+        elsewhere and is no longer needed.
+
+        * Makefile:
+        * WebKitSystemInterface.h: Removed.
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Removed.
+        * win/lib32/WebKitSystemInterface.lib: Removed.
+
 2020-01-27  Chris Dumez  <cdumez@apple.com>
 
         Unreviewed, revert r253984 as it appears to be causing assertion leaks.
index 6c42e2a..73ab8e2 100644 (file)
@@ -7,7 +7,7 @@ cleanlibs:
        @true
 else
 libs:
-       perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi
+       perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory
 cleanlibs:
        perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --clean
 endif
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
deleted file mode 100644 (file)
index c841243..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-/*      
-    WebKitSystemInterface.h
-    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
-
-    Public header file.
-*/
-
-#import <Foundation/Foundation.h>
-#import <dispatch/dispatch.h>
-
-#if !TARGET_OS_IPHONE
-#import <AppKit/AppKit.h>
-#import <Carbon/Carbon.h>
-#else
-#import <CoreImage/CoreImage.h>
-#import <CoreText/CoreText.h>
-#endif
-
-@class AVAsset;
-@class AVPlayer;
-@class CALayer;
-@class QTMovie;
-@class QTMovieView;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma mark Shared
-
-typedef struct _CFURLResponse* CFURLResponseRef;
-typedef const struct _CFURLRequest* CFURLRequestRef;
-typedef struct _CFURLRequest* CFMutableURLRequestRef;
-
-typedef struct _CFURLCredential* WKCFURLCredentialRef;
-typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef;
-
-typedef enum {
-    WKCertificateParseResultSucceeded  = 0,
-    WKCertificateParseResultFailed     = 1,
-    WKCertificateParseResultPKCS7      = 2,
-} WKCertificateParseResult;
-
-CFStringRef WKSignedPublicKeyAndChallengeString(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
-WKCertificateParseResult WKAddCertificatesToKeychainFromData(const void *bytes, unsigned length);
-
-CFStringEncoding WKGetWebDefaultCFStringEncoding(void);
-
-void WKSetMetadataURL(NSString *URLString, NSString *referrer, NSString *path);
-    
-typedef enum {
-    WKPlugInModuleLoadPolicyLoadNormally = 0,
-    WKPlugInModuleLoadPolicyLoadUnsandboxed,
-    WKPlugInModuleLoadPolicyBlockedForSecurity,
-    WKPlugInModuleLoadPolicyBlockedForCompatibility,
-} WKPlugInModuleLoadPolicy;
-
-WKPlugInModuleLoadPolicy WKLoadPolicyForPluginVersion(NSString *bundleIdentifier, NSString *bundleVersionString);
-BOOL WKShouldBlockPlugin(NSString *bundleIdentifier, NSString *bundleVersionString);
-BOOL WKIsPluginUpdateAvailable(NSString *bundleIdentifier);
-
-BOOL WKShouldBlockWebGL();
-BOOL WKShouldSuggestBlockingWebGL();
-
-enum {
-    WKCTFontTransformApplyShaping = (1 << 0),
-    WKCTFontTransformApplyPositioning = (1 << 1)
-};
-typedef int WKCTFontTransformOptions;
-
-typedef enum {
-    WKPatternTilingNoDistortion,
-    WKPatternTilingConstantSpacingMinimalDistortion,
-    WKPatternTilingConstantSpacing
-} WKPatternTiling;
-
-CGPatternRef WKCGPatternCreateWithImageAndTransform(CGImageRef image, CGAffineTransform transform, int tiling);
-
-BOOL WKCGContextIsBitmapContext(CGContextRef context);
-bool WKCGContextIsPDFContext(CGContextRef context);
-
-CFStringRef WKCopyFoundationCacheDirectory(void);
-
-typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
-CFURLStorageSessionRef WKCreatePrivateStorageSession(CFStringRef);
-NSURLRequest *WKCopyRequestWithStorageSession(CFURLStorageSessionRef, NSURLRequest *);
-NSCachedURLResponse *WKCachedResponseForRequest(CFURLStorageSessionRef, NSURLRequest *);
-
-typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
-unsigned WKGetHTTPCookieAcceptPolicy(CFHTTPCookieStorageRef);
-NSArray *WKHTTPCookies(CFHTTPCookieStorageRef);
-NSArray *WKHTTPCookiesForURL(CFHTTPCookieStorageRef, NSURL *, NSURL *);
-void WKSetHTTPCookiesForURL(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
-void WKDeleteAllHTTPCookies(CFHTTPCookieStorageRef);
-void WKDeleteHTTPCookie(CFHTTPCookieStorageRef, NSHTTPCookie *);
-
-CFURLRef WKCopyBundleURLForExecutableURL(CFURLRef);
-
-
-CALayer *WKMakeRenderLayer(uint32_t contextID);
-
-typedef struct __WKCAContextRef *WKCAContextRef;
-WKCAContextRef WKCAContextMakeRemoteWithServerPort(mach_port_t port);
-void WKDestroyRenderingResources(void);
-
-void WKCALayerEnumerateRectsBeingDrawnWithBlock(CALayer *layer, CGContextRef context, void (^block)(CGRect rect));
-
-void WKSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
-void WKSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
-CFHTTPMessageRef WKCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
-
-CFDictionaryRef WKNSURLRequestCreateSerializableRepresentation(NSURLRequest *request, CFTypeRef tokenNull);
-NSURLRequest *WKNSURLRequestFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull);
-CFDictionaryRef WKCFURLRequestCreateSerializableRepresentation(CFURLRequestRef cfRequest, CFTypeRef tokenNull);
-CFURLRequestRef WKCreateCFURLRequestFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull);
-
-CFArrayRef WKCFURLCacheCopyAllHostNamesInPersistentStore(void);
-void WKCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostArray);    
-
-typedef enum {
-    WKSandboxExtensionTypeReadOnly,
-    WKSandboxExtensionTypeReadWrite,
-    WKSandboxExtensionTypeGeneric,
-} WKSandboxExtensionType;
-typedef struct __WKSandboxExtension *WKSandboxExtensionRef;
-
-WKSandboxExtensionRef WKSandboxExtensionCreate(const char* path, WKSandboxExtensionType type);
-void WKSandboxExtensionDestroy(WKSandboxExtensionRef sandboxExtension);
-
-bool WKSandboxExtensionConsume(WKSandboxExtensionRef sandboxExtension);
-bool WKSandboxExtensionInvalidate(WKSandboxExtensionRef sandboxExtension);
-
-const char* WKSandboxExtensionGetSerializedFormat(WKSandboxExtensionRef sandboxExtension, size_t* length);
-WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* serializationFormat, size_t length);
-
-void WKSetCrashReportApplicationSpecificInformation(CFStringRef);
-
-bool WKIsPublicSuffix(NSString *domain);
-
-CFArrayRef WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(CFStringRef partition);
-typedef void (^CFURLCacheCopyAllPartitionNamesResultsNotification)(CFArrayRef partitionNames);
-
-void WKCFURLCacheDeleteHostNamesInPersistentStoreForPartition(CFArrayRef hostArray, CFStringRef partition);
-CFStringRef WKCachePartitionKey(void);
-void WKCFURLCacheCopyAllPartitionNames(CFURLCacheCopyAllPartitionNamesResultsNotification resultsBlock);
-
-typedef enum {
-    WKExternalPlaybackTypeNone,
-    WKExternalPlaybackTypeAirPlay,
-    WKExternalPlaybackTypeTVOut,
-} WKExternalPlaybackType;
-
-int WKExernalDeviceTypeForPlayer(AVPlayer *);
-NSString *WKExernalDeviceDisplayNameForPlayer(AVPlayer *);
-
-bool WKQueryDecoderAvailability(void);
-
-#pragma mark Mac Only
-
-#if !TARGET_OS_IPHONE
-
-void WKShowKeyAndMain(void);
-
-void WKAdvanceDefaultButtonPulseAnimation(NSButtonCell *button);
-
-NSString *WKWindowWillOrderOnScreenNotification(void);
-NSString *WKWindowWillOrderOffScreenNotification(void);
-void WKSetNSWindowShouldPostEventNotifications(NSWindow *window, BOOL post);
-
-CFTypeID WKGetAXTextMarkerTypeID(void);
-CFTypeID WKGetAXTextMarkerRangeTypeID(void);
-CFTypeRef WKCreateAXTextMarker(const void *bytes, size_t len);
-BOOL WKGetBytesFromAXTextMarker(CFTypeRef textMarker, void *bytes, size_t length);
-CFTypeRef WKCreateAXTextMarkerRange(CFTypeRef start, CFTypeRef end);
-CFTypeRef WKCopyAXTextMarkerRangeStart(CFTypeRef range);
-CFTypeRef WKCopyAXTextMarkerRangeEnd(CFTypeRef range);
-void WKAccessibilityHandleFocusChanged(void);
-AXUIElementRef WKCreateAXUIElementRef(id element);
-void WKUnregisterUniqueIdForElement(id element);
-    
-NSArray *WKSpeechSynthesisGetVoiceIdentifiers(void);
-NSString *WKSpeechSynthesisGetDefaultVoiceIdentifierForLocale(NSLocale*);
-
-// Remote Accessibility API.
-void WKAXInitializeElementWithPresenterPid(id, pid_t);
-NSData *WKAXRemoteTokenForElement(id);
-id WKAXRemoteElementForToken(NSData *);
-void WKAXSetWindowForRemoteElement(id remoteWindow, id remoteElement);
-void WKAXRegisterRemoteProcess(bool registerProcess, pid_t);
-pid_t WKAXRemoteProcessIdentifier(id remoteElement);
-
-// 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.
-void WKDrawFocusRing(CGContextRef context, CGColorRef color, int radius);
-bool WKDrawFocusRingAtTime(CGContextRef context, NSTimeInterval time);
-bool WKDrawCellFocusRingWithFrameAtTime(NSCell *cell, NSRect cellFrame, NSView *controlView, NSTimeInterval time);
-
-void WKSetDragImage(NSImage *image, NSPoint offset);
-
-void WKDrawBezeledTextArea(NSRect, BOOL enabled);
-
-void WKPopupMenu(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*, NSControlSize controlSize, bool usesCustomAppearance);
-void WKPopupContextMenu(NSMenu *menu, NSPoint screenLocation);
-void WKSendUserChangeNotifications(void);
-
-bool WKCGContextDrawsWithCorrectShadowOffsets(CGContextRef);
-
-CGContextRef WKNSWindowOverrideCGContext(NSWindow *, CGContextRef);
-void WKNSWindowRestoreCGContext(NSWindow *, CGContextRef);
-
-void WKGetWheelEventDeltas(NSEvent *, float *deltaX, float *deltaY, BOOL *continuous);
-
-BOOL WKAppVersionCheckLessThan(NSString *, int, double);
-
-typedef enum {
-    WKMovieTypeUnknown,
-    WKMovieTypeDownload,
-    WKMovieTypeStoredStream,
-    WKMovieTypeLiveStream
-} WKMovieType;
-
-int WKQTMovieGetType(QTMovie* movie);
-
-BOOL WKQTMovieHasClosedCaptions(QTMovie* movie);
-void WKQTMovieSetShowClosedCaptions(QTMovie* movie, BOOL showClosedCaptions);
-void WKQTMovieSelectPreferredAlternates(QTMovie* movie);
-
-unsigned WKQTIncludeOnlyModernMediaFileTypes(void);
-float WKQTMovieMaxTimeLoaded(QTMovie* movie);
-NSString *WKQTMovieMaxTimeLoadedChangeNotification(void);
-void WKQTMovieDisableComponent(uint32_t[5]);
-NSURL *WKQTMovieResolvedURL(QTMovie* movie);
-
-void WKSetVisibleApplicationName(CFStringRef);
-void WKSetApplicationInformationItem(CFStringRef key, CFTypeRef value);
-
-typedef enum {
-    WKMediaUIPartFullscreenButton   = 0,
-    WKMediaUIPartMuteButton,
-    WKMediaUIPartPlayButton,
-    WKMediaUIPartSeekBackButton,
-    WKMediaUIPartSeekForwardButton,
-    WKMediaUIPartTimelineSlider,
-    WKMediaUIPartTimelineSliderThumb,
-    WKMediaUIPartRewindButton,
-    WKMediaUIPartSeekToRealtimeButton,
-    WKMediaUIPartShowClosedCaptionsButton,
-    WKMediaUIPartHideClosedCaptionsButton,
-    WKMediaUIPartUnMuteButton,
-    WKMediaUIPartPauseButton,
-    WKMediaUIPartBackground,
-    WKMediaUIPartCurrentTimeDisplay,
-    WKMediaUIPartTimeRemainingDisplay,
-    WKMediaUIPartStatusDisplay,
-    WKMediaUIPartControlsPanel,
-    WKMediaUIPartVolumeSliderContainer,
-    WKMediaUIPartVolumeSlider,
-    WKMediaUIPartVolumeSliderThumb,
-    WKMediaUIPartFullScreenVolumeSlider,
-    WKMediaUIPartFullScreenVolumeSliderThumb,
-    WKMediaUIPartVolumeSliderMuteButton,
-    WKMediaUIPartTextTrackDisplayContainer,
-    WKMediaUIPartTextTrackDisplay,
-    WKMediaUIPartExitFullscreenButton,
-} WKMediaUIPart;
-
-typedef enum {
-    WKMediaControllerFlagDisabled = 1 << 0,
-    WKMediaControllerFlagPressed = 1 << 1,
-    WKMediaControllerFlagDrawEndCaps = 1 << 3,
-    WKMediaControllerFlagFocused = 1 << 4
-} WKMediaControllerThemeState;
-
-BOOL WKHitTestMediaUIPart(int part, CGRect bounds, CGPoint point);
-void WKMeasureMediaUIPart(int part, CGRect *bounds, CGSize *naturalSize);
-void WKDrawMediaUIPart(int part, CGContextRef context, CGRect rect, unsigned state);
-void WKDrawMediaSliderTrack(CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state);
-NSView *WKCreateMediaUIBackgroundView(void);
-
-typedef enum {
-    WKMediaUIControlTimeline,
-    WKMediaUIControlSlider,
-    WKMediaUIControlPlayPauseButton,
-    WKMediaUIControlExitFullscreenButton,
-    WKMediaUIControlRewindButton,
-    WKMediaUIControlFastForwardButton,
-    WKMediaUIControlVolumeUpButton,
-    WKMediaUIControlVolumeDownButton
-} WKMediaUIControlType;
-    
-NSControl *WKCreateMediaUIControl(int controlType);
-
-NSArray *WKQTGetSitesInMediaDownloadCache();
-void WKQTClearMediaDownloadCacheForSite(NSString *site);
-void WKQTClearMediaDownloadCache();
-    
-mach_port_t WKInitializeRenderServer(void);
-
-typedef struct __WKSoftwareCARendererRef *WKSoftwareCARendererRef;
-
-WKSoftwareCARendererRef WKSoftwareCARendererCreate(uint32_t contextID);
-void WKSoftwareCARendererDestroy(WKSoftwareCARendererRef);
-void WKSoftwareCARendererRender(WKSoftwareCARendererRef, CGContextRef, CGRect);
-WKCAContextRef WKCAContextMakeRemoteForWindowServer(void);
-
-void WKWindowSetClipRect(NSWindow*, NSRect);
-
-NSUInteger WKGetInputPanelWindowStyle(void);
-UInt8 WKGetNSEventKeyChar(NSEvent *);
-
-void WKWindowSetAlpha(NSWindow *window, float alphaValue);
-void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScaledFrame);
-
-void WKEnableSettingCursorWhenInBackground(void);
-
-OSStatus WKEnableSandboxStyleFileQuarantine(void);
-
-int WKRecommendedScrollerStyle(void);
-
-bool WKExecutableWasLinkedOnOrBeforeSnowLeopard(void);
-
-CFStringRef WKCopyDefaultSearchProviderDisplayName(void);
-
-NSCursor *WKCursor(const char *name);
-
-bool WKExecutableWasLinkedOnOrBeforeLion(void);
-
-CGFloat WKNSElasticDeltaForTimeDelta(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
-CGFloat WKNSElasticDeltaForReboundDelta(CGFloat delta);
-CGFloat WKNSReboundDeltaForElasticDelta(CGFloat delta);
-
-typedef enum {
-    WKOcclusionNotificationTypeApplicationBecameVisible,
-    WKOcclusionNotificationTypeApplicationBecameOccluded,
-    WKOcclusionNotificationTypeApplicationWindowModificationsStarted,
-    WKOcclusionNotificationTypeApplicationWindowModificationsStopped,
-    WKOcclusionNotificationTypeWindowBecameVisible,
-    WKOcclusionNotificationTypeWindowBecameOccluded,
-} WKOcclusionNotificationType;
-
-typedef uint32_t WKWindowID;
-
-typedef void (*WKOcclusionNotificationHandler)(uint32_t, void* data, uint32_t dataLength, void*, uint32_t);
-
-bool WKRegisterOcclusionNotificationHandler(WKOcclusionNotificationType, WKOcclusionNotificationHandler);
-bool WKEnableWindowOcclusionNotifications(NSInteger windowID, bool *outCurrentOcclusionState);
-
-#if defined(__x86_64__)
-#import <mach/mig.h>
-CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_t serverPort);
-#endif
-
-
-#ifndef __LP64__
-
-OSStatus WKSyncWindowWithCGAfterMove(WindowRef);
-unsigned WKCarbonWindowMask(void);
-void *WKGetNativeWindowFromWindowRef(WindowRef);
-OSType WKCarbonWindowPropertyCreator(void);
-OSType WKCarbonWindowPropertyTag(void);
-
-unsigned WKGetNSAutoreleasePoolCount(void);
-
-BOOL WKConvertNSEventToCarbonEvent(EventRecord *carbonEvent, NSEvent *cocoaEvent);
-void WKSendKeyEventToTSM(NSEvent *theEvent);
-void WKCallDrawingNotification(CGrafPtr port, Rect *bounds);
-
-NSEvent *WKCreateNSEventWithCarbonEvent(EventRef eventRef);
-NSEvent *WKCreateNSEventWithCarbonMouseMoveEvent(EventRef inEvent, NSWindow *window);
-NSEvent *WKCreateNSEventWithCarbonClickEvent(EventRef inEvent, WindowRef windowRef);
-
-ScriptCode WKGetScriptCodeFromCurrentKeyboardInputSource(void);
-
-#endif /* __LP64__ */
-
-#endif /* !TARGET_OS_IPHONE */
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
deleted file mode 100644 (file)
index b204281..0000000
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (C) 2007, 2008, 2009, 2013 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. ``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
- * 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. 
- */
-
-#ifndef WebKitSystemInterface_h
-#define WebKitSystemInterface_h
-
-struct CGAffineTransform;
-struct CGPoint;
-struct CGRect;
-struct CGSize;
-struct IDirect3DDevice9;
-struct WKCACFContext;
-struct WKCACFUpdateRectEnumerator;
-
-typedef struct _CACFLayer* CACFLayerRef;
-typedef const struct __CFArray* CFArrayRef;
-typedef const struct __CFData* CFDataRef;
-typedef const struct __CFString* CFStringRef;
-typedef double CFTimeInterval;
-typedef struct CGColor* CGColorRef;
-typedef struct CGContext* CGContextRef;
-typedef unsigned short CGFontIndex;
-typedef struct CGFont* CGFontRef;
-typedef CGFontIndex CGGlyph;
-typedef struct CGImage* CGImageRef;
-typedef struct CGPattern* CGPatternRef;
-typedef wchar_t UChar;
-typedef struct _CFURLResponse* CFURLResponseRef;
-typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;
-typedef struct __CFDictionary* CFMutableDictionaryRef;
-typedef struct _CFURLRequest* CFMutableURLRequestRef;
-typedef const struct _CFURLRequest* CFURLRequestRef;
-typedef struct __CFHTTPMessage* CFHTTPMessageRef;
-typedef const struct __CFNumber* CFNumberRef;
-typedef struct __CFReadStream* CFReadStreamRef;
-typedef const struct __CFURL* CFURLRef;
-typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef;
-typedef struct tagLOGFONTW LOGFONTW;
-typedef LOGFONTW LOGFONT;
-typedef struct _CACFLayer *CACFLayerRef;
-typedef struct __CVBuffer *CVBufferRef;
-typedef CVBufferRef CVImageBufferRef;
-typedef CVImageBufferRef CVPixelBufferRef;
-typedef struct _CAImageQueue *CAImageQueueRef;
-typedef unsigned long CFTypeID;
-typedef struct _CFURLCredential* WKCFURLCredentialRef;
-typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
-typedef const struct _CFURLCache* CFURLCacheRef;
-
-void wkSetFontSmoothingLevel(int type);
-int wkGetFontSmoothingLevel();
-void wkSetFontSmoothingContrast(CGFloat);
-CGFloat wkGetFontSmoothingContrast();
-void wkSystemFontSmoothingChanged();
-uint32_t wkSetFontSmoothingStyle(CGContextRef cg, bool fontAllowsSmoothing);
-void wkRestoreFontSmoothingStyle(CGContextRef cg, uint32_t oldStyle);
-void wkSetCGContextFontRenderingStyle(CGContextRef, bool isSystemFont, bool isPrinterFont, bool usePlatformNativeGlyphs);
-void wkGetGlyphAdvances(CGFontRef, const CGAffineTransform&, bool isSystemFont, bool isPrinterFont, CGGlyph, CGSize& advance);
-void wkGetGlyphs(CGFontRef, const UChar[], CGGlyph[], size_t count);
-void wkSetUpFontCache(size_t s);
-
-void wkSetBaseCTM(CGContextRef, CGAffineTransform);
-void wkSetPatternPhaseInUserSpace(CGContextRef, CGPoint phasePoint);
-CGAffineTransform wkGetUserToBaseCTM(CGContextRef);
-bool wkCGContextIsPDFContext(CGContextRef);
-
-void wkDrawFocusRing(CGContextRef, CGColorRef, float radius);
-
-CFDictionaryRef wkGetSSLCertificateInfo(CFURLResponseRef);
-CFDataRef wkGetSSLPeerCertificateData(CFDictionaryRef);
-void* wkGetSSLPeerCertificateDataBytePtr(CFDictionaryRef);
-void wkSetSSLPeerCertificateData(CFMutableDictionaryRef, CFDataRef);
-void* wkGetSSLCertificateChainContext(CFDictionaryRef);
-CFHTTPCookieStorageRef wkGetDefaultHTTPCookieStorage();
-CFHTTPCookieStorageRef wkCreateInMemoryHTTPCookieStorage();
-void wkSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool);
-CFStringRef wkCopyFoundationCacheDirectory(CFURLStorageSessionRef);
-void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef);
-
-CFArrayRef wkCFURLRequestCopyHTTPRequestBodyParts(CFURLRequestRef);
-void wkCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bodyParts);
-
-CFURLStorageSessionRef wkCreatePrivateStorageSession(CFStringRef identifier, CFURLStorageSessionRef defaultStorageSession);
-void wkSetRequestStorageSession(CFURLStorageSessionRef, CFMutableURLRequestRef);
-CFURLCacheRef wkCopyURLCache(CFURLStorageSessionRef);
-CFHTTPCookieStorageRef wkCopyHTTPCookieStorage(CFURLStorageSessionRef);
-CFDataRef wkCopySerializedDefaultStorageSession();
-CFURLStorageSessionRef wkDeserializeStorageSession(CFDataRef);
-
-CFArrayRef wkCFURLCacheCopyAllHostNamesInPersistentStore();
-void wkCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostNames);
-
-unsigned wkInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount);
-int wkGetHTTPRequestPriority(CFURLRequestRef);
-void wkSetHTTPRequestMaximumPriority(int maximumPriority);
-void wkSetHTTPRequestPriority(CFURLRequestRef, 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);
-
-WKCFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef protectionSpace);
-
-CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode);
-
-
-enum wkCAImageQueueFlags {
-    kWKCAImageQueueAsync = 1U << 0,
-    kWKCAImageQueueFill = 1U << 1,
-    kWKCAImageQueueProtected = 1U << 2,
-    kWKCAImageQueueUseCleanAperture = 1U << 3,
-    kWKCAImageQueueUseAspectRatio = 1U << 4,
-    kWKCAImageQueueLowQualityColor = 1U << 5,
-};
-
-enum wkWKCAImageQueueImageType {
-    kWKCAImageQueueNil = 1,
-    kWKCAImageQueueSurface,
-    kWKCAImageQueueBuffer,
-    kWKCAImageQueueIOSurface,
-};
-
-enum wkWKCAImageQueueImageFlags {
-    kWKCAImageQueueOpaque = 1U << 0,
-    kWKCAImageQueueFlush = 1U << 1,
-    kWKCAImageQueueWillFlush = 1U << 2,
-    kWKCAImageQueueFlipped = 1U << 3,
-    kWKCAImageQueueWaitGPU = 1U << 4,
-};
-
-typedef void (*wkCAImageQueueReleaseCallback)(unsigned int type, uint64_t id, void *info);
-CAImageQueueRef wkCAImageQueueCreate(uint32_t width, uint32_t height, uint32_t capacity);
-void wkCAImageQueueInvalidate(CAImageQueueRef iq);
-size_t wkCAImageQueueCollect(CAImageQueueRef iq);
-bool wkCAImageQueueInsertImage(CAImageQueueRef iq, CFTimeInterval t, unsigned int type, uint64_t id, uint32_t flags, wkCAImageQueueReleaseCallback release, void *info);
-uint64_t wkCAImageQueueRegisterPixelBuffer(CAImageQueueRef iq, void *data, size_t data_size, size_t rowbytes, size_t width, size_t height, OSType pixel_format, CFDictionaryRef attachments, uint32_t flags);
-void wkCAImageQueueSetFlags(CAImageQueueRef iq, uint32_t mask, uint32_t flags);
-uint32_t wkCAImageQueueGetFlags(CAImageQueueRef iq);
-CFTypeID wkCAImageQueueGetTypeID(void);
-
-WKCACFContext* wkCACFContextCreate();
-void wkCACFContextDestroy(WKCACFContext*);
-
-void wkCACFContextSetLayer(WKCACFContext*, CACFLayerRef);
-void wkCACFContextFlush(WKCACFContext*);
-
-CFTimeInterval wkCACFContextGetLastCommitTime(WKCACFContext*);
-CFTimeInterval wkCACFContextGetNextUpdateTime(WKCACFContext*);
-
-void* wkCACFContextGetUserData(WKCACFContext*);
-void wkCACFContextSetUserData(WKCACFContext*, void*);
-
-void* wkCACFLayerGetContextUserData(CACFLayerRef);
-
-void wkCACFContextSetD3DDevice(WKCACFContext*, IDirect3DDevice9*);
-void wkCACFContextReleaseD3DResources(WKCACFContext*);
-
-bool wkCACFContextBeginUpdate(WKCACFContext*, void* buffer, size_t bufferSize, CFTimeInterval time, const CGRect& bounds, const CGRect dirtyRects[], size_t dirtyRectCount);
-void wkCACFContextRenderUpdate(WKCACFContext*);
-void wkCACFContextFinishUpdate(WKCACFContext*);
-void wkCACFContextAddUpdateRect(WKCACFContext*, const CGRect&);
-
-WKCACFUpdateRectEnumerator* wkCACFContextCopyUpdateRectEnumerator(WKCACFContext*);
-const CGRect* wkCACFUpdateRectEnumeratorNextRect(WKCACFUpdateRectEnumerator*);
-void wkCACFUpdateRectEnumeratorRelease(WKCACFUpdateRectEnumerator*);
-
-typedef enum {
-    wkPatternTilingNoDistortion,
-    wkPatternTilingConstantSpacingMinimalDistortion,
-    wkPatternTilingConstantSpacing
-} wkPatternTiling;
-
-CGPatternRef wkCGPatternCreateWithImageAndTransform(CGImageRef image, CGAffineTransform transform, int tiling);
-
-bool wkCGContextDrawsWithCorrectShadowOffsets(CGContextRef);
-
-CFDictionaryRef wkCFURLRequestCreateSerializableRepresentation(CFURLRequestRef cfRequest, CFTypeRef tokenNull);
-CFURLRequestRef wkCFURLRequestCreateFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull);
-CFDictionaryRef wkCFURLResponseCreateSerializableRepresentation(CFURLResponseRef cfResponse, CFTypeRef tokenNull);
-CFURLResponseRef wkCFURLResponseCreateFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull);
-
-typedef void (*wkQuickTimeMIMETypeCallBack)(const char* mimeType);
-void wkGetQuickTimeMIMETypeList(wkQuickTimeMIMETypeCallBack);
-
-typedef enum {
-    WKMediaUIPartFullscreenButton   = 0,
-    WKMediaUIPartMuteButton,
-    WKMediaUIPartPlayButton,
-    WKMediaUIPartSeekBackButton,
-    WKMediaUIPartSeekForwardButton,
-    WKMediaUIPartTimelineSlider,
-    WKMediaUIPartTimelineSliderThumb,
-    WKMediaUIPartRewindButton,
-    WKMediaUIPartSeekToRealtimeButton,
-    WKMediaUIPartShowClosedCaptionsButton,
-    WKMediaUIPartHideClosedCaptionsButton,
-    WKMediaUIPartUnMuteButton,
-    WKMediaUIPartPauseButton,
-    WKMediaUIPartBackground,
-    WKMediaUIPartCurrentTimeDisplay,
-    WKMediaUIPartTimeRemainingDisplay,
-    WKMediaUIPartStatusDisplay,
-    WKMediaUIPartControlsPanel,
-    WKMediaUIPartVolumeSliderContainer,
-    WKMediaUIPartVolumeSlider,
-    WKMediaUIPartVolumeSliderThumb,
-    WKMediaUIPartFullScreenVolumeSlider,
-    WKMediaUIPartFullScreenVolumeSliderThumb,
-    WKMediaUIPartVolumeSliderMuteButton,
-    WKMediaUIPartTextTrackDisplayContainer,
-    WKMediaUIPartTextTrackDisplay,
-    WKMediaUIPartExitFullscreenButton,
-} WKMediaUIPart;
-
-typedef enum {
-    WKMediaControllerFlagDisabled = 1 << 0,
-    WKMediaControllerFlagPressed = 1 << 1,
-    WKMediaControllerFlagDrawEndCaps = 1 << 3,
-    WKMediaControllerFlagFocused = 1 << 4
-} WKMediaControllerThemeState;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool WKHitTestMediaUIPart(int part, CGRect bounds, CGPoint point);
-void WKMeasureMediaUIPart(int part, CGRect *bounds, CGSize *naturalSize);
-void WKDrawMediaUIPart(int part, CGContextRef context, CGRect rect, unsigned state);
-void WKDrawMediaSliderTrack(CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WebKitSystemInterface_h
diff --git a/WebKitLibraries/win/lib32/WebKitSystemInterface.lib b/WebKitLibraries/win/lib32/WebKitSystemInterface.lib
deleted file mode 100644 (file)
index 07af5ab..0000000
Binary files a/WebKitLibraries/win/lib32/WebKitSystemInterface.lib and /dev/null differ