Remove WebCoreSystemInterface
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Oct 2017 06:13:51 +0000 (06:13 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Oct 2017 06:13:51 +0000 (06:13 +0000)
https://bugs.webkit.org/show_bug.cgi?id=177916

Reviewed by Antti Koivisto.

Source/WebCore:

* Configurations/WebCore.xcconfig:
* PlatformMac.cmake:
* WebCore.xcodeproj/project.pbxproj:
* accessibility/mac/AXObjectCacheMac.mm:
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
* dom/Document.cpp:
* editing/mac/DictionaryLookup.mm:
* page/ios/FrameIOS.mm:
* page/ios/UserAgentIOS.mm:
* page/mac/EventHandlerMac.mm:
* platform/cocoa/LocalizedStringsCocoa.mm:
* platform/cocoa/ScrollController.mm:
* platform/graphics/Font.h:
* platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
* platform/graphics/ca/GraphicsLayerCA.cpp:
* platform/graphics/cg/GraphicsContextCG.cpp:
* platform/graphics/cg/ImageBufferCG.cpp:
* platform/graphics/cg/PathCG.cpp:
* platform/graphics/cg/PatternCG.cpp:
* platform/graphics/cocoa/FontCascadeCocoa.mm:
* platform/graphics/cocoa/FontCocoa.mm:
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
* platform/graphics/mac/FontCacheMac.mm:
* platform/graphics/mac/GlyphPageMac.cpp:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
* platform/ios/LegacyTileCache.mm:
* platform/ios/PlatformScreenIOS.mm:
* platform/ios/VideoFullscreenInterfaceAVKit.mm:
* platform/ios/WebCoreSystemInterfaceIOS.mm: Removed.
* platform/ios/wak/WAKWindow.mm:
* platform/mac/CursorMac.mm:
* platform/mac/FileSystemMac.mm:
* platform/mac/PlatformEventFactoryMac.mm:
* platform/mac/PlatformSpeechSynthesizerMac.mm:
* platform/mac/ScrollAnimatorMac.mm:
* platform/mac/ScrollbarThemeMac.mm:
* platform/mac/ThemeMac.mm:
* platform/mac/WebCoreNSURLExtras.mm:
* platform/mac/WebCoreSystemInterface.h: Removed.
* platform/mac/WebCoreSystemInterface.mm: Removed.
* platform/mac/WebVideoFullscreenHUDWindowController.mm:
* platform/mac/WebWindowAnimation.mm:
* platform/network/cf/CookieStorageCFNet.cpp:
* platform/network/cf/CredentialStorageCFNet.cpp:
* platform/network/cf/NetworkStorageSessionCFNet.cpp:
* platform/network/cf/ResourceHandleCFNet.cpp:
* platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
* platform/network/cf/ResourceRequestCFNet.cpp:
* platform/network/cf/ResourceResponseCFNet.cpp:
* platform/network/cf/SocketStreamHandleImplCFNet.cpp:
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
* platform/network/cocoa/ResourceRequestCocoa.mm:
* platform/network/ios/WebCoreURLResponseIOS.mm:
* platform/network/mac/CookieJarMac.mm:
* platform/network/mac/ResourceHandleMac.mm:
* platform/network/mac/WebCoreURLResponse.mm:
* platform/text/TextEncodingRegistry.cpp:
* rendering/RenderThemeMac.mm:

Source/WebKitLegacy/ios:

* Misc/WebUIKitSupport.mm:

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

68 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/PlatformMac.cmake
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
Source/WebCore/dom/Document.cpp
Source/WebCore/editing/mac/DictionaryLookup.mm
Source/WebCore/page/ios/FrameIOS.mm
Source/WebCore/page/ios/UserAgentIOS.mm
Source/WebCore/page/mac/EventHandlerMac.mm
Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm
Source/WebCore/platform/cocoa/ScrollController.mm
Source/WebCore/platform/graphics/Font.h
Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
Source/WebCore/platform/graphics/cg/PathCG.cpp
Source/WebCore/platform/graphics/cg/PatternCG.cpp
Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm
Source/WebCore/platform/graphics/cocoa/IOSurface.h
Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
Source/WebCore/platform/graphics/mac/FontCacheMac.mm
Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
Source/WebCore/platform/ios/LegacyTileCache.mm
Source/WebCore/platform/ios/PlatformScreenIOS.mm
Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm [deleted file]
Source/WebCore/platform/ios/wak/WAKWindow.mm
Source/WebCore/platform/mac/CursorMac.mm
Source/WebCore/platform/mac/FileSystemMac.mm
Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm
Source/WebCore/platform/mac/ScrollAnimatorMac.mm
Source/WebCore/platform/mac/ScrollbarThemeMac.mm
Source/WebCore/platform/mac/ThemeMac.mm
Source/WebCore/platform/mac/WebCoreNSURLExtras.mm
Source/WebCore/platform/mac/WebCoreSystemInterface.h [deleted file]
Source/WebCore/platform/mac/WebCoreSystemInterface.mm [deleted file]
Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm
Source/WebCore/platform/mac/WebWindowAnimation.mm
Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp
Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm
Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm
Source/WebCore/platform/network/mac/CookieJarMac.mm
Source/WebCore/platform/network/mac/ResourceHandleMac.mm
Source/WebCore/platform/network/mac/WebCoreURLResponse.mm
Source/WebCore/platform/text/TextEncodingRegistry.cpp
Source/WebCore/rendering/RenderThemeMac.mm
Source/WebKitLegacy/ios/ChangeLog
Source/WebKitLegacy/ios/Misc/WebUIKitSupport.mm

index ca8f290..da12e13 100644 (file)
@@ -1,5 +1,76 @@
 2017-10-04  Alex Christensen  <achristensen@webkit.org>
 
+        Remove WebCoreSystemInterface
+        https://bugs.webkit.org/show_bug.cgi?id=177916
+
+        Reviewed by Antti Koivisto.
+
+        * Configurations/WebCore.xcconfig:
+        * PlatformMac.cmake:
+        * WebCore.xcodeproj/project.pbxproj:
+        * accessibility/mac/AXObjectCacheMac.mm:
+        * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        * dom/Document.cpp:
+        * editing/mac/DictionaryLookup.mm:
+        * page/ios/FrameIOS.mm:
+        * page/ios/UserAgentIOS.mm:
+        * page/mac/EventHandlerMac.mm:
+        * platform/cocoa/LocalizedStringsCocoa.mm:
+        * platform/cocoa/ScrollController.mm:
+        * platform/graphics/Font.h:
+        * platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        * platform/graphics/cg/PathCG.cpp:
+        * platform/graphics/cg/PatternCG.cpp:
+        * platform/graphics/cocoa/FontCascadeCocoa.mm:
+        * platform/graphics/cocoa/FontCocoa.mm:
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+        * platform/graphics/mac/FontCacheMac.mm:
+        * platform/graphics/mac/GlyphPageMac.cpp:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        * platform/ios/LegacyTileCache.mm:
+        * platform/ios/PlatformScreenIOS.mm:
+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+        * platform/ios/WebCoreSystemInterfaceIOS.mm: Removed.
+        * platform/ios/wak/WAKWindow.mm:
+        * platform/mac/CursorMac.mm:
+        * platform/mac/FileSystemMac.mm:
+        * platform/mac/PlatformEventFactoryMac.mm:
+        * platform/mac/PlatformSpeechSynthesizerMac.mm:
+        * platform/mac/ScrollAnimatorMac.mm:
+        * platform/mac/ScrollbarThemeMac.mm:
+        * platform/mac/ThemeMac.mm:
+        * platform/mac/WebCoreNSURLExtras.mm:
+        * platform/mac/WebCoreSystemInterface.h: Removed.
+        * platform/mac/WebCoreSystemInterface.mm: Removed.
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+        * platform/mac/WebWindowAnimation.mm:
+        * platform/network/cf/CookieStorageCFNet.cpp:
+        * platform/network/cf/CredentialStorageCFNet.cpp:
+        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        * platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
+        * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        * platform/network/cf/ResourceResponseCFNet.cpp:
+        * platform/network/cf/SocketStreamHandleImplCFNet.cpp:
+        * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
+        * platform/network/cocoa/ResourceRequestCocoa.mm:
+        * platform/network/ios/WebCoreURLResponseIOS.mm:
+        * platform/network/mac/CookieJarMac.mm:
+        * platform/network/mac/ResourceHandleMac.mm:
+        * platform/network/mac/WebCoreURLResponse.mm:
+        * platform/text/TextEncodingRegistry.cpp:
+        * rendering/RenderThemeMac.mm:
+
+2017-10-04  Alex Christensen  <achristensen@webkit.org>
+
         Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
         https://bugs.webkit.org/show_bug.cgi?id=177912
 
index b03dd4c..c177992 100644 (file)
@@ -120,7 +120,7 @@ EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS_IF_ENABLED_ = JSTouch*;
 EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS = $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_$(ENABLE_IOS_GESTURE_EVENTS)$(ENABLE_MAC_GESTURE_EVENTS));
 EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_ = JSGesture* DOMGesture*;
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm RunLoopMac.mm SSLKeyGeneratorMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebContentReaderMac.mm WebCoreSystemInterface.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp npapi.h npfunctions.h npruntime.h npruntime_internal.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm RunLoopMac.mm SSLKeyGeneratorMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebContentReaderMac.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp npapi.h npfunctions.h npruntime.h npruntime_internal.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
 
 WK_EMPTY_ = YES;
