Title: [222896] trunk
Revision
222896
Author
[email protected]
Date
2017-10-04 21:30:40 -0700 (Wed, 04 Oct 2017)

Log Message

Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
https://bugs.webkit.org/show_bug.cgi?id=177912

Reviewed by Saam Barati.

Source/WebCore:

* WebCore.xcodeproj/project.pbxproj:
Also stop compiling RenderMediaControls.cpp on Cocoa platforms.  It's not used.

Source/WebKit:

* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
* NetworkProcess/mac/NetworkProcessMac.mm:
* NetworkProcess/mac/RemoteNetworkingContext.mm:
* Platform/IPC/mac/ConnectionMac.mm:
* Platform/mac/LayerHostingContext.mm:
* PluginProcess/mac/PluginProcessMac.mm:
* PluginProcess/mac/PluginProcessShim.mm:
* Shared/ios/ChildProcessIOS.mm:
* Shared/mac/ChildProcessMac.mm:
* Shared/mac/SandboxExtensionMac.mm:
* Shared/mac/WebCoreArgumentCodersMac.mm:
* Shared/mac/WebEventFactory.mm:
* StorageProcess/ios/StorageProcessIOS.mm:
* StorageProcess/mac/StorageProcessMac.mm:
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/Cocoa/PlaybackSessionManagerProxy.mm:
* UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
* UIProcess/Cocoa/WebViewImpl.mm:
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
* UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
* UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
* UIProcess/mac/PageClientImplMac.mm:
* UIProcess/mac/WKTextInputWindowController.mm:
* UIProcess/mac/WebContextMenuProxyMac.mm:
* UIProcess/mac/WebPopupMenuProxyMac.mm:
* UIProcess/mac/WindowServerConnection.mm:
* WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
* WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
* WebProcess/WebPage/ios/WebPageIOS.mm:
* WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:
* WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
* WebProcess/WebPage/mac/WebPageMac.mm:
* WebProcess/cocoa/WebProcessCocoa.mm:

Source/WebKitLegacy/ios:

* Misc/WebUIKitSupport.mm:
* WebCoreSupport/WebChromeClientIOS.mm:

Source/WebKitLegacy/mac:

* Carbon/CarbonUtils.m:
* Carbon/CarbonWindowAdapter.mm:
* Carbon/HIWebView.mm:
* DefaultDelegates/WebDefaultContextMenuDelegate.mm:
* Misc/WebNSFileManagerExtras.mm:
* Misc/WebNSPasteboardExtras.mm:
* Misc/WebNSURLExtras.mm:
* Plugins/Hosted/HostedNetscapePluginStream.mm:
* Plugins/Hosted/NetscapePluginHostManager.mm:
* Plugins/Hosted/NetscapePluginHostProxy.mm:
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
* Plugins/Hosted/WebHostedNetscapePluginView.h:
* Plugins/Hosted/WebTextInputWindowController.m:
* Plugins/WebBaseNetscapePluginView.mm:
* Plugins/WebNetscapePluginEventHandlerCarbon.mm:
* Plugins/WebNetscapePluginEventHandlerCocoa.mm:
* Plugins/WebNetscapePluginStream.mm:
* Plugins/WebNetscapePluginView.mm:
* Plugins/WebPluginDatabase.mm:
* WebCoreSupport/PopupMenuMac.mm:
* WebCoreSupport/WebChromeClient.mm:
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebCoreSupport/WebInspectorClient.mm:
* WebCoreSupport/WebPlatformStrategies.mm:
* WebCoreSupport/WebSystemInterface.mm:
* WebView/WebDynamicScrollBarsView.mm:
* WebView/WebFrame.mm:
* WebView/WebFrameView.mm:
* WebView/WebFullScreenController.mm:
* WebView/WebHTMLView.mm:
* WebView/WebPreferences.mm:
* WebView/WebView.mm:

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm:

Modified Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (222895 => 222896)


--- trunk/Source/WebCore/ChangeLog	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebCore/ChangeLog	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1,3 +1,13 @@
+2017-10-04  Alex Christensen  <[email protected]>
+
+        Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
+        https://bugs.webkit.org/show_bug.cgi?id=177912
+
+        Reviewed by Saam Barati.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        Also stop compiling RenderMediaControls.cpp on Cocoa platforms.  It's not used.
+
 2017-09-30  Yusuke Suzuki  <[email protected]>
 
         [JSC] Introduce import.meta

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (222895 => 222896)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1826,8 +1826,6 @@
 		41F54F8B1C50C50300338488 /* FetchBody.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F54F7D1C50C4F600338488 /* FetchBody.cpp */; };
 		41F54F8D1C50C50800338488 /* FetchHeaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F54F821C50C4F600338488 /* FetchHeaders.cpp */; };
 		41F54F8E1C50C50C00338488 /* FetchRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F54F871C50C4F600338488 /* FetchRequest.cpp */; };
-		41FA303E1316C29C00C0BFC5 /* RenderMediaControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */; };
-		41FA303F1316C29C00C0BFC5 /* RenderMediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */; };
 		41FABD2D1F4DFE4A006A6C97 /* DOMCacheEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FABD2B1F4DFE42006A6C97 /* DOMCacheEngine.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		41FABD2F1F4E02CB006A6C97 /* DOMCacheEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FABD2E1F4E0251006A6C97 /* DOMCacheEngine.cpp */; };
 		41FB279C1F34DB8A00795487 /* DOMWindowCaches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FB278E1F34C28200795487 /* DOMWindowCaches.cpp */; };
@@ -9638,8 +9636,6 @@
 		41F54F871C50C4F600338488 /* FetchRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FetchRequest.cpp; sourceTree = "<group>"; };
 		41F54F881C50C4F600338488 /* FetchRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchRequest.h; sourceTree = "<group>"; };
 		41F54F891C50C4F600338488 /* FetchRequest.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FetchRequest.idl; sourceTree = "<group>"; };
-		41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMediaControls.cpp; sourceTree = "<group>"; };
-		41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMediaControls.h; sourceTree = "<group>"; };
 		41FABD2B1F4DFE42006A6C97 /* DOMCacheEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCacheEngine.h; sourceTree = "<group>"; };
 		41FABD2E1F4E0251006A6C97 /* DOMCacheEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMCacheEngine.cpp; sourceTree = "<group>"; };
 		41FB278C1F34C28200795487 /* DOMWindowCaches.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMWindowCaches.h; sourceTree = "<group>"; };
@@ -17700,8 +17696,8 @@
 				07B0ABCE1032242200FBDC33 /* AccessibilityMathMLElement.h */,
 				2981CAA4131822EC00D12F2A /* AccessibilityMediaControls.cpp */,
 				07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */,
+				A9787CB31F5F5C6500C551C6 /* AccessibilityMediaObject.cpp */,
 				A9787CB21F5F599200C551C6 /* AccessibilityMediaObject.h */,
