Diff
Modified: trunk/Source/WebCore/ChangeLog (222897 => 222898)
--- trunk/Source/WebCore/ChangeLog 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/ChangeLog 2017-10-05 06:13:51 UTC (rev 222898)
@@ -1,5 +1,76 @@
2017-10-04 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
https://bugs.webkit.org/show_bug.cgi?id=177912
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (222897 => 222898)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2017-10-05 06:13:51 UTC (rev 222898)
@@ -120,7 +120,7 @@
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 n
pruntime.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_intern
al.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;
Modified: trunk/Source/WebCore/PlatformMac.cmake (222897 => 222898)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-10-05 06:13:51 UTC (rev 222898)
@@ -524,7 +524,6 @@
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 @@
platform/graphics/transforms/AffineTransform.h
- platform/mac/WebCoreSystemInterface.h
-
platform/network/cf/CertificateInfo.h
platform/network/cf/ResourceResponse.h
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (222897 => 222898)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-10-05 06:13:51 UTC (rev 222898)
@@ -3963,8 +3963,6 @@
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, ); }; };
@@ -6874,7 +6872,6 @@
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 */; };
@@ -12337,8 +12334,6 @@
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>"; };
@@ -15663,7 +15658,6 @@
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>"; };
@@ -19585,8 +19579,6 @@
C5B4C24C1509236C00A6EF37 /* WebCoreNSURLExtras.mm */,
DD05FE0B0B8BA3C6009ACDFE /* WebCoreObjCExtras.h */,
B50F5B800E96CD9900AD71A6 /* WebCoreObjCExtras.mm */,
- 93EB169609F880C00091F8FF /* WebCoreSystemInterface.h */,
- 93EB169409F880B00091F8FF /* WebCoreSystemInterface.mm */,
BE855F7F0701E83500239769 /* WebCoreView.h */,
BE8560510701F91100239769 /* WebCoreView.m */,
1AFFC4511D5E7EC700267A66 /* WebGLBlacklist.h */,
@@ -21719,7 +21711,6 @@
1F36EA9B1E21BA1700621E25 /* WebBackgroundTaskController.mm */,
31403797124BEA7F00AF40E4 /* WebCoreMotionManager.h */,
31403798124BEA7F00AF40E4 /* WebCoreMotionManager.mm */,
- E45390380EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm */,
FE0D84E810484348001A179E /* WebEvent.h */,
FE0D84EA1048436E001A179E /* WebEvent.mm */,
F482230F1E3869B80066FC79 /* WebItemProviderPasteboard.h */,
@@ -30634,7 +30625,6 @@
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 */,
@@ -34408,8 +34398,6 @@
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 */,
Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (222897 => 222898)
--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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)
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (222897 => 222898)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -62,7 +62,6 @@
#import "VisibleUnits.h"
#import "WebCoreFrameView.h"
#import "WebCoreObjCExtras.h"
-#import "WebCoreSystemInterface.h"
using namespace WebCore;
using namespace HTMLNames;
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (222897 => 222898)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/dom/Document.cpp (222897 => 222898)
--- trunk/Source/WebCore/dom/Document.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -237,7 +237,6 @@
#include "Navigator.h"
#include "NavigatorGeolocation.h"
#include "WKContentObservation.h"
-#include "WebCoreSystemInterface.h"
#endif
#if ENABLE(IOS_GESTURE_EVENTS)
Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.mm (222897 => 222898)
--- trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (222897 => 222898)
--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -65,7 +65,6 @@
#import "VisiblePosition.h"
#import "VisibleUnits.h"
#import "WAKWindow.h"
-#import "WebCoreSystemInterface.h"
#import <runtime/JSLock.h>
#import <wtf/BlockObjCExceptions.h>
Modified: trunk/Source/WebCore/page/ios/UserAgentIOS.mm (222897 => 222898)
--- trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (222897 => 222898)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/cocoa/ScrollController.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -28,7 +28,6 @@
#import "LayoutSize.h"
#import "PlatformWheelEvent.h"
-#import "WebCoreSystemInterface.h"
#import "WheelEventTestTrigger.h"
#import <sys/sysctl.h>
#import <sys/time.h>
Modified: trunk/Source/WebCore/platform/graphics/Font.h (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/Font.h 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2017-10-05 06:13:51 UTC (rev 222898)
@@ -39,7 +39,6 @@
#include <wtf/text/StringHash.h>
#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
#include <wtf/RetainPtr.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -63,7 +63,6 @@
#import "WebCoreAVFResourceLoader.h"
#import "WebCoreCALayerExtras.h"
#import "WebCoreNSURLSession.h"
-#import "WebCoreSystemInterface.h"
#import <functional>
#import <map>
#import <objc/runtime.h>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -63,7 +63,6 @@
#if PLATFORM(COCOA)
#include "PlatformCAAnimationCocoa.h"
#include "PlatformCALayerCocoa.h"
-#include "WebCoreSystemInterface.h"
#endif
#if PLATFORM(WIN)
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -48,10 +48,6 @@
#include <wtf/RetainPtr.h>
#include <wtf/text/TextStream.h>
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
#if PLATFORM(WIN)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -48,7 +48,6 @@
#if PLATFORM(COCOA)
#include "UTIUtilities.h"
-#include "WebCoreSystemInterface.h"
#endif
#if USE(IOSURFACE_CANVAS_BACKING_STORE)
Modified: trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -39,10 +39,6 @@
#include <wtf/RetainPtr.h>
#include <wtf/text/WTFString.h>
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
#if PLATFORM(WIN)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -35,10 +35,6 @@
#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
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -25,7 +25,6 @@
#import "FontPlatformData.h"
#import "SharedBuffer.h"
-#import "WebCoreSystemInterface.h"
#import <pal/spi/cocoa/CoreTextSPI.h>
#import <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -163,7 +163,7 @@
#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 @@
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,14 +186,11 @@
usingDot = true;
return adoptCF(WKCreatePatternFromCGImage(image.get()));
}
-#endif // !PLATFORM(IOS)
+#endif // PLATFORM(MAC)
-static NSImage *spellingImage = nullptr;
-static NSImage *grammarImage = nullptr;
-static NSImage *correctionImage = nullptr;
-
void GraphicsContext::updateDocumentMarkerResources()
{
+#if PLATFORM(MAC)
[spellingImage release];
spellingImage = nullptr;
[grammarImage release];
@@ -197,6 +197,7 @@
grammarImage = nullptr;
[correctionImage release];
correctionImage = nullptr;
+#endif
}
static inline void setPatternPhaseInUserSpace(CGContextRef context, CGPoint phasePoint)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2017-10-05 06:13:51 UTC (rev 222898)
@@ -27,6 +27,7 @@
#if USE(IOSURFACE)
+#include <objc/objc.h>
#include "GraphicsContext.h"
#include "IntSize.h"
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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)
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Deleted: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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);
Modified: trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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"
Modified: trunk/Source/WebCore/platform/mac/CursorMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/CursorMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/CursorMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/mac/FileSystemMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/FileSystemMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/FileSystemMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -29,7 +29,6 @@
#if PLATFORM(MAC)
#import "WebCoreNSURLExtras.h"
-#import "WebCoreSystemInterface.h"
#import <pal/spi/mac/MetadataSPI.h>
#import <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Deleted: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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;
-
-}
Deleted: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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);
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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
Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -33,7 +33,6 @@
#if PLATFORM(COCOA)
#include "PublicSuffix.h"
#include "ResourceRequest.h"
-#include "WebCoreSystemInterface.h"
#else
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -57,7 +57,6 @@
#if PLATFORM(COCOA)
#include "ResourceHandleCFURLConnectionDelegateWithOperationQueue.h"
-#include "WebCoreSystemInterface.h"
#if USE(CFURLCONNECTION)
#include "WebCoreURLResponse.h"
#include <CFNetwork/CFURLConnectionPriv.h>
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -33,10 +33,6 @@
#include "ResourceHandle.h"
#include <pal/spi/cf/CFNetworkSPI.h>
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
#if PLATFORM(WIN)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -42,7 +42,6 @@
#if PLATFORM(COCOA)
#include "ResourceLoadPriority.h"
-#include "WebCoreSystemInterface.h"
#include <dlfcn.h>
#endif
Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -34,10 +34,6 @@
#include "MIMETypeRegistry.h"
#include <wtf/RetainPtr.h>
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
namespace WebCore {
static CFStringRef const commonHeaderFields[] = {
Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -50,8 +50,6 @@
#if PLATFORM(WIN)
#include "LoaderRunLoopCF.h"
#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#else
-#include "WebCoreSystemInterface.h"
#endif
#if PLATFORM(IOS) || PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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)
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -31,7 +31,6 @@
#import "QuickLook.h"
#import "UTIUtilities.h"
-#import "WebCoreSystemInterface.h"
#import <MobileCoreServices/MobileCoreServices.h>
#import "QuickLookSoftLink.h"
Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -28,7 +28,6 @@
#import "CookiesStrategy.h"
#import "NetworkStorageSession.h"
-#import "WebCoreSystemInterface.h"
#import <pal/spi/cf/CFNetworkSPI.h>
#import <wtf/BlockObjCExceptions.h>
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm (222897 => 222898)
--- trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -31,7 +31,6 @@
#import "MIMETypeRegistry.h"
#import "UTIUtilities.h"
-#import "WebCoreSystemInterface.h"
#import <wtf/Assertions.h>
#import <wtf/RetainPtr.h>
Modified: trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp (222897 => 222898)
--- trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2017-10-05 06:13:51 UTC (rev 222898)
@@ -43,10 +43,6 @@
#include <wtf/StdLibExtras.h>
#include <wtf/StringExtras.h>
-#if PLATFORM(COCOA)
-#include "WebCoreSystemInterface.h"
-#endif
-
#if PLATFORM(MAC)
#include "TextCodecMac.h"
#endif
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (222897 => 222898)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
Modified: trunk/Source/WebKitLegacy/ios/ChangeLog (222897 => 222898)
--- trunk/Source/WebKitLegacy/ios/ChangeLog 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebKitLegacy/ios/ChangeLog 2017-10-05 06:13:51 UTC (rev 222898)
@@ -1,5 +1,14 @@
2017-10-04 Alex Christensen <[email protected]>
+ Remove WebCoreSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=177916
+
+ Reviewed by Antti Koivisto.
+
+ * Misc/WebUIKitSupport.mm:
+
+2017-10-04 Alex Christensen <[email protected]>
+
Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
https://bugs.webkit.org/show_bug.cgi?id=177912
Modified: trunk/Source/WebKitLegacy/ios/Misc/WebUIKitSupport.mm (222897 => 222898)
--- trunk/Source/WebKitLegacy/ios/Misc/WebUIKitSupport.mm 2017-10-05 05:46:49 UTC (rev 222897)
+++ trunk/Source/WebKitLegacy/ios/Misc/WebUIKitSupport.mm 2017-10-05 06:13:51 UTC (rev 222898)
@@ -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>