index 4365e75..40e8522 100644 (file)
@@ -524,7 +524,6 @@ list(APPEND WebCore_SOURCES
     platform/mac/WebCoreNSStringExtras.mm
     platform/mac/WebCoreNSURLExtras.mm
     platform/mac/WebCoreObjCExtras.mm
-    platform/mac/WebCoreSystemInterface.mm
     platform/mac/WebGLBlacklist.mm
     platform/mac/WebNSAttributedStringExtras.mm
     platform/mac/WebVideoFullscreenController.mm
@@ -754,8 +753,6 @@ set(WebCore_FORWARDING_HEADERS_FILES
 
     platform/graphics/transforms/AffineTransform.h
 
-    platform/mac/WebCoreSystemInterface.h
-
     platform/network/cf/CertificateInfo.h
     platform/network/cf/ResourceResponse.h
 
index 1f2906d..da05d75 100644 (file)
                93E2425F0B2B509500C732A1 /* HTMLFrameOwnerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E2425E0B2B509500C732A1 /* HTMLFrameOwnerElement.cpp */; };
                93E2A306123E9DC0009FE12A /* HTMLParserIdioms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E2A304123E9DC0009FE12A /* HTMLParserIdioms.cpp */; };
                93E2A307123E9DC0009FE12A /* HTMLParserIdioms.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E2A305123E9DC0009FE12A /* HTMLParserIdioms.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93EB169509F880B00091F8FF /* WebCoreSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93EB169409F880B00091F8FF /* WebCoreSystemInterface.mm */; };
-               93EB169709F880C00091F8FF /* WebCoreSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 93EB169609F880C00091F8FF /* WebCoreSystemInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93EB355F09E37FD600F43799 /* MouseEventWithHitTestResults.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93EB355E09E37FD600F43799 /* MouseEventWithHitTestResults.cpp */; };
                93EF7D551954F13900DFB71D /* ScrollingStateNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93EF7D541954E98F00DFB71D /* ScrollingStateNode.mm */; };
                93F198E508245E59001E9ABC /* HTMLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D23C02DE4396018635CA /* HTMLDocument.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E453901E0EAFCACA003695C8 /* PasteboardIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390190EAFCACA003695C8 /* PasteboardIOS.mm */; };
                E45390430EAFD637003695C8 /* PlatformScreenIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390320EAFD637003695C8 /* PlatformScreenIOS.mm */; };
                E45390450EAFD637003695C8 /* ScrollViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390340EAFD637003695C8 /* ScrollViewIOS.mm */; };