-				A9787CB31F5F5C6500C551C6 /* AccessibilityMediaObject.cpp */,
 				76CDD2EC1103DA6600680521 /* AccessibilityMenuList.cpp */,
 				76CDD2ED1103DA6600680521 /* AccessibilityMenuList.h */,
 				76CDD2F01103DA6600680521 /* AccessibilityMenuListOption.cpp */,
@@ -25961,8 +25957,6 @@
 				E4C279570CF9741900E97B98 /* RenderMedia.h */,
 				DE49B307165F2FE10010338D /* RenderMediaControlElements.cpp */,
 				DE49B308165F2FE10010338D /* RenderMediaControlElements.h */,
-				41FA303C1316C29C00C0BFC5 /* RenderMediaControls.cpp */,
-				41FA303D1316C29C00C0BFC5 /* RenderMediaControls.h */,
 				ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */,
 				ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */,
 				A454424C119B3687009BE912 /* RenderMeter.cpp */,
@@ -29703,7 +29697,6 @@
 				439046EA12DA25E800AF80A2 /* RenderMathMLUnderOver.h in Headers */,
 				E4C279590CF9741900E97B98 /* RenderMedia.h in Headers */,
 				DEBCCDD216646E8200A452E1 /* RenderMediaControlElements.h in Headers */,
-				41FA303F1316C29C00C0BFC5 /* RenderMediaControls.h in Headers */,
 				ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */,
 				A454424F119B3687009BE912 /* RenderMeter.h in Headers */,
 				1A3586E015264C450022A659 /* RenderMultiColumnFlow.h in Headers */,
@@ -31196,6 +31189,7 @@
 				37F57ABF1A50728100876F98 /* AccessibilityListBoxOption.cpp in Sources */,
 				37F57ABC1A50728400876F98 /* AccessibilityMathMLElement.cpp in Sources */,
 				37F57AC01A50728400876F98 /* AccessibilityMediaControls.cpp in Sources */,
+				A9787CB41F5F5C6600C551C6 /* AccessibilityMediaObject.cpp in Sources */,
 				76CDD2F21103DA6600680521 /* AccessibilityMenuList.cpp in Sources */,
 				76CDD2F61103DA6600680521 /* AccessibilityMenuListOption.cpp in Sources */,
 				76CDD2F41103DA6600680521 /* AccessibilityMenuListPopup.cpp in Sources */,
@@ -31206,7 +31200,6 @@
 				29A812480FBB9CA900510293 /* AccessibilityObjectMac.mm in Sources */,
 				37F57AC31A50728F00876F98 /* AccessibilityProgressIndicator.cpp in Sources */,
 				37F57AC41A50729300876F98 /* AccessibilityRenderObject.cpp in Sources */,
-				A9787CB41F5F5C6600C551C6 /* AccessibilityMediaObject.cpp in Sources */,
 				37F57AC51A50729700876F98 /* AccessibilityScrollbar.cpp in Sources */,
 				37F57AC61A50729B00876F98 /* AccessibilityScrollView.cpp in Sources */,
 				37F57AC81A5072BC00876F98 /* AccessibilitySlider.cpp in Sources */,
@@ -33666,7 +33659,6 @@
 				439046E912DA25E800AF80A2 /* RenderMathMLUnderOver.cpp in Sources */,
 				E4C279580CF9741900E97B98 /* RenderMedia.cpp in Sources */,
 				DE49B309165F2FE10010338D /* RenderMediaControlElements.cpp in Sources */,
-				41FA303E1316C29C00C0BFC5 /* RenderMediaControls.cpp in Sources */,
 				ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */,
 				A454424E119B3687009BE912 /* RenderMeter.cpp in Sources */,
 				1A3586DF15264C450022A659 /* RenderMultiColumnFlow.cpp in Sources */,

Modified: trunk/Source/WebKit/ChangeLog (222895 => 222896)


--- trunk/Source/WebKit/ChangeLog	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/ChangeLog	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1,3 +1,49 @@
+2017-10-04  Alex Christensen  <[email protected]>
+
+        Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
+        https://bugs.webkit.org/show_bug.cgi?id=177912
+
+        Reviewed by Saam Barati.
+
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        * NetworkProcess/mac/NetworkProcessMac.mm:
+        * NetworkProcess/mac/RemoteNetworkingContext.mm:
+        * Platform/IPC/mac/ConnectionMac.mm:
+        * Platform/mac/LayerHostingContext.mm:
+        * PluginProcess/mac/PluginProcessMac.mm:
+        * PluginProcess/mac/PluginProcessShim.mm:
+        * Shared/ios/ChildProcessIOS.mm:
+        * Shared/mac/ChildProcessMac.mm:
+        * Shared/mac/SandboxExtensionMac.mm:
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        * Shared/mac/WebEventFactory.mm:
+        * StorageProcess/ios/StorageProcessIOS.mm:
+        * StorageProcess/mac/StorageProcessMac.mm:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        * UIProcess/Cocoa/PlaybackSessionManagerProxy.mm:
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
+        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
+        * UIProcess/mac/PageClientImplMac.mm:
+        * UIProcess/mac/WKTextInputWindowController.mm:
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        * UIProcess/mac/WebPopupMenuProxyMac.mm:
+        * UIProcess/mac/WindowServerConnection.mm:
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        * WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm:
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+
 2017-10-04  Youenn Fablet  <[email protected]>
 
         rtc::PacketOptions should have its own IPC encoding/decoding routines

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (222895 => 222896)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -39,7 +39,6 @@
 #import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SecurityOriginData.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/BlockPtr.h>
 

Modified: trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm (222895 => 222896)


--- trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -39,7 +39,6 @@
 #import <WebCore/CertificateInfo.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/LocalizedStrings.h>
-#import <WebKitSystemInterface.h>
 #import <notify.h>
 #import <pal/spi/cf/CFNetworkSPI.h>
 #import <pal/spi/cocoa/LaunchServicesSPI.h>

Modified: trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm (222895 => 222896)


--- trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -35,7 +35,6 @@
 #import "WebsiteDataStoreParameters.h"
 #import <WebCore/NetworkStorageSession.h>
 #import <WebCore/ResourceError.h>
-#import <WebKitSystemInterface.h>
 #import <wtf/MainThread.h>
 
 using namespace WebCore;

Modified: trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm (222895 => 222896)


--- trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -33,7 +33,6 @@
 #import "MachUtilities.h"
 #import "WKCrashReporter.h"
 #import <WebCore/AXObjectCache.h>
-#import <WebKitSystemInterface.h>
 #import <mach/mach_error.h>
 #import <mach/vm_map.h>
 #import <sys/mman.h>

Modified: trunk/Source/WebKit/Platform/mac/LayerHostingContext.mm (222895 => 222896)


--- trunk/Source/WebKit/Platform/mac/LayerHostingContext.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/Platform/mac/LayerHostingContext.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -27,7 +27,6 @@
 #import "LayerHostingContext.h"
 
 #import <WebCore/MachSendRight.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 

Modified: trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm (222895 => 222896)


--- trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -39,7 +39,6 @@
 #import "SandboxUtilities.h"
 #import <CoreAudio/AudioHardware.h>
 #import <WebCore/LocalizedStrings.h>
-#import <WebKitSystemInterface.h>
 #import <dlfcn.h>
 #import <mach-o/dyld.h>
 #import <mach-o/getsect.h>

Modified: trunk/Source/WebKit/PluginProcess/mac/PluginProcessShim.mm (222895 => 222896)


--- trunk/Source/WebKit/PluginProcess/mac/PluginProcessShim.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/PluginProcess/mac/PluginProcessShim.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -31,7 +31,6 @@
 #import <AppKit/AppKit.h>
 #import <Carbon/Carbon.h>
 #import <WebCore/DynamicLinkerInterposing.h>
-#import <WebKitSystemInterface.h>
 #import <mach/mach_vm.h>
 #import <objc/message.h>
 #import <stdio.h>

Modified: trunk/Source/WebKit/Shared/Cocoa/WebKit2InitializeCocoa.mm (222895 => 222896)


--- trunk/Source/WebKit/Shared/Cocoa/WebKit2InitializeCocoa.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/Shared/Cocoa/WebKit2InitializeCocoa.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -27,7 +27,6 @@
 #import "WebKit2Initialize.h"
 
 #import "LogInitialization.h"
-#import "WebSystemInterface.h"
 #import <WebCore/LogInitialization.h>
 #import <mutex>
 #import <runtime/InitializeThreading.h>
@@ -44,7 +43,6 @@
 
 static void runInitializationCode(void* = nullptr)
 {
-    InitWebCoreSystemInterface();
 #if PLATFORM(IOS)
     InitWebCoreThreadSystemInterface();
 #endif

Modified: trunk/Source/WebKit/Shared/ios/ChildProcessIOS.mm (222895 => 222896)


--- trunk/Source/WebKit/Shared/ios/ChildProcessIOS.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/Shared/ios/ChildProcessIOS.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -30,7 +30,6 @@
 #import "ChildProcess.h"
 
 #import "SandboxInitializationParameters.h"
-#import "WebKitSystemInterface.h"
 #import "XPCServiceEntryPoint.h"
 #import <WebCore/FileSystem.h>
 #import <WebCore/FloatingPointEnvironment.h>

Modified: trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm (222895 => 222896)


--- trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -32,7 +32,6 @@
 #import "CookieStorageUtilsCF.h"
 #import "QuarantineSPI.h"
 #import "SandboxInitializationParameters.h"
-#import "WebKitSystemInterface.h"
 #import <WebCore/FileSystem.h>
 #import <WebCore/ScopeGuard.h>
 #import <WebCore/SystemVersion.h>

Modified: trunk/Source/WebKit/Shared/mac/SandboxExtensionMac.mm (222895 => 222896)


--- trunk/Source/WebKit/Shared/mac/SandboxExtensionMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/Shared/mac/SandboxExtensionMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -31,7 +31,6 @@
 #import "DataReference.h"
 #import "Decoder.h"
 #import "Encoder.h"
-#import "WebKitSystemInterface.h"
 #import <WebCore/FileSystem.h>
 #import <sys/stat.h>
 #import <wtf/spi/darwin/SandboxSPI.h>

Modified: trunk/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm (222895 => 222896)


--- trunk/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -29,7 +29,6 @@
 
 #import "ArgumentCodersCF.h"
 #import "DataReference.h"
-#import "WebKitSystemInterface.h"
 #import <WebCore/CertificateInfo.h>
 #import <WebCore/ContentFilterUnblockHandler.h>
 #import <WebCore/Credential.h>

Modified: trunk/Source/WebKit/Shared/mac/WebEventFactory.mm (222895 => 222896)


--- trunk/Source/WebKit/Shared/mac/WebEventFactory.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/Shared/mac/WebEventFactory.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -28,7 +28,6 @@
 
 #if USE(APPKIT)
 
-#import "WebKitSystemInterface.h"
 #import <WebCore/KeyboardEvent.h>
 #import <WebCore/PlatformEventFactoryMac.h>
 #import <WebCore/Scrollbar.h>

Modified: trunk/Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm (222895 => 222896)


--- trunk/Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -33,7 +33,6 @@
 #import <WebCore/FileSystem.h>
 #import <WebCore/LocalizedStrings.h>
 #import <WebCore/NotImplemented.h>
-#import <WebKitSystemInterface.h>
 
 using namespace WebCore;
 

Modified: trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm (222895 => 222896)


--- trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -32,7 +32,6 @@
 #import "SandboxInitializationParameters.h"
 #import <WebCore/FileSystem.h>
 #import <WebCore/LocalizedStrings.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cocoa/LaunchServicesSPI.h>
 
 using namespace WebCore;

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -72,7 +72,6 @@
 #import "WebBackForwardList.h"
 #import "WebCertificateInfo.h"
 #import "WebFullScreenManagerProxy.h"
-#import "WebKitSystemInterface.h"
 #import "WebPageGroup.h"
 #import "WebPageProxy.h"
 #import "WebPreferencesKeys.h"

Modified: trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -32,7 +32,6 @@
 #import "PlaybackSessionManagerProxyMessages.h"
 #import "WebPageProxy.h"
 #import "WebProcessProxy.h"
-#import <WebKitSystemInterface.h>
 
 using namespace WebCore;
 

Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -39,7 +39,6 @@
 #import <WebCore/MachSendRight.h>
 #import <WebCore/MediaPlayerEnums.h>
 #import <WebCore/TimeRanges.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 #if PLATFORM(IOS)

Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -36,7 +36,6 @@
 #import "TextChecker.h"
 #import "VersionChecks.h"
 #import "WKBrowsingContextControllerInternal.h"
-#import "WebKitSystemInterface.h"
 #import "WebPageGroup.h"
 #import "WebPreferencesKeys.h"
 #import "WebProcessCreationParameters.h"

Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -85,7 +85,6 @@
 #import <WebCore/WebCoreFullScreenWindow.h>
 #import <WebCore/WebCoreNSStringExtras.h>
 #import <WebCore/WebPlaybackControlsManager.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/cocoa/AVKitSPI.h>
 #import <pal/spi/cocoa/NSTouchBarSPI.h>

Modified: trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -31,7 +31,6 @@
 #import "PluginProcessCreationParameters.h"
 #import "PluginProcessMessages.h"
 #import "SandboxUtilities.h"
-#import "WebKitSystemInterface.h"
 #import <QuartzCore/CARemoteLayerServer.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/URL.h>

Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -39,7 +39,6 @@
 #import <WebCore/PlatformLayer.h>
 #import <WebCore/WebActionDisablingCALayerDelegate.h>
 #import <WebCore/WebCoreCALayerExtras.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 #if PLATFORM(IOS)

Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -29,7 +29,6 @@
 #if PLATFORM(IOS)
 
 #import "UIKitSPI.h"
-#import "WebKitSystemInterface.h"
 #import <UIKit/UIScrollView.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 

Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/ios/WKContentView.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -50,7 +50,6 @@
 #import "WebKit2Initialize.h"
 #import "WebPageGroup.h"
 #import "WebProcessPool.h"
-#import "WebSystemInterface.h"
 #import "_WKFrameHandleInternal.h"
 #import "_WKWebViewPrintFormatterInternal.h"
 #import <CoreGraphics/CoreGraphics.h>

Modified: trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -70,7 +70,6 @@
 #import <WebCore/TextUndoInsertionMarkupMac.h>
 #import <WebCore/ValidationBubble.h>
 #import <WebCore/WebCoreCALayerExtras.h>
-#import <WebKitSystemInterface.h>
 #import <wtf/text/CString.h>
 #import <wtf/text/WTFString.h>
 

Modified: trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -28,7 +28,8 @@
 
 #if USE(APPKIT)
 
-#import <WebKitSystemInterface.h>
+#import <HIToolbox/CarbonEventsCore.h>
+#import <pal/spi/mac/HIToolboxSPI.h>
 #import <pal/system/mac/WebPanel.h>
 
 @interface WKTextInputView : NSTextView {

Modified: trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -43,7 +43,6 @@
 #import "WebProcessProxy.h"
 #import <WebCore/GraphicsContext.h>
 #import <WebCore/IntRect.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/mac/NSMenuSPI.h>
 #import <pal/spi/mac/NSSharingServicePickerSPI.h>
 #import <pal/spi/mac/NSSharingServiceSPI.h>

Modified: trunk/Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -33,7 +33,6 @@
 #import "PlatformPopupMenuData.h"
 #import "StringUtilities.h"
 #import "WebPopupItem.h"
-#import <WebKitSystemInterface.h>
 #import <pal/system/mac/PopupMenu.h>
 
 using namespace WebCore;

Modified: trunk/Source/WebKit/UIProcess/mac/WindowServerConnection.mm (222895 => 222896)


--- trunk/Source/WebKit/UIProcess/mac/WindowServerConnection.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/UIProcess/mac/WindowServerConnection.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -26,7 +26,6 @@
 #import "config.h"
 #import "WindowServerConnection.h"
 
-#import "WebKitSystemInterface.h"
 #import "WebProcessPool.h"
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 

Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (222895 => 222896)


--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1819,8 +1819,6 @@
 		BCC43ABB127B95DC00317F16 /* PlatformPopupMenuData.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC43AB9127B95DC00317F16 /* PlatformPopupMenuData.h */; };
 		BCC43AC7127B99DE00317F16 /* WebPopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC43AC6127B99DE00317F16 /* WebPopupMenuMac.mm */; };
 		BCC56F791159957D001CCAF9 /* MachPort.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC56F771159957D001CCAF9 /* MachPort.h */; };