-               E45390490EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390380EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm */; };
                E453904D0EAFD637003695C8 /* WidgetIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E453903C0EAFD637003695C8 /* WidgetIOS.mm */; };
                E45390AE0EAFF4B5003695C8 /* SystemMemoryIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45390AD0EAFF4B5003695C8 /* SystemMemoryIOS.cpp */; };
                E46180291C8A06CD0026C02C /* RenderTreeUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = E46180281C8A06CD0026C02C /* RenderTreeUpdater.h */; };
                93E2425E0B2B509500C732A1 /* HTMLFrameOwnerElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLFrameOwnerElement.cpp; sourceTree = "<group>"; };
                93E2A304123E9DC0009FE12A /* HTMLParserIdioms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLParserIdioms.cpp; sourceTree = "<group>"; };
                93E2A305123E9DC0009FE12A /* HTMLParserIdioms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLParserIdioms.h; sourceTree = "<group>"; };
-               93EB169409F880B00091F8FF /* WebCoreSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSystemInterface.mm; sourceTree = "<group>"; };
-               93EB169609F880C00091F8FF /* WebCoreSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreSystemInterface.h; sourceTree = "<group>"; };
                93EB355E09E37FD600F43799 /* MouseEventWithHitTestResults.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseEventWithHitTestResults.cpp; sourceTree = "<group>"; };
                93EEC1E509C2877700C515D1 /* Attr.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Attr.idl; sourceTree = "<group>"; };
                93EEC1E609C2877700C515D1 /* CharacterData.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CharacterData.idl; sourceTree = "<group>"; };
                E45390190EAFCACA003695C8 /* PasteboardIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteboardIOS.mm; sourceTree = "<group>"; };
                E45390320EAFD637003695C8 /* PlatformScreenIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformScreenIOS.mm; sourceTree = "<group>"; };
                E45390340EAFD637003695C8 /* ScrollViewIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollViewIOS.mm; sourceTree = "<group>"; };
-               E45390380EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSystemInterfaceIOS.mm; sourceTree = "<group>"; };
                E453903C0EAFD637003695C8 /* WidgetIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WidgetIOS.mm; sourceTree = "<group>"; };
                E45390AD0EAFF4B5003695C8 /* SystemMemoryIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemMemoryIOS.cpp; sourceTree = "<group>"; };
                E46180281C8A06CD0026C02C /* RenderTreeUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTreeUpdater.h; sourceTree = "<group>"; };
                                C5B4C24C1509236C00A6EF37 /* WebCoreNSURLExtras.mm */,
                                DD05FE0B0B8BA3C6009ACDFE /* WebCoreObjCExtras.h */,
                                B50F5B800E96CD9900AD71A6 /* WebCoreObjCExtras.mm */,
-                               93EB169609F880C00091F8FF /* WebCoreSystemInterface.h */,
-                               93EB169409F880B00091F8FF /* WebCoreSystemInterface.mm */,
                                BE855F7F0701E83500239769 /* WebCoreView.h */,
                                BE8560510701F91100239769 /* WebCoreView.m */,
                                1AFFC4511D5E7EC700267A66 /* WebGLBlacklist.h */,
                                1F36EA9B1E21BA1700621E25 /* WebBackgroundTaskController.mm */,
                                31403797124BEA7F00AF40E4 /* WebCoreMotionManager.h */,
                                31403798124BEA7F00AF40E4 /* WebCoreMotionManager.mm */,
-                               E45390380EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm */,
                                FE0D84E810484348001A179E /* WebEvent.h */,
                                FE0D84EA1048436E001A179E /* WebEvent.mm */,
                                F482230F1E3869B80066FC79 /* WebItemProviderPasteboard.h */,
                                EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */,
                                E180810F16FCECDF00B80D07 /* WebCoreResourceHandleAsDelegate.h in Headers */,
                                E152551516FD2350003D7ADB /* WebCoreResourceHandleAsOperationQueueDelegate.h in Headers */,
-                               93EB169709F880C00091F8FF /* WebCoreSystemInterface.h in Headers */,
                                A14832C7187F66C800DA63A6 /* WebCoreThread.h in Headers */,
                                A14832C9187F676B00DA63A6 /* WebCoreThreadInternal.h in Headers */,
                                A14832CA187F678000DA63A6 /* WebCoreThreadMessage.h in Headers */,
                                9BDD18271F7E05F400E8E577 /* WebCorePasteboardFileReader.cpp in Sources */,
                                E180810E16FCECDF00B80D07 /* WebCoreResourceHandleAsDelegate.mm in Sources */,
                                E152551616FD2350003D7ADB /* WebCoreResourceHandleAsOperationQueueDelegate.mm in Sources */,
-                               93EB169509F880B00091F8FF /* WebCoreSystemInterface.mm in Sources */,
-                               E45390490EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm in Sources */,
                                A14832C8187F673F00DA63A6 /* WebCoreThread.mm in Sources */,
                                A14832CB187F67B400DA63A6 /* WebCoreThreadRun.cpp in Sources */,
                                A14832CE187F683400DA63A6 /* WebCoreThreadSystemInterface.cpp in Sources */,
index fca3040..a569e33 100644 (file)
@@ -32,7 +32,6 @@
 #import "AccessibilityTable.h"
 #import "RenderObject.h"
 #import "WebAccessibilityObjectWrapperMac.h"
-#import "WebCoreSystemInterface.h"
 #import <pal/spi/mac/NSAccessibilitySPI.h>
 
 #if USE(APPLE_INTERNAL_SDK)