-		BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */; };
-		BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */; };
 		BCC8B374125FB69000DE46A4 /* WKGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC8B373125FB69000DE46A4 /* WKGeometry.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC938E01180DE440085E5FE /* WKContextPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		BCCF6ABC12C91EF9008F9C35 /* WebImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCF6ABA12C91EF9008F9C35 /* WebImage.cpp */; };
@@ -4208,8 +4206,6 @@
 		BCC43AB9127B95DC00317F16 /* PlatformPopupMenuData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformPopupMenuData.h; sourceTree = "<group>"; };
 		BCC43AC6127B99DE00317F16 /* WebPopupMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPopupMenuMac.mm; sourceTree = "<group>"; };
 		BCC56F771159957D001CCAF9 /* MachPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachPort.h; sourceTree = "<group>"; };
-		BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemInterface.h; sourceTree = "<group>"; };
-		BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemInterface.mm; sourceTree = "<group>"; };
 		BCC8B373125FB69000DE46A4 /* WKGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKGeometry.h; sourceTree = "<group>"; };
 		BCC938E01180DE440085E5FE /* WKContextPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextPrivate.h; sourceTree = "<group>"; };
 		BCCF6ABA12C91EF9008F9C35 /* WebImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebImage.cpp; sourceTree = "<group>"; };
@@ -7305,8 +7301,6 @@
 				9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */,
 				9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */,
 				BCC43AC6127B99DE00317F16 /* WebPopupMenuMac.mm */,
-				BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */,
-				BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */,
 			);
 			path = mac;
 			sourceTree = "<group>";
@@ -9011,7 +9005,6 @@
 				517A53101F47A86200DCDC0A /* WebSWClientConnectionMessages.h in Headers */,
 				517A530B1F479E3600DCDC0A /* WebSWServerConnection.h in Headers */,
 				517A52D91F43A9DA00DCDC0A /* WebSWServerConnectionMessages.h in Headers */,
-				BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */,
 				5118E99C1F295266003EF9F5 /* WebToStorageProcessConnection.h in Headers */,
 				BCA0EF7F12331E78007D3CFB /* WebUndoStep.h in Headers */,
 				1AAF08AE1926936700B6390C /* WebUserContentController.h in Headers */,
@@ -10660,7 +10653,6 @@
 				517A530F1F47A86200DCDC0A /* WebSWClientConnectionMessageReceiver.cpp in Sources */,
 				517A530A1F479E3600DCDC0A /* WebSWServerConnection.cpp in Sources */,
 				517A52D81F43A9DA00DCDC0A /* WebSWServerConnectionMessageReceiver.cpp in Sources */,
-				BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */,
 				5118E99B1F295266003EF9F5 /* WebToStorageProcessConnection.cpp in Sources */,
 				C0337DD8127A51B6008FF4F4 /* WebTouchEvent.cpp in Sources */,
 				2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */,

Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -35,7 +35,6 @@
 #import <WebCore/GraphicsContext.h>
 #import <WebCore/MachSendRight.h>
 #import <WebCore/NotImplemented.h>
-#import <WebKitSystemInterface.h>
 #import <objc/runtime.h>
 #import <pal/spi/mac/HIToolboxSPI.h>
 #import <pal/spi/mac/NSMenuSPI.h>

Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -33,7 +33,6 @@
 #import "PluginProcessConnection.h"
 #import <QuartzCore/QuartzCore.h>
 #import <WebCore/WebCoreCALayerExtras.h>
-#import <WebKitSystemInterface.h>
 
 const static double fadeInDuration = 0.5;
 

Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -79,7 +79,6 @@
 #import <WebCore/ScrollbarTheme.h>
 #import <WebCore/Settings.h>
 #import <WebCore/WheelEventTestTrigger.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/mac/NSMenuSPI.h>
 #import <wtf/CurrentTime.h>

Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -51,7 +51,6 @@
 #import <WebCore/ResourceHandle.h>
 #import <WebCore/StringTruncator.h>
 #import <WebCore/WebCoreNSURLExtras.h>
-#import <WebKitSystemInterface.h>
 #import <wtf/StdLibExtras.h>
 
 #if PLATFORM(IOS)

Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -40,7 +40,6 @@
 #include <WebCore/Page.h>
 #include <WebCore/ResourceError.h>
 #include <WebCore/Settings.h>
-#include <WebKitSystemInterface.h>
 #include <pal/spi/cf/CFNetworkSPI.h>
 
 using namespace WebCore;

Deleted: trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebSystemInterface.h (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebSystemInterface.h	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebSystemInterface.h	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebSystemInterface_h
-#define WebSystemInterface_h
-
-void InitWebCoreSystemInterface(void);
-
-#endif /* WebSystemInterface_h */

Deleted: trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 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. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "WebSystemInterface.h"
-
-#import <WebCore/WebCoreSystemInterface.h>
-#import <WebKitSystemInterface.h>
-
-#define INIT(function) wk##function = WK##function
-
-void InitWebCoreSystemInterface(void)
-{
-    static dispatch_once_t initOnce;
-    
-    dispatch_once(&initOnce, ^{
-#if !PLATFORM(IOS)
-        INIT(DrawMediaSliderTrack);
-        INIT(DrawMediaUIPart);
-        INIT(HitTestMediaUIPart);
-        INIT(MeasureMediaUIPart);
-#endif
-    });
-}

Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -47,7 +47,6 @@
 #import "WebCoreArgumentCoders.h"
 #import "WebFrame.h"
 #import "WebImage.h"
-#import "WebKitSystemInterface.h"
 #import "WebPageProxyMessages.h"
 #import "WebPreviewLoaderClient.h"
 #import "WebProcess.h"

Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -41,7 +41,6 @@
 #import <WebCore/Page.h>
 #import <WebCore/ScrollView.h>
 #import <WebCore/Scrollbar.h>
-#import <WebKitSystemInterface.h>
 #import <wtf/ObjcRuntimeExtras.h>
 
 using namespace WebCore;

Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -44,7 +44,6 @@
 #import <WebCore/PageOverlayController.h>
 #import <WebCore/ScrollView.h>
 #import <WebCore/Scrollbar.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/mac/NSAccessibilitySPI.h>
 #import <wtf/ObjcRuntimeExtras.h>
 

Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -90,7 +90,6 @@
 #import <WebCore/TextIterator.h>
 #import <WebCore/VisibleUnits.h>
 #import <WebCore/WindowsKeyboardCodes.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/mac/NSAccessibilitySPI.h>
 #import <wtf/SetForScope.h>
 

Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (222895 => 222896)


--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -58,7 +58,6 @@
 #import <WebCore/PerformanceLogging.h>
 #import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/WebCoreNSURLExtras.h>
-#import <WebKitSystemInterface.h>
 #import <algorithm>
 #import <dispatch/dispatch.h>
 #import <objc/runtime.h>

Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (222895 => 222896)


--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2017-10-05 04:30:40 UTC (rev 222896)
@@ -675,8 +675,6 @@
 		93D4379E1D57ABEF00AB85EA /* ObjCNodeFilterCondition.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93D4364C1D57ABEE00AB85EA /* ObjCNodeFilterCondition.mm */; };
 		93E2A1A4123B0B3C009FE12A /* WebDashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E2A1A2123B0B3C009FE12A /* WebDashboardRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		93E2A1A5123B0B3C009FE12A /* WebDashboardRegion.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93E2A1A3123B0B3C009FE12A /* WebDashboardRegion.mm */; };
-		93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93EB178C09F88D460091F8FF /* WebSystemInterface.mm */; };
-		93EB178F09F88D510091F8FF /* WebSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 93EB178E09F88D510091F8FF /* WebSystemInterface.h */; };
 		93FDE9330D79CAF30074F029 /* WebHistoryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */; };
 		A10265831F56540300B4C844 /* HIWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A10265821F56540300B4C844 /* HIWebView.mm */; };
 		A10C1D1818202F9C0036883A /* WebDefaultFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = A10C1D1018202F9C0036883A /* WebDefaultFormDelegate.h */; };
@@ -1413,8 +1411,6 @@
 		93D623DD051E791F002F47DD /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
 		93E2A1A2123B0B3C009FE12A /* WebDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDashboardRegion.h; sourceTree = "<group>"; };
 		93E2A1A3123B0B3C009FE12A /* WebDashboardRegion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDashboardRegion.mm; sourceTree = "<group>"; };
-		93EB178C09F88D460091F8FF /* WebSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemInterface.mm; sourceTree = "<group>"; };
-		93EB178E09F88D510091F8FF /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemInterface.h; sourceTree = "<group>"; };
 		93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryInternal.h; sourceTree = "<group>"; };
 		9CAE9D070252A4130ECA16EA /* WebPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
 		9CF0E249021361B00ECA16EA /* WebFramePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFramePrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -2604,8 +2600,6 @@
 				A5DEFC0911D5331C00885273 /* WebSecurityOriginPrivate.h */,
 				2DD632C019E5D1F0002E9C7B /* WebSelectionServiceController.h */,
 				2DD632C119E5D1F0002E9C7B /* WebSelectionServiceController.mm */,
-				93EB178E09F88D510091F8FF /* WebSystemInterface.h */,
-				93EB178C09F88D460091F8FF /* WebSystemInterface.mm */,
 				070F549917F1E42B00169E04 /* WebUserMediaClient.h */,
 				070F549A17F1E42B00169E04 /* WebUserMediaClient.mm */,
 				4618DFF61DEF760A0033C3AA /* WebValidationMessageClient.h */,
@@ -3152,7 +3146,6 @@
 				1A591D461A2E91BB000907C4 /* WebStorageNamespaceProvider.h in Headers */,
 				3ABB3C7A1309C3B500E93D94 /* WebStorageTrackerClient.h in Headers */,
 				939810270824BF01008DF038 /* WebStringTruncator.h in Headers */,
-				93EB178F09F88D510091F8FF /* WebSystemInterface.h in Headers */,
 				936A2DEA0FD2D08400D312DB /* WebTextCompletionController.h in Headers */,
 				1A74A28E0F4F75400082E228 /* WebTextInputWindowController.h in Headers */,
 				F834AAD70E64B1C700E2737C /* WebTextIterator.h in Headers */,
@@ -3671,7 +3664,6 @@
 				1A591D451A2E91BB000907C4 /* WebStorageNamespaceProvider.cpp in Sources */,
 				3ABB3C7B1309C3B500E93D94 /* WebStorageTrackerClient.mm in Sources */,
 				939810CC0824BF01008DF038 /* WebStringTruncator.mm in Sources */,
-				93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources */,
 				936A2DE80FD2D08000D312DB /* WebTextCompletionController.mm in Sources */,
 				1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */,
 				F834AAD80E64B1C700E2737C /* WebTextIterator.mm in Sources */,

Modified: trunk/Source/WebKitLegacy/ios/ChangeLog (222895 => 222896)