index dc0ad1b..8728c78 100644 (file)
@@ -62,7 +62,6 @@
 #import "VisibleUnits.h"
 #import "WebCoreFrameView.h"
 #import "WebCoreObjCExtras.h"
-#import "WebCoreSystemInterface.h"
 
 using namespace WebCore;
 using namespace HTMLNames;
index dcf747e..fe6314d 100644 (file)
@@ -77,7 +77,6 @@
 #import "VisibleUnits.h"
 #import "WebCoreFrameView.h"
 #import "WebCoreObjCExtras.h"
-#import "WebCoreSystemInterface.h"
 #import <pal/spi/mac/HIServicesSPI.h>
 #import <pal/spi/mac/NSAccessibilitySPI.h>
 #import <wtf/ObjcRuntimeExtras.h>
index f39dd16..7e2bd85 100644 (file)
 #include "Navigator.h"
 #include "NavigatorGeolocation.h"
 #include "WKContentObservation.h"
-#include "WebCoreSystemInterface.h"
 #endif
 
 #if ENABLE(IOS_GESTURE_EVENTS)
index 38733d2..28f72ff 100644 (file)
@@ -42,7 +42,6 @@
 #import "VisiblePosition.h"
 #import "VisibleSelection.h"
 #import "VisibleUnits.h"
-#import "WebCoreSystemInterface.h"
 #import <PDFKit/PDFKit.h>
 #import <pal/spi/mac/LookupSPI.h>
 #import <pal/spi/mac/NSImmediateActionGestureRecognizerSPI.h>
index 42c8b31..52400f4 100644 (file)
@@ -65,7 +65,6 @@
 #import "VisiblePosition.h"
 #import "VisibleUnits.h"
 #import "WAKWindow.h"
-#import "WebCoreSystemInterface.h"
 #import <runtime/JSLock.h>
 #import <wtf/BlockObjCExceptions.h>
 
index f0948f6..c2c2f5d 100644 (file)
@@ -28,7 +28,6 @@
 
 #import "Device.h"
 #import "SystemVersion.h"
-#import "WebCoreSystemInterface.h"
 #import <pal/spi/ios/MobileGestaltSPI.h>
 #import <pal/spi/ios/UIKitSPI.h>
 #import <wtf/RetainPtr.h>
index 4cb70e9..e41b671 100644 (file)
@@ -60,7 +60,6 @@
 #include "Scrollbar.h"
 #include "Settings.h"
 #include "ShadowRoot.h"
-#include "WebCoreSystemInterface.h"
 #include "WheelEventDeltaFilter.h"
 #include "WheelEventTestTrigger.h"
 #include <wtf/BlockObjCExceptions.h>
index 12dd8a7..a36b8fb 100644 (file)
@@ -27,7 +27,6 @@
 #import "LocalizedStrings.h"
 
 #import "NotImplemented.h"
-#import "WebCoreSystemInterface.h"
 #import <pal/system/mac/DefaultSearchProvider.h>
 #import <wtf/Assertions.h>
 #import <wtf/MainThread.h>
index 0b2b281..01a89a5 100644 (file)
@@ -28,7 +28,6 @@
 
 #import "LayoutSize.h"
 #import "PlatformWheelEvent.h"
-#import "WebCoreSystemInterface.h"
 #import "WheelEventTestTrigger.h"
 #import <sys/sysctl.h>
 #import <sys/time.h>
index ad117bb..a663023 100644 (file)
@@ -39,7 +39,6 @@
 #include <wtf/text/StringHash.h>
 
 #if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
 #include <wtf/RetainPtr.h>
 #endif
 
index 5fcc136..8dc358f 100644 (file)
@@ -34,7 +34,6 @@
 #import "LegacyCDM.h"
 #import "MediaPlayerPrivateMediaSourceAVFObjC.h"
 #import "VideoToolboxSoftLink.h"
-#import "WebCoreSystemInterface.h"
 #import <wtf/NeverDestroyed.h>
 #import <wtf/text/StringView.h>
 #import <yarr/RegularExpression.h>
index 814cfb6..f1822ec 100644 (file)
@@ -63,7 +63,6 @@
 #import "WebCoreAVFResourceLoader.h"
 #import "WebCoreCALayerExtras.h"
 #import "WebCoreNSURLSession.h"
-#import "WebCoreSystemInterface.h"
 #import <functional>
 #import <map>
 #import <objc/runtime.h>
index 7263584..e2ae484 100644 (file)
@@ -42,7 +42,6 @@
 #import "TextureCacheCV.h"
 #import "VideoTextureCopierCV.h"
 #import "WebCoreDecompressionSession.h"
-#import "WebCoreSystemInterface.h"
 #import <AVFoundation/AVAsset.h>
 #import <AVFoundation/AVTime.h>
 #import <QuartzCore/CALayer.h>
index c6946d6..7fdb8c1 100644 (file)
@@ -63,7 +63,6 @@
 #if PLATFORM(COCOA)
 #include "PlatformCAAnimationCocoa.h"
 #include "PlatformCALayerCocoa.h"
-#include "WebCoreSystemInterface.h"
 #endif
 
 #if PLATFORM(WIN)
index 78df2b3..7cfafce 100644 (file)
 #include <wtf/RetainPtr.h>
 #include <wtf/text/TextStream.h>
 
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
 #if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif
index 1461e28..3b7b4a4 100644 (file)
@@ -48,7 +48,6 @@
 
 #if PLATFORM(COCOA)
 #include "UTIUtilities.h"
-#include "WebCoreSystemInterface.h"
 #endif
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
index 51bd707..aa494bf 100644 (file)
 #include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
 #if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif
index 8e79db0..50b061b 100644 (file)
 #include <pal/spi/cg/CoreGraphicsSPI.h>
 #include <wtf/MainThread.h>
 
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
 #if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif
index 04213cb..29d30e4 100644 (file)
@@ -30,7 +30,6 @@
 #import "GraphicsContext.h"
 #import "LayoutRect.h"
 #import "Logging.h"