--- trunk/Source/WebKitLegacy/ios/ChangeLog	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/ios/ChangeLog	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1,3 +1,13 @@
+2017-10-04  Alex Christensen  <[email protected]>
+
+        Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
+        https://bugs.webkit.org/show_bug.cgi?id=177912
+
+        Reviewed by Saam Barati.
+
+        * Misc/WebUIKitSupport.mm:
+        * WebCoreSupport/WebChromeClientIOS.mm:
+
 2017-09-22  Chris Dumez  <[email protected]>
 
         Use high resolution timestamp for event time

Modified: trunk/Source/WebKitLegacy/ios/Misc/WebUIKitSupport.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/ios/Misc/WebUIKitSupport.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/ios/Misc/WebUIKitSupport.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -28,10 +28,8 @@
 #import "WebUIKitSupport.h"
 
 #import "WebDatabaseManagerInternal.h"
-#import "WebKitSystemInterface.h"
 #import "WebLocalizableStringsInternal.h"
 #import "WebPlatformStrategies.h"
-#import "WebSystemInterface.h"
 #import "WebViewPrivate.h"
 #import <WebCore/BreakLines.h>
 #import <WebCore/PathUtilities.h>
@@ -79,7 +77,6 @@
     webkitInitialized = true;
     InitWebCoreThreadSystemInterface();
     [WebView enableWebThread];
-    InitWebCoreSystemInterface();
 
     // Initialize our platform strategies.
     WebPlatformStrategies::initializeIfNecessary();

Modified: trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebChromeClientIOS.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebChromeClientIOS.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebChromeClientIOS.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -37,7 +37,6 @@
 #import "WebFrameIOS.h"
 #import "WebFrameInternal.h"
 #import "WebHistoryItemInternal.h"
-#import "WebKitSystemInterface.h"
 #import "WebOpenPanelResultListener.h"
 #import "WebUIDelegate.h"
 #import "WebUIDelegatePrivate.h"

Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonUtils.m (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonUtils.m	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonUtils.m	2017-10-05 04:30:40 UTC (rev 222896)
@@ -29,7 +29,6 @@
 #ifndef __LP64__
 
 #include "CarbonUtils.h"
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cocoa/FoundationSPI.h>
 
 extern CGImageRef _NSCreateImageRef( unsigned char *const bitmapData[5], int pixelsWide, int pixelsHigh, int bitsPerSample, int samplesPerPixel, int bitsPerPixel, int bytesPerRow, BOOL isPlanar, BOOL hasAlpha, NSString *colorSpaceName, CGColorSpaceRef customColorSpace, id sourceObj);

Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -63,8 +63,6 @@
 #import "CarbonWindowContentView.h"
 #import "HIViewAdapter.h"
 
-#import <WebKitSystemInterface.h>
-
 #import <AppKit/AppKit.h>
 //#import <CoreGraphics/CGSWindow.h>
 #import <HIToolbox/CarbonEvents.h>

Modified: trunk/Source/WebKitLegacy/mac/Carbon/HIWebView.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Carbon/HIWebView.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Carbon/HIWebView.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -34,7 +34,6 @@
 #import "HIViewAdapter.h"
 #import "WebHTMLViewInternal.h"
 #import "WebKit.h"
-#import <WebKitSystemInterface.h>
 #import <pal/spi/mac/NSEventSPI.h>
 #import <pal/spi/mac/NSGraphicsSPI.h>
 #import <pal/spi/mac/QuickDrawSPI.h>

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1,3 +1,43 @@
+2017-10-04  Alex Christensen  <[email protected]>
+
+        Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
+        https://bugs.webkit.org/show_bug.cgi?id=177912
+
+        Reviewed by Saam Barati.
+
+        * Carbon/CarbonUtils.m:
+        * Carbon/CarbonWindowAdapter.mm:
+        * Carbon/HIWebView.mm:
+        * DefaultDelegates/WebDefaultContextMenuDelegate.mm:
+        * Misc/WebNSFileManagerExtras.mm:
+        * Misc/WebNSPasteboardExtras.mm:
+        * Misc/WebNSURLExtras.mm:
+        * Plugins/Hosted/HostedNetscapePluginStream.mm:
+        * Plugins/Hosted/NetscapePluginHostManager.mm:
+        * Plugins/Hosted/NetscapePluginHostProxy.mm:
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        * Plugins/Hosted/WebHostedNetscapePluginView.h:
+        * Plugins/Hosted/WebTextInputWindowController.m:
+        * Plugins/WebBaseNetscapePluginView.mm:
+        * Plugins/WebNetscapePluginEventHandlerCarbon.mm:
+        * Plugins/WebNetscapePluginEventHandlerCocoa.mm:
+        * Plugins/WebNetscapePluginStream.mm:
+        * Plugins/WebNetscapePluginView.mm:
+        * Plugins/WebPluginDatabase.mm:
+        * WebCoreSupport/PopupMenuMac.mm:
+        * WebCoreSupport/WebChromeClient.mm:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        * WebCoreSupport/WebInspectorClient.mm:
+        * WebCoreSupport/WebPlatformStrategies.mm:
+        * WebCoreSupport/WebSystemInterface.mm:
+        * WebView/WebDynamicScrollBarsView.mm:
+        * WebView/WebFrame.mm:
+        * WebView/WebFrameView.mm:
+        * WebView/WebFullScreenController.mm:
+        * WebView/WebHTMLView.mm:
+        * WebView/WebPreferences.mm:
+        * WebView/WebView.mm:
+
 2017-09-29  Alexey Proskuryakov  <[email protected]>
 
         Follow-up to https://trac.webkit.org/r222239 to fix crashes.

Modified: trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -50,7 +50,6 @@
 #import <WebCore/FrameLoader.h>
 #import <WebKitLegacy/DOM.h>
 #import <WebKitLegacy/DOMPrivate.h>
-#import <WebKitSystemInterface.h>
 #import <pal/system/mac/DefaultSearchProvider.h>
 #import <wtf/Assertions.h>
 

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebCache.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Misc/WebCache.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebCache.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -28,7 +28,6 @@
 #import "WebApplicationCacheInternal.h"
 #import "WebNSObjectExtras.h"
 #import "WebPreferences.h"
-#import "WebSystemInterface.h"
 #import "WebView.h"
 #import "WebViewInternal.h"
 #import <WebCore/ApplicationCacheStorage.h>
@@ -58,7 +57,6 @@
     WTF::initializeMainThreadToProcessMainThread();
     RunLoop::initializeMainRunLoop();
 #endif
-    InitWebCoreSystemInterface();   
 }
 
 + (NSArray *)statistics

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebNSFileManagerExtras.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Misc/WebNSFileManagerExtras.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebNSFileManagerExtras.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -31,7 +31,6 @@
 #import "WebKitNSStringExtras.h"
 #import "WebNSURLExtras.h"
 #import <WebCore/FileSystem.h>
-#import <WebKitSystemInterface.h>
 #import <sys/stat.h>
 #import <wtf/Assertions.h>
 #import <wtf/ObjcRuntimeExtras.h>

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebNSPasteboardExtras.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Misc/WebNSPasteboardExtras.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebNSPasteboardExtras.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -46,7 +46,6 @@
 #import <WebCore/RenderImage.h>
 #import <WebKitLegacy/DOMExtensions.h>
 #import <WebKitLegacy/DOMPrivate.h>
-#import <WebKitSystemInterface.h>
 #import <wtf/Assertions.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/StdLibExtras.h>

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -32,12 +32,10 @@
 #import "WebKitNSStringExtras.h"
 #import "WebLocalizableStrings.h"
 #import "WebNSDataExtras.h"
-#import "WebSystemInterface.h"
 #import <Foundation/NSURLRequest.h>
 #import <WebCore/URL.h>
 #import <WebCore/LoaderNSURLExtras.h>
 #import <WebCore/WebCoreNSURLExtras.h>
-#import <WebKitSystemInterface.h>
 #import <wtf/Assertions.h>
 #import <wtf/ObjcRuntimeExtras.h>
 #import <unicode/uchar.h>

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebStringTruncator.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Misc/WebStringTruncator.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebStringTruncator.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -28,7 +28,6 @@
 
 #import "WebStringTruncator.h"
 
-#import "WebSystemInterface.h"
 #import <WebCore/FontCascade.h>
 #import <WebCore/FontPlatformData.h>
 #import <WebCore/StringTruncator.h>
@@ -51,7 +50,6 @@
 
 + (void)initialize
 {
-    InitWebCoreSystemInterface();
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
 }

Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/HostedNetscapePluginStream.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/HostedNetscapePluginStream.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/HostedNetscapePluginStream.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -33,7 +33,6 @@
 #import "WebHostedNetscapePluginView.h"
 #import "WebKitErrorsPrivate.h"
 #import "WebKitPluginHost.h"
-#import "WebKitSystemInterface.h"
 #import "WebNSURLExtras.h"
 #import "WebNSURLRequestExtras.h"
 #import "WebResourceLoadScheduler.h"

Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -29,7 +29,6 @@
 
 #import "NetscapePluginHostProxy.h"
 #import "NetscapePluginInstanceProxy.h"
-#import "WebKitSystemInterface.h"
 #import "WebLocalizableStringsInternal.h"
 #import "WebNetscapePluginPackage.h"
 #import <WebCore/WebCoreNSStringExtras.h>

Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostProxy.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostProxy.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -35,7 +35,6 @@
 #import "NetscapePluginInstanceProxy.h"
 #import "WebFrameInternal.h"
 #import "WebHostedNetscapePluginView.h"
-#import "WebKitSystemInterface.h"
 #import <_javascript_Core/IdentifierInlines.h>
 #import <WebCore/CommonVM.h>
 #import <WebCore/Frame.h>

Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -62,7 +62,6 @@
 #import <WebCore/UserGestureIndicator.h>
 #import <WebCore/npruntime_impl.h>
 #import <WebCore/runtime_object.h>