-#import "WebCoreSystemInterface.h"
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/cocoa/CoreTextSPI.h>
 #if USE(APPKIT)
index 9feb2d9..e0bee4c 100644 (file)
@@ -34,7 +34,6 @@
 #import "FontDescription.h"
 #import "OpenTypeCG.h"
 #import "SharedBuffer.h"
-#import "WebCoreSystemInterface.h"
 #import <float.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/cocoa/CoreTextSPI.h>
index f78c41a..fa8b82c 100644 (file)
@@ -25,7 +25,6 @@
 #import "FontPlatformData.h"
 
 #import "SharedBuffer.h"
-#import "WebCoreSystemInterface.h"
 #import <pal/spi/cocoa/CoreTextSPI.h>
 #import <wtf/text/WTFString.h>
 
index 483dbc1..330f656 100644 (file)
@@ -163,7 +163,7 @@ void GraphicsContext::drawFocusRing(const Vector<FloatRect>& rects, float, float
 #endif
 }
 
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
 static NSImage *findImage(NSString* firstChoiceName, NSString* secondChoiceName, bool& usingDot)
 {
     // Eventually we should be able to get rid of the secondChoiceName. For the time being we need both to keep
@@ -175,6 +175,9 @@ static NSImage *findImage(NSString* firstChoiceName, NSString* secondChoiceName,
     usingDot = image;
     return image;
 }
+static NSImage *spellingImage = nullptr;
+static NSImage *grammarImage = nullptr;
+static NSImage *correctionImage = nullptr;
 #else
 static RetainPtr<CGPatternRef> createDotPattern(bool& usingDot, const char* resourceName)
 {
@@ -183,20 +186,18 @@ static RetainPtr<CGPatternRef> createDotPattern(bool& usingDot, const char* reso
     usingDot = true;
     return adoptCF(WKCreatePatternFromCGImage(image.get()));
 }
-#endif // !PLATFORM(IOS)
-
-static NSImage *spellingImage = nullptr;
-static NSImage *grammarImage = nullptr;
-static NSImage *correctionImage = nullptr;
+#endif // PLATFORM(MAC)
 
 void GraphicsContext::updateDocumentMarkerResources()
 {
+#if PLATFORM(MAC)
     [spellingImage release];
     spellingImage = nullptr;
     [grammarImage release];
     grammarImage = nullptr;
     [correctionImage release];
     correctionImage = nullptr;
+#endif
 }
 
 static inline void setPatternPhaseInUserSpace(CGContextRef context, CGPoint phasePoint)
index c14520e..11b0d1a 100644 (file)
@@ -27,6 +27,7 @@
 
 #if USE(IOSURFACE)
 
+#include <objc/objc.h>
 #include "GraphicsContext.h"
 #include "IntSize.h"
 
index 19de228..e8b3c74 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "FontCache.h"
 #include "FontCascade.h"
-#include "WebCoreSystemInterface.h"
 #include <pal/spi/cocoa/CoreTextSPI.h>
 #include <wtf/SoftLinking.h>
 #include <wtf/WeakPtr.h>
index cc3b634..4281da0 100644 (file)
@@ -38,7 +38,6 @@
 
 #if PLATFORM(MAC)
 #import "WebCoreNSStringExtras.h"
-#import "WebCoreSystemInterface.h"
 #import <AppKit/AppKit.h>
 #import <pal/spi/mac/NSFontSPI.h>
 #import <wtf/MainThread.h>
index b1daa69..994ae1c 100644 (file)
@@ -31,7 +31,6 @@
 
 #include "Font.h"
 #include "FontCascade.h"
-#include "WebCoreSystemInterface.h"
 #include <pal/spi/cg/CoreGraphicsSPI.h>
 #include <pal/spi/cocoa/CoreTextSPI.h>
 #if !PLATFORM(IOS)
index d6f8d1a..ee74629 100644 (file)
@@ -39,7 +39,6 @@
 #import "SecurityOrigin.h"
 #import "URL.h"
 #import "UTIUtilities.h"
-#import "WebCoreSystemInterface.h"
 #import <objc/runtime.h>
 #import <pal/spi/mac/QTKitSPI.h>
 #import <wtf/BlockObjCExceptions.h>
index 08c4d62..b8781de 100644 (file)
@@ -37,7 +37,6 @@
 #include "SystemMemory.h"
 #include "WAKWindow.h"
 #include "WKGraphics.h"
-#include "WebCoreSystemInterface.h"
 #include "WebCoreThreadRun.h"
 #include <CoreText/CoreText.h>
 #include <pal/spi/cocoa/QuartzCoreSPI.h>
index 212a6e8..e6726bc 100644 (file)
@@ -34,7 +34,6 @@
 #import "HostWindow.h"
 #import "IntRect.h"
 #import "WAKWindow.h"
-#import "WebCoreSystemInterface.h"
 #import "Widget.h"
 #import <pal/spi/ios/MobileGestaltSPI.h>
 #import <pal/spi/ios/UIKitSPI.h>
index ce62973..a13834e 100644 (file)
@@ -38,7 +38,6 @@
 #import "VideoFullscreenChangeObserver.h"
 #import "VideoFullscreenModel.h"
 #import "WebAVPlayerController.h"
-#import "WebCoreSystemInterface.h"
 #import <AVFoundation/AVTime.h>
 #import <UIKit/UIKit.h>
 #import <objc/message.h>
diff --git a/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm b/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm
deleted file mode 100644 (file)
index fbe2d54..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2006-2017 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. 
- */
-
-#import "config.h"
-#import "WebCoreSystemInterface.h"
-
-WEBCORE_EXPORT void (*wkClearGlyphVector)(void* glyphs);
-WEBCORE_EXPORT OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs);
-WEBCORE_EXPORT id (*wkCreateNSURLConnectionDelegateProxy)(void);
-WEBCORE_EXPORT void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
-WEBCORE_EXPORT void (*wkSetLayerContentsScale)(CALayer *);
-
-WEBCORE_EXPORT bool (*wkCaptionAppearanceHasUserPreferences)(void);
-WEBCORE_EXPORT bool (*wkCaptionAppearanceShowCaptionsWhenAvailable)(void);
-WEBCORE_EXPORT CGColorRef(*wkCaptionAppearanceCopyForegroundColor)(void);
-WEBCORE_EXPORT CGColorRef(*wkCaptionAppearanceCopyBackgroundColor)(void);
-WEBCORE_EXPORT CGColorRef(*wkCaptionAppearanceCopyWindowColor)(void);
-WEBCORE_EXPORT bool(*wkCaptionAppearanceGetForegroundOpacity)(CGFloat*);
-WEBCORE_EXPORT bool(*wkCaptionAppearanceGetBackgroundOpacity)(CGFloat*);
-WEBCORE_EXPORT bool(*wkCaptionAppearanceGetWindowOpacity)(CGFloat*);
-WEBCORE_EXPORT CGFontRef(*wkCaptionAppearanceCopyFontForStyle)(int);
-WEBCORE_EXPORT bool(*wkCaptionAppearanceGetRelativeCharacterSize)(CGFloat*);
-WEBCORE_EXPORT int(*wkCaptionAppearanceGetTextEdgeStyle)(void);
-WEBCORE_EXPORT CFStringRef(*wkCaptionAppearanceGetSettingsChangedNotification)(void);
index 026982c..20aaddf 100644 (file)
@@ -31,7 +31,6 @@
 #import "LegacyTileCache.h"
 #import "PlatformScreen.h"
 #import "WAKViewInternal.h"
-#import "WebCoreSystemInterface.h"
 #import "WebCoreThreadRun.h"
 #import "WebEvent.h"
 #import "WKContentObservation.h"
index 2fe5a43..16a162d 100644 (file)
@@ -26,7 +26,6 @@
 #import "config.h"
 #import "Cursor.h"
 
-#import "WebCoreSystemInterface.h"
 #import <objc/runtime.h>
 #import <pal/spi/mac/HIServicesSPI.h>
 #import <wtf/BlockObjCExceptions.h>
index 0b05093..8f14316 100644 (file)
@@ -29,7 +29,6 @@
 #if PLATFORM(MAC)
 
 #import "WebCoreNSURLExtras.h"
-#import "WebCoreSystemInterface.h"
 #import <pal/spi/mac/MetadataSPI.h>
 #import <wtf/text/WTFString.h>
 
index 7941cd6..dea7a2a 100644 (file)
@@ -30,7 +30,6 @@
 #import "Logging.h"
 #import "PlatformScreen.h"
 #import "Scrollbar.h"
-#import "WebCoreSystemInterface.h"
 #import "WindowsKeyboardCodes.h"
 #import <HIToolbox/CarbonEvents.h>
 #import <HIToolbox/Events.h>
index 35c62be..86f91e1 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "PlatformSpeechSynthesisUtterance.h"
 #include "PlatformSpeechSynthesisVoice.h"
-#include "WebCoreSystemInterface.h"
 #include <AppKit/NSSpeechSynthesizer.h>
 #include <pal/spi/mac/SpeechSynthesisSPI.h>
 #include <wtf/RetainPtr.h>
index 0af3695..fd8990b 100644 (file)
@@ -38,7 +38,6 @@
 #include "ScrollableArea.h"
 #include "ScrollbarTheme.h"
 #include "ScrollbarThemeMac.h"
-#include "WebCoreSystemInterface.h"
 #include <pal/spi/mac/NSScrollerImpSPI.h>
 #include <wtf/BlockObjCExceptions.h>
 #include <wtf/text/TextStream.h>
index 712c449..7b1cee8 100644 (file)
@@ -34,7 +34,6 @@
 #include "PlatformMouseEvent.h"
 #include "ScrollAnimatorMac.h"
 #include "ScrollView.h"
-#include "WebCoreSystemInterface.h"
 #include <Carbon/Carbon.h>
 #include <pal/spi/cg/CoreGraphicsSPI.h>
 #include <pal/spi/mac/NSScrollerImpSPI.h>
index eee528f..4b94fdb 100644 (file)
@@ -33,7 +33,6 @@
 #import "LengthSize.h"
 #import "LocalCurrentGraphicsContext.h"
 #import "ScrollView.h"
-#import "WebCoreSystemInterface.h"
 #import <Carbon/Carbon.h>
 #import <pal/spi/cocoa/NSButtonCellSPI.h>
 #import <pal/spi/mac/NSGraphicsSPI.h>
index 630ad10..e9536d7 100644 (file)
@@ -31,7 +31,6 @@
 #import "WebCoreObjCExtras.h"
 #import "WebCoreNSStringExtras.h"
 #import "WebCoreNSURLExtras.h"
-#import "WebCoreSystemInterface.h"
 #import <wtf/Function.h>
 #import <wtf/HexNumber.h>
 #import <wtf/ObjcRuntimeExtras.h>
diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.h b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
deleted file mode 100644 (file)
index 55fca12..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2006-2017 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. 
- */
-
-#pragma once
-
-#include <objc/objc.h>
-
-typedef const struct __CFString * CFStringRef;
-typedef const struct __CFNumber * CFNumberRef;
-typedef const struct __CFDictionary * CFDictionaryRef;
-typedef struct CGPoint CGPoint;
-typedef struct CGSize CGSize;
-typedef struct CGRect CGRect;
-typedef struct CGAffineTransform CGAffineTransform;
-typedef struct CGContext *CGContextRef;
-typedef struct CGImage *CGImageRef;
-typedef struct CGColor *CGColorRef;
-typedef struct CGFont *CGFontRef;
-typedef struct CGColorSpace *CGColorSpaceRef;
-typedef struct CGPattern *CGPatternRef;
-typedef struct CGPath *CGMutablePathRef;
-typedef unsigned short CGGlyph;
-typedef struct __CFRunLoop * CFRunLoopRef;
-typedef struct __CFHTTPMessage *CFHTTPMessageRef;
-typedef struct _CFURLResponse *CFURLResponseRef;
-typedef const struct _CFURLRequest *CFURLRequestRef;
-typedef const struct __CTFont * CTFontRef;
-typedef const struct __CTLine * CTLineRef;
-typedef const struct __CTRun * CTRunRef;
-typedef const struct __CTTypesetter * CTTypesetterRef;
-typedef const struct __AXUIElement *AXUIElementRef;
-#if !PLATFORM(IOS)
-typedef struct _NSRange NSRange;
-typedef double NSTimeInterval;
-#endif
-
-#if PLATFORM(COCOA) && USE(CA)
-#if !PLATFORM(IOS_SIMULATOR)
-typedef struct __IOSurface *IOSurfaceRef;
-#endif // !PLATFORM(IOS_SIMULATOR)
-#endif
-
-#if !PLATFORM(IOS)
-#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
-typedef struct CGPoint NSPoint;
-typedef struct CGRect NSRect;
-#else
-typedef struct _NSPoint NSPoint;
-typedef struct _NSRect NSRect;
-#endif
-#endif // !PLATFORM(IOS)
-
-#if PLATFORM(IOS)
-#include <CoreGraphics/CoreGraphics.h>
-#endif
-
-#if USE(CFURLCONNECTION)
-typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;
-typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef;
-typedef struct _CFURLCredential* WKCFURLCredentialRef;
-typedef struct _CFURLRequest* CFMutableURLRequestRef;
-typedef const struct _CFURLRequest* CFURLRequestRef;
-#endif
-
-OBJC_CLASS AVAsset;
-OBJC_CLASS AVPlayer;
-OBJC_CLASS CALayer;
-OBJC_CLASS NSArray;
-OBJC_CLASS NSButtonCell;
-OBJC_CLASS NSCell;
-OBJC_CLASS NSControl;
-OBJC_CLASS NSCursor;
-OBJC_CLASS NSData;
-OBJC_CLASS NSDate;
-OBJC_CLASS NSDictionary;
-OBJC_CLASS NSEvent;
-OBJC_CLASS NSFont;
-OBJC_CLASS NSHTTPCookie;
-OBJC_CLASS NSImage;
-OBJC_CLASS NSLocale;
-OBJC_CLASS NSMenu;
-OBJC_CLASS NSMutableURLRequest;
-OBJC_CLASS NSString;
-OBJC_CLASS NSTextFieldCell;
-OBJC_CLASS NSURL;
-OBJC_CLASS NSURLConnection;
-OBJC_CLASS NSURLRequest;
-OBJC_CLASS NSURLResponse;
-OBJC_CLASS NSView;
-OBJC_CLASS NSWindow;
-OBJC_CLASS QTMovie;
-OBJC_CLASS QTMovieView;
-
-extern "C" {
-
-// In alphabetical order.
-
-typedef enum {
-    wkPatternTilingNoDistortion,
-    wkPatternTilingConstantSpacingMinimalDistortion,
-    wkPatternTilingConstantSpacing
-} wkPatternTiling;
-#if !PLATFORM(IOS)
-extern void (*wkDrawMediaSliderTrack)(CGContextRef context, CGRect rect, float timeLoaded, float currentTime,
-    float duration, unsigned state);
-extern void (*wkDrawMediaUIPart)(int part, CGContextRef context, CGRect rect, unsigned state);
-extern double (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
-extern BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
-extern BOOL (*wkHitTestMediaUIPart)(int part, CGRect bounds, CGPoint point);
-extern void (*wkMeasureMediaUIPart)(int part, CGRect *bounds, CGSize *naturalSize);
-
-extern void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
-extern void* wkGetHyphenationLocationBeforeIndex;
-#endif
-
-#if PLATFORM(IOS)
-extern void (*wkSetLayerContentsScale)(CALayer *);
-#endif
-
-typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
-
-}
diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
deleted file mode 100644 (file)
index 8fbb1d3..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2006-2017 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. 
- */
-
-#import "config.h"
-#pragma GCC visibility push(default)
-#import "WebCoreSystemInterface.h"
-#pragma GCC visibility pop
-
-#import <Foundation/Foundation.h>
-
-void (*wkDrawMediaSliderTrack)(CGContextRef context, CGRect rect, float timeLoaded, float currentTime,
-    float duration, unsigned state);
-BOOL (*wkHitTestMediaUIPart)(int part, CGRect bounds, CGPoint point);
-void (*wkDrawMediaUIPart)(int part, CGContextRef context, CGRect rect, unsigned state);
-void (*wkMeasureMediaUIPart)(int part, CGRect *bounds, CGSize *naturalSize);
-NSTimeInterval (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
-BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
-void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*, NSControlSize controlSize, bool usesCustomAppearance);
-
-void* wkGetHyphenationLocationBeforeIndex;
-
-CFStringRef (*wkCopyDefaultSearchProviderDisplayName)(void);
index fc0f510..4496175 100644 (file)
@@ -29,7 +29,6 @@
 
 #import "FloatConversion.h"
 #import <WebCore/HTMLVideoElement.h>
-#import <WebCoreSystemInterface.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/mac/QTKitSPI.h>
 #import <wtf/SoftLinking.h>
index 5f566e0..aa7d92e 100644 (file)
@@ -28,7 +28,6 @@
 #import "WebWindowAnimation.h"
 
 #import "FloatConversion.h"
-#import "WebCoreSystemInterface.h"
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <wtf/Assertions.h>
 #import <wtf/MathExtras.h>
index 6f5f92e..5cfe903 100644 (file)
@@ -32,9 +32,7 @@
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#elif PLATFORM(WIN)
+#if PLATFORM(WIN)
 #include "LoaderRunLoopCF.h"
 #include <CFNetwork/CFHTTPCookiesPriv.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
index d6db6a7..d57f20d 100644 (file)
@@ -34,9 +34,7 @@
 #include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#elif PLATFORM(WIN)
+#if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif
 
index c6b40bd..0b0b7ec 100644 (file)
@@ -33,7 +33,6 @@
 #if PLATFORM(COCOA)
 #include "PublicSuffix.h"
 #include "ResourceRequest.h"
-#include "WebCoreSystemInterface.h"
 #else
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif
index adeb5f2..63fce8b 100644 (file)
@@ -57,7 +57,6 @@
 
 #if PLATFORM(COCOA)
 #include "ResourceHandleCFURLConnectionDelegateWithOperationQueue.h"
-#include "WebCoreSystemInterface.h"
 #if USE(CFURLCONNECTION)
 #include "WebCoreURLResponse.h"
 #include <CFNetwork/CFURLConnectionPriv.h>
index 8926135..b05b87f 100644 (file)
 #include "ResourceHandle.h"
 #include <pal/spi/cf/CFNetworkSPI.h>
 
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
 #if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif
index d9093b1..1722c14 100644 (file)
@@ -35,7 +35,6 @@
 #include "ResourceHandleClient.h"
 #include "ResourceResponse.h"
 #include "SharedBuffer.h"
-#include "WebCoreSystemInterface.h"
 #include "WebCoreURLResponse.h"
 #include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/MainThread.h>
index 9e75ea3..97016e3 100644 (file)
@@ -42,7 +42,6 @@
 
 #if PLATFORM(COCOA)
 #include "ResourceLoadPriority.h"
-#include "WebCoreSystemInterface.h"
 #include <dlfcn.h>
 #endif
 
index 68a3780..e45d391 100644 (file)
 #include "MIMETypeRegistry.h"
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
 namespace WebCore {
 
 static CFStringRef const commonHeaderFields[] = {
index ebcd54b..58f16d8 100644 (file)
@@ -50,8 +50,6 @@
 #if PLATFORM(WIN)
 #include "LoaderRunLoopCF.h"
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
-#else
-#include "WebCoreSystemInterface.h"
 #endif
 
 #if PLATFORM(IOS) || PLATFORM(MAC)
index 8e4d3ab..205a6f3 100644 (file)
@@ -41,7 +41,6 @@
 #include <wtf/text/WTFString.h>
 
 #if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
 #include "WebCoreURLResponse.h"
 #include <pal/spi/cf/CFNetworkSPI.h>
 #endif // PLATFORM(COCOA)
index 79faef0..c7575d7 100644 (file)
@@ -33,7 +33,6 @@
 #import "HTTPHeaderNames.h"
 #import "ResourceRequestCFNet.h"
 #import "RuntimeApplicationChecks.h"
-#import "WebCoreSystemInterface.h"
 #import <Foundation/Foundation.h>
 #import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/text/CString.h>
index 517875d..c729d6c 100644 (file)
@@ -31,7 +31,6 @@
 
 #import "QuickLook.h"
 #import "UTIUtilities.h"
-#import "WebCoreSystemInterface.h"
 #import <MobileCoreServices/MobileCoreServices.h>
 
 #import "QuickLookSoftLink.h"
index 17aea02..7e2655b 100644 (file)
@@ -28,7 +28,6 @@
 
 #import "CookiesStrategy.h"
 #import "NetworkStorageSession.h"
-#import "WebCoreSystemInterface.h"
 #import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 
index 7bf3610..3940dbe 100644 (file)
@@ -46,7 +46,6 @@
 #import "SynchronousLoaderClient.h"
 #import "WebCoreResourceHandleAsDelegate.h"
 #import "WebCoreResourceHandleAsOperationQueueDelegate.h"
-#import "WebCoreSystemInterface.h"
 #import "WebCoreURLResponse.h"
 #import <pal/spi/cf/CFNetworkSPI.h>
 #import <pal/spi/cocoa/NSURLConnectionSPI.h>
index ccd9036..4cc9e72 100644 (file)
@@ -31,7 +31,6 @@
 
 #import "MIMETypeRegistry.h"
 #import "UTIUtilities.h"
-#import "WebCoreSystemInterface.h"
 #import <wtf/Assertions.h>
 #import <wtf/RetainPtr.h>
 
index 59e1499..c6ae862 100644 (file)
 #include <wtf/StdLibExtras.h>
 #include <wtf/StringExtras.h>
 
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
 #if PLATFORM(MAC)
 #include "TextCodecMac.h"
 #endif
index 9287d40..d08d804 100644 (file)
@@ -68,7 +68,6 @@
 #import "UTIUtilities.h"
 #import "UserAgentScripts.h"
 #import "UserAgentStyleSheets.h"
-#import "WebCoreSystemInterface.h"
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <math.h>
index c319227..c3c0436 100644 (file)
@@ -1,5 +1,14 @@
 2017-10-04  Alex Christensen  <achristensen@webkit.org>
 
+        Remove WebCoreSystemInterface
+        https://bugs.webkit.org/show_bug.cgi?id=177916
+
+        Reviewed by Antti Koivisto.
+
+        * Misc/WebUIKitSupport.mm:
+
+2017-10-04  Alex Christensen  <achristensen@webkit.org>
+
         Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
         https://bugs.webkit.org/show_bug.cgi?id=177912
 
index 4de4056..1509687 100644 (file)
@@ -36,7 +36,6 @@
 #import <WebCore/ResourceRequest.h>
 #import <WebCore/Settings.h>
 #import <WebCore/WebBackgroundTaskController.h>
-#import <WebCore/WebCoreSystemInterface.h>
 #import <WebCore/WebCoreThreadSystemInterface.h>
 #import <wtf/spi/darwin/dyldSPI.h>