-#import <WebKitSystemInterface.h>
 #import <bindings/ScriptValue.h>
 #import <mach/mach.h>
 #import <utility>

Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.h (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.h	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.h	2017-10-05 04:30:40 UTC (rev 222896)
@@ -26,7 +26,6 @@
 #if USE(PLUGIN_HOST_PROCESS)
 
 #import "WebBaseNetscapePluginView.h"
-#import "WebKitSystemInterface.h"
 #import <wtf/RefPtr.h>
 
 namespace WebKit {

Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebTextInputWindowController.m (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebTextInputWindowController.m	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebTextInputWindowController.m	2017-10-05 04:30:40 UTC (rev 222896)
@@ -27,7 +27,6 @@
 
 #import "WebTextInputWindowController.h"
 
-#import <WebKitSystemInterface.h>
 #import <pal/system/mac/WebPanel.h>
 
 @interface WebTextInputView : NSTextView {

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -33,7 +33,6 @@
 #import "WebFrameInternal.h"
 #import "WebKitLogging.h"
 #import "WebKitNSStringExtras.h"
-#import "WebKitSystemInterface.h"
 #import "WebNSURLExtras.h"
 #import "WebNSURLRequestExtras.h"
 #import "WebView.h"

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -29,7 +29,6 @@
 
 #import "WebNetscapePluginView.h"
 #import "WebKitLogging.h"
-#import "WebKitSystemInterface.h"
 #import <HIToolbox/CarbonEvents.h>
 #import <pal/spi/mac/HIToolboxSPI.h>
 #import <pal/spi/mac/NSEventSPI.h>

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -27,7 +27,6 @@
 
 #import "WebNetscapePluginEventHandlerCocoa.h"
 
-#import "WebKitSystemInterface.h"
 #import "WebNetscapePluginView.h"
 #import <pal/spi/mac/HIToolboxSPI.h>
 #import <pal/spi/mac/NSEventSPI.h>

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginStream.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginStream.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginStream.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -51,7 +51,6 @@
 #import <WebCore/SecurityPolicy.h>
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebCoreURLResponse.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cf/CFNetworkSPI.h>
 #import <runtime/JSLock.h>
 #import <wtf/HashMap.h>

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -37,7 +37,6 @@
 #import "WebKitErrorsPrivate.h"
 #import "WebKitLogging.h"
 #import "WebKitNSStringExtras.h"
-#import "WebKitSystemInterface.h"
 #import "WebNSDataExtras.h"
 #import "WebNSDictionaryExtras.h"
 #import "WebNSObjectExtras.h"

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -42,7 +42,6 @@
 #import "WebPluginPackage.h"
 #import "WebViewInternal.h"
 #import "WebViewPrivate.h"
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
 #import <wtf/Assertions.h>
 

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -32,7 +32,6 @@
 #import <WebCore/FrameView.h>
 #import <WebCore/Page.h>
 #import <WebCore/PopupMenuClient.h>
-#import <WebKitSystemInterface.h>
 #import <pal/system/mac/PopupMenu.h>
 #import <wtf/BlockObjCExceptions.h>
 

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -44,7 +44,6 @@
 #import "WebHistoryInternal.h"
 #import "WebKitFullScreenListener.h"
 #import "WebKitPrefix.h"
-#import "WebKitSystemInterface.h"
 #import "WebNSURLRequestExtras.h"
 #import "WebOpenPanelResultListener.h"
 #import "WebPlugin.h"

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -122,7 +122,6 @@
 #import <WebCore/Widget.h>
 #import <WebKitLegacy/DOMElement.h>
 #import <WebKitLegacy/DOMHTMLFormElement.h>
-#import <WebKitSystemInterface.h>
 #import <pal/spi/cocoa/NSURLDownloadSPI.h>
 #import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
 #import <runtime/InitializeThreading.h>

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebInspectorClient.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -48,7 +48,6 @@
 #import <WebCore/Page.h>
 #import <WebCore/ScriptController.h>
 #import <WebKitLegacy/DOMExtensions.h>
-#import <WebKitSystemInterface.h>
 #import <algorithm>
 #import <bindings/ScriptValue.h>
 #import <inspector/InspectorAgentBase.h>

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -36,7 +36,6 @@
 #import <WebCore/PlatformPasteboard.h>
 #import <WebCore/SharedBuffer.h>
 #import <WebCore/SubframeLoader.h>
-#import <WebKitSystemInterface.h>
 
 using namespace WebCore;
 

Deleted: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSystemInterface.h (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSystemInterface.h	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSystemInterface.h	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1,29 +0,0 @@
-/*
- * Copyright 2006 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. 
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-void InitWebCoreSystemInterface();

Deleted: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSystemInterface.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSystemInterface.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSystemInterface.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1,53 +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. 
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "WebSystemInterface.h"
-
-// Needed for builds not using PCH to expose BUILDING_ macros, see bug 32753.
-#include <wtf/Platform.h>
-
-#import <WebCore/WebCoreSystemInterface.h>
-#import <WebKitSystemInterface.h>
-
-#define INIT(function) wk##function = WK##function
-
-void InitWebCoreSystemInterface(void)
-{
-    static bool didInit;
-    if (didInit)
-        return;
-
-#if !PLATFORM(IOS)
-    INIT(DrawMediaUIPart);
-    INIT(DrawMediaSliderTrack);
-    INIT(HitTestMediaUIPart);
-    INIT(MeasureMediaUIPart);
-#endif
-
-    didInit = true;
-}

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDynamicScrollBarsView.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebView/WebDynamicScrollBarsView.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDynamicScrollBarsView.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -32,7 +32,6 @@
 #import <WebCore/Frame.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/PlatformEventFactoryMac.h>
-#import <WebKitSystemInterface.h>
 
 using namespace WebCore;
 

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -99,7 +99,6 @@
 #import <WebCore/ThreadCheck.h>
 #import <WebCore/VisibleUnits.h>
 #import <WebCore/markup.h>
-#import <WebKitSystemInterface.h>
 #import <bindings/ScriptValue.h>
 #import <runtime/JSCJSValue.h>
 #import <runtime/JSLock.h>

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFrameView.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebView/WebFrameView.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFrameView.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -48,7 +48,6 @@
 #import "WebPDFView.h"
 #import "WebPreferenceKeysPrivate.h"
 #import "WebResourceInternal.h"
-#import "WebSystemInterface.h"
 #import "WebViewInternal.h"
 #import "WebViewPrivate.h"
 #import <Foundation/NSURLRequest.h>
@@ -64,7 +63,6 @@
 #import <WebCore/ThreadCheck.h>
 #import <WebCore/WebCoreFrameView.h>
 #import <WebCore/WebCoreView.h>
-#import <WebKitSystemInterface.h>
 #import <wtf/Assertions.h>
 
 #if PLATFORM(IOS)
@@ -367,7 +365,6 @@
     static bool didFirstTimeInitialization;
     if (!didFirstTimeInitialization) {
         didFirstTimeInitialization = true;
-        InitWebCoreSystemInterface();
         
         // Need to tell WebCore what function to call for the "History Item has Changed" notification.
         // Note: We also do this in WebHistoryItem's init method.

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFullScreenController.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebView/WebFullScreenController.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFullScreenController.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -43,7 +43,6 @@
 #import <WebCore/RenderView.h>
 #import <WebCore/WebCoreFullScreenWindow.h>
 #import <WebCore/WebWindowAnimation.h>
-#import <WebKitSystemInterface.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/SoftLinking.h>
 

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -127,7 +127,6 @@
 #import <WebKitLegacy/DOM.h>
 #import <WebKitLegacy/DOMExtensions.h>
 #import <WebKitLegacy/DOMPrivate.h>
-#import <WebKitSystemInterface.h>
 #import <dlfcn.h>
 #import <limits>
 #import <pal/spi/cf/CFUtilitiesSPI.h>

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -34,11 +34,9 @@
 #import "WebFrameNetworkingContext.h"
 #import "WebKitLogging.h"
 #import "WebKitNSStringExtras.h"
-#import "WebKitSystemInterface.h"
 #import "WebKitVersionChecks.h"
 #import "WebNSDictionaryExtras.h"
 #import "WebNSURLExtras.h"
-#import "WebSystemInterface.h"
 #import <WebCore/ApplicationCacheStorage.h>
 #import <WebCore/AudioSession.h>
 #import <WebCore/NetworkStorageSession.h>
@@ -401,7 +399,6 @@
     bool requiresPlaysInlineAttribute = !allowsInlineMediaPlayback;
     bool attachmentElementEnabled = IOSApplication::isMobileMail();
 #endif
-    InitWebCoreSystemInterface();
 
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
         @"Times",                       WebKitStandardFontPreferenceKey,

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (222895 => 222896)


--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -106,7 +106,6 @@
 #import "WebSelectionServiceController.h"
 #import "WebStorageManagerInternal.h"
 #import "WebStorageNamespaceProvider.h"
-#import "WebSystemInterface.h"
 #import "WebTextCompletionController.h"
 #import "WebTextIterator.h"
 #import "WebUIDelegate.h"
@@ -204,7 +203,6 @@
 #import <WebKitLegacy/DOM.h>
 #import <WebKitLegacy/DOMExtensions.h>
 #import <WebKitLegacy/DOMPrivate.h>
-#import <WebKitSystemInterface.h>
 #import <bindings/ScriptValue.h>
 #import <mach-o/dyld.h>
 #import <objc/runtime.h>
@@ -5367,7 +5365,6 @@
         return;
     initialized = YES;
 
-    InitWebCoreSystemInterface();
 #if !PLATFORM(IOS)
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();

Modified: trunk/Tools/ChangeLog (222895 => 222896)


--- trunk/Tools/ChangeLog	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Tools/ChangeLog	2017-10-05 04:30:40 UTC (rev 222896)
@@ -1,3 +1,12 @@
+2017-10-04  Alex Christensen  <[email protected]>
+
+        Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
+        https://bugs.webkit.org/show_bug.cgi?id=177912
+
+        Reviewed by Saam Barati.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+
 2017-10-04  Megan Gardner  <[email protected]>
 
         Break out new touch debugging code into seperate file

Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (222895 => 222896)


--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2017-10-05 03:57:38 UTC (rev 222895)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2017-10-05 04:30:40 UTC (rev 222896)
@@ -87,7 +87,6 @@
 #import <WebKit/WebResourceLoadDelegate.h>
 #import <WebKit/WebStorageManagerPrivate.h>
 #import <WebKit/WebViewPrivate.h>
-#import <WebKitSystemInterface.h>
 #import <getopt.h>
 #import <wtf/Assertions.h>
 #import <wtf/FastMalloc.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to