Stop using EXCLUDED_SOURCE_FILE_NAMES for actual source files in WebCore
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Feb 2018 21:08:45 +0000 (21:08 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Feb 2018 21:08:45 +0000 (21:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=182822

Reviewed by Dan Bernstein.

It's much easier to reason about things if xcconfigs don't apply extra
constraints to which source files actually build on a per-platform basis.
We should use #ifs instead like we usually do.

* Configurations/WebCore.xcconfig:
* Modules/geolocation/ios/GeolocationPositionIOS.mm:
* accessibility/ios/AccessibilityObjectIOS.mm:
* accessibility/mac/AXObjectCacheMac.mm:
* accessibility/mac/AccessibilityObjectMac.mm:
* accessibility/mac/WebAccessibilityObjectWrapperMac.h:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
* dom/DataTransferMac.mm:
* editing/ios/DictationCommandIOS.cpp:
* editing/ios/DictationCommandIOS.h:
* editing/ios/EditorIOS.mm:
* editing/ios/WebContentReaderIOS.mm:
* editing/mac/EditorMac.mm:
* editing/mac/WebContentReaderMac.mm:
* page/ios/EventHandlerIOS.mm:
* page/ios/FrameIOS.mm:
* page/mac/EventHandlerMac.mm:
* page/scrolling/ios/ScrollingCoordinatorIOS.h:
* page/scrolling/ios/ScrollingCoordinatorIOS.mm:
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
* platform/ThreadCheck.h:
* platform/audio/ios/AudioDestinationIOS.h:
* platform/audio/ios/AudioFileReaderIOS.h:
* platform/audio/ios/MediaSessionManagerIOS.h:
* platform/graphics/ios/DisplayRefreshMonitorIOS.h:
* platform/graphics/ios/DisplayRefreshMonitorIOS.mm:
* platform/graphics/ios/FontCacheIOS.mm:
* platform/graphics/ios/GraphicsContext3DIOS.h:
* platform/graphics/ios/IconIOS.mm:
* platform/graphics/mac/ColorMac.h:
* platform/graphics/mac/ColorMac.mm:
* platform/graphics/mac/DisplayRefreshMonitorMac.cpp:
* platform/graphics/mac/DisplayRefreshMonitorMac.h:
* platform/graphics/mac/IconMac.mm:
* platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
* platform/ios/CursorIOS.cpp:
* platform/ios/DeviceMotionClientIOS.h:
* platform/ios/DeviceOrientationClientIOS.h:
* platform/ios/EventLoopIOS.mm:
* platform/ios/KeyEventCodesIOS.h:
* platform/ios/LowPowerModeNotifierIOS.mm:
* platform/ios/PasteboardIOS.mm:
* platform/ios/PlatformEventFactoryIOS.h:
* platform/ios/PlatformEventFactoryIOS.mm:
* platform/ios/PlatformPasteboardIOS.mm:
* platform/ios/PlatformScreenIOS.mm:
* platform/ios/PlatformSpeechSynthesizerIOS.mm:
* platform/ios/RemoteCommandListenerIOS.h:
* platform/ios/RemoteCommandListenerIOS.mm:
* platform/ios/SSLKeyGeneratorIOS.cpp:
* platform/ios/ScrollAnimatorIOS.h:
* platform/ios/ScrollAnimatorIOS.mm:
* platform/ios/ScrollViewIOS.mm:
* platform/ios/ScrollbarThemeIOS.h:
* platform/ios/ScrollbarThemeIOS.mm:
* platform/ios/SystemMemoryIOS.cpp:
* platform/ios/ThemeIOS.h:
* platform/ios/ThemeIOS.mm:
* platform/ios/TileControllerMemoryHandlerIOS.cpp:
* platform/ios/TileControllerMemoryHandlerIOS.h:
* platform/ios/UserAgentIOS.mm:
* platform/ios/ValidationBubbleIOS.mm:
* platform/ios/WidgetIOS.mm:
* platform/mac/CursorMac.mm:
* platform/mac/EventLoopMac.mm:
* platform/mac/LocalCurrentGraphicsContext.h:
* platform/mac/LocalCurrentGraphicsContext.mm:
* platform/mac/NSScrollerImpDetails.h:
* platform/mac/NSScrollerImpDetails.mm:
* platform/mac/PasteboardMac.mm:
* platform/mac/PlatformEventFactoryMac.h:
* platform/mac/PlatformEventFactoryMac.mm:
* platform/mac/PlatformPasteboardMac.mm:
* platform/mac/PlatformScreenMac.mm:
* platform/mac/PlatformSpeechSynthesizerMac.mm:
* platform/mac/SSLKeyGeneratorMac.mm:
* platform/mac/ScrollViewMac.mm:
* platform/mac/ScrollbarThemeMac.h:
* platform/mac/ScrollbarThemeMac.mm:
* platform/mac/ThemeMac.h:
* platform/mac/ThemeMac.mm:
* platform/mac/ThreadCheck.mm:
* platform/mac/UserAgentMac.mm:
* platform/mac/WebCoreView.h:
* platform/mac/WebCoreView.m:
* platform/mac/WidgetMac.mm:
* platform/mediastream/ios/CoreAudioCaptureSourceIOS.h:
* platform/network/ios/NetworkStateNotifierIOS.mm:
* platform/network/ios/WebCoreURLResponseIOS.h:
* platform/network/ios/WebCoreURLResponseIOS.mm:
* platform/network/mac/NetworkStateNotifierMac.cpp:

* Configurations/PAL.xcconfig:
* pal/system/Sound.cpp:
* pal/system/mac/SoundMac.mm:
* pal/text/KillRing.cpp:
* pal/text/mac/KillRingMac.mm:

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

97 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/Modules/geolocation/ios/GeolocationPositionIOS.mm
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/PAL.xcconfig
Source/WebCore/PAL/pal/system/Sound.cpp
Source/WebCore/PAL/pal/system/mac/SoundMac.mm
Source/WebCore/PAL/pal/text/KillRing.cpp
Source/WebCore/PAL/pal/text/mac/KillRingMac.mm
Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm
Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
Source/WebCore/dom/DataTransferMac.mm
Source/WebCore/editing/ios/DictationCommandIOS.cpp
Source/WebCore/editing/ios/DictationCommandIOS.h
Source/WebCore/editing/ios/EditorIOS.mm
Source/WebCore/editing/ios/WebContentReaderIOS.mm
Source/WebCore/editing/mac/EditorMac.mm
Source/WebCore/editing/mac/WebContentReaderMac.mm
Source/WebCore/page/ios/EventHandlerIOS.mm
Source/WebCore/page/ios/FrameIOS.mm
Source/WebCore/page/mac/EventHandlerMac.mm
Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h
Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm
Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm
Source/WebCore/platform/ThreadCheck.h
Source/WebCore/platform/audio/ios/AudioDestinationIOS.h
Source/WebCore/platform/audio/ios/AudioFileReaderIOS.h
Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h
Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.h
Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm
Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
Source/WebCore/platform/graphics/ios/GraphicsContext3DIOS.h
Source/WebCore/platform/graphics/ios/IconIOS.mm
Source/WebCore/platform/graphics/mac/ColorMac.h
Source/WebCore/platform/graphics/mac/ColorMac.mm
Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp
Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h
Source/WebCore/platform/graphics/mac/IconMac.mm
Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
Source/WebCore/platform/ios/CursorIOS.cpp
Source/WebCore/platform/ios/DeviceMotionClientIOS.h
Source/WebCore/platform/ios/DeviceOrientationClientIOS.h
Source/WebCore/platform/ios/EventLoopIOS.mm
Source/WebCore/platform/ios/KeyEventCodesIOS.h
Source/WebCore/platform/ios/LowPowerModeNotifierIOS.mm
Source/WebCore/platform/ios/PasteboardIOS.mm
Source/WebCore/platform/ios/PlatformEventFactoryIOS.h
Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm
Source/WebCore/platform/ios/PlatformPasteboardIOS.mm
Source/WebCore/platform/ios/PlatformScreenIOS.mm
Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm
Source/WebCore/platform/ios/RemoteCommandListenerIOS.h
Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm
Source/WebCore/platform/ios/SSLKeyGeneratorIOS.cpp
Source/WebCore/platform/ios/ScrollAnimatorIOS.h
Source/WebCore/platform/ios/ScrollAnimatorIOS.mm
Source/WebCore/platform/ios/ScrollViewIOS.mm
Source/WebCore/platform/ios/ScrollbarThemeIOS.h
Source/WebCore/platform/ios/ScrollbarThemeIOS.mm
Source/WebCore/platform/ios/SystemMemoryIOS.cpp
Source/WebCore/platform/ios/ThemeIOS.h
Source/WebCore/platform/ios/ThemeIOS.mm
Source/WebCore/platform/ios/TileControllerMemoryHandlerIOS.cpp
Source/WebCore/platform/ios/TileControllerMemoryHandlerIOS.h
Source/WebCore/platform/ios/UserAgentIOS.mm
Source/WebCore/platform/ios/ValidationBubbleIOS.mm
Source/WebCore/platform/ios/WidgetIOS.mm
Source/WebCore/platform/mac/CursorMac.mm
Source/WebCore/platform/mac/EventLoopMac.mm
Source/WebCore/platform/mac/LocalCurrentGraphicsContext.h
Source/WebCore/platform/mac/LocalCurrentGraphicsContext.mm
Source/WebCore/platform/mac/NSScrollerImpDetails.h
Source/WebCore/platform/mac/NSScrollerImpDetails.mm
Source/WebCore/platform/mac/PasteboardMac.mm
Source/WebCore/platform/mac/PlatformEventFactoryMac.h
Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
Source/WebCore/platform/mac/PlatformPasteboardMac.mm
Source/WebCore/platform/mac/PlatformScreenMac.mm
Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm
Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm
Source/WebCore/platform/mac/ScrollViewMac.mm
Source/WebCore/platform/mac/ScrollbarThemeMac.h
Source/WebCore/platform/mac/ScrollbarThemeMac.mm
Source/WebCore/platform/mac/ThemeMac.h
Source/WebCore/platform/mac/ThemeMac.mm
Source/WebCore/platform/mac/ThreadCheck.mm
Source/WebCore/platform/mac/UserAgentMac.mm
Source/WebCore/platform/mac/WebCoreView.m
Source/WebCore/platform/mac/WidgetMac.mm
Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.h
Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm
Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.h
Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm
Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp

index 900240c..32f0de0 100644 (file)
@@ -1,3 +1,106 @@
+2018-02-15  Tim Horton  <timothy_horton@apple.com>
+
+        Stop using EXCLUDED_SOURCE_FILE_NAMES for actual source files in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=182822
+
+        Reviewed by Dan Bernstein.
+
+        It's much easier to reason about things if xcconfigs don't apply extra
+        constraints to which source files actually build on a per-platform basis.
+        We should use #ifs instead like we usually do.
+
+        * Configurations/WebCore.xcconfig:
+        * Modules/geolocation/ios/GeolocationPositionIOS.mm:
+        * accessibility/ios/AccessibilityObjectIOS.mm:
+        * accessibility/mac/AXObjectCacheMac.mm:
+        * accessibility/mac/AccessibilityObjectMac.mm:
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.h:
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        * dom/DataTransferMac.mm:
+        * editing/ios/DictationCommandIOS.cpp:
+        * editing/ios/DictationCommandIOS.h:
+        * editing/ios/EditorIOS.mm:
+        * editing/ios/WebContentReaderIOS.mm:
+        * editing/mac/EditorMac.mm:
+        * editing/mac/WebContentReaderMac.mm:
+        * page/ios/EventHandlerIOS.mm:
+        * page/ios/FrameIOS.mm:
+        * page/mac/EventHandlerMac.mm:
+        * page/scrolling/ios/ScrollingCoordinatorIOS.h:
+        * page/scrolling/ios/ScrollingCoordinatorIOS.mm:
+        * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
+        * platform/ThreadCheck.h:
+        * platform/audio/ios/AudioDestinationIOS.h:
+        * platform/audio/ios/AudioFileReaderIOS.h:
+        * platform/audio/ios/MediaSessionManagerIOS.h:
+        * platform/graphics/ios/DisplayRefreshMonitorIOS.h:
+        * platform/graphics/ios/DisplayRefreshMonitorIOS.mm:
+        * platform/graphics/ios/FontCacheIOS.mm:
+        * platform/graphics/ios/GraphicsContext3DIOS.h:
+        * platform/graphics/ios/IconIOS.mm:
+        * platform/graphics/mac/ColorMac.h:
+        * platform/graphics/mac/ColorMac.mm:
+        * platform/graphics/mac/DisplayRefreshMonitorMac.cpp:
+        * platform/graphics/mac/DisplayRefreshMonitorMac.h:
+        * platform/graphics/mac/IconMac.mm:
+        * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+        * platform/ios/CursorIOS.cpp:
+        * platform/ios/DeviceMotionClientIOS.h:
+        * platform/ios/DeviceOrientationClientIOS.h:
+        * platform/ios/EventLoopIOS.mm:
+        * platform/ios/KeyEventCodesIOS.h:
+        * platform/ios/LowPowerModeNotifierIOS.mm:
+        * platform/ios/PasteboardIOS.mm:
+        * platform/ios/PlatformEventFactoryIOS.h:
+        * platform/ios/PlatformEventFactoryIOS.mm:
+        * platform/ios/PlatformPasteboardIOS.mm:
+        * platform/ios/PlatformScreenIOS.mm:
+        * platform/ios/PlatformSpeechSynthesizerIOS.mm:
+        * platform/ios/RemoteCommandListenerIOS.h:
+        * platform/ios/RemoteCommandListenerIOS.mm:
+        * platform/ios/SSLKeyGeneratorIOS.cpp:
+        * platform/ios/ScrollAnimatorIOS.h:
+        * platform/ios/ScrollAnimatorIOS.mm:
+        * platform/ios/ScrollViewIOS.mm:
+        * platform/ios/ScrollbarThemeIOS.h:
+        * platform/ios/ScrollbarThemeIOS.mm:
+        * platform/ios/SystemMemoryIOS.cpp:
+        * platform/ios/ThemeIOS.h:
+        * platform/ios/ThemeIOS.mm:
+        * platform/ios/TileControllerMemoryHandlerIOS.cpp:
+        * platform/ios/TileControllerMemoryHandlerIOS.h:
+        * platform/ios/UserAgentIOS.mm:
+        * platform/ios/ValidationBubbleIOS.mm:
+        * platform/ios/WidgetIOS.mm:
+        * platform/mac/CursorMac.mm:
+        * platform/mac/EventLoopMac.mm:
+        * platform/mac/LocalCurrentGraphicsContext.h:
+        * platform/mac/LocalCurrentGraphicsContext.mm:
+        * platform/mac/NSScrollerImpDetails.h:
+        * platform/mac/NSScrollerImpDetails.mm:
+        * platform/mac/PasteboardMac.mm:
+        * platform/mac/PlatformEventFactoryMac.h:
+        * platform/mac/PlatformEventFactoryMac.mm:
+        * platform/mac/PlatformPasteboardMac.mm:
+        * platform/mac/PlatformScreenMac.mm:
+        * platform/mac/PlatformSpeechSynthesizerMac.mm:
+        * platform/mac/SSLKeyGeneratorMac.mm:
+        * platform/mac/ScrollViewMac.mm:
+        * platform/mac/ScrollbarThemeMac.h:
+        * platform/mac/ScrollbarThemeMac.mm:
+        * platform/mac/ThemeMac.h:
+        * platform/mac/ThemeMac.mm:
+        * platform/mac/ThreadCheck.mm:
+        * platform/mac/UserAgentMac.mm:
+        * platform/mac/WebCoreView.h:
+        * platform/mac/WebCoreView.m:
+        * platform/mac/WidgetMac.mm:
+        * platform/mediastream/ios/CoreAudioCaptureSourceIOS.h:
+        * platform/network/ios/NetworkStateNotifierIOS.mm:
+        * platform/network/ios/WebCoreURLResponseIOS.h:
+        * platform/network/ios/WebCoreURLResponseIOS.mm:
+        * platform/network/mac/NetworkStateNotifierMac.cpp:
+
 2018-02-15  Zalan Bujtas  <zalan@apple.com>
 
         [RenderTreeBuilder] Move RenderTableSection::addChild() to RenderTreeBuilder
index a1d531e..189192c 100644 (file)
@@ -120,8 +120,8 @@ EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS_IF_ENABLED_ = JSTouch*;
 EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS = $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_$(ENABLE_IOS_GESTURE_EVENTS)$(ENABLE_MAC_GESTURE_EVENTS));
 EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_ = JSGesture* DOMGesture*;
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm RunLoopMac.mm SSLKeyGeneratorMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebContentReaderMac.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp npapi.h npfunctions.h npruntime.h npruntime_internal.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png npapi.h npfunctions.h npruntime.h npruntime_internal.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
 
 WK_EMPTY_ = YES;
 WK_NOT_ = YES;
index c0d43bf..a6b2d2c 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-#include "GeolocationPosition.h"
+#import "config.h"
+#import "GeolocationPosition.h"
 
 #if PLATFORM(IOS)
 
@@ -52,4 +52,4 @@ GeolocationPosition::GeolocationPosition(CLLocation* location)
 
 }
 
-#endif
+#endif // PLATFORM(IOS)
index 99b45b3..9dd46eb 100644 (file)
@@ -1,3 +1,16 @@
+2018-02-15  Tim Horton  <timothy_horton@apple.com>
+
+        Stop using EXCLUDED_SOURCE_FILE_NAMES for actual source files in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=182822
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/PAL.xcconfig:
+        * pal/system/Sound.cpp:
+        * pal/system/mac/SoundMac.mm:
+        * pal/text/KillRing.cpp:
+        * pal/text/mac/KillRingMac.mm:
+
 2018-02-09  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] Make PAL headers copies
index 320d09c..720786d 100644 (file)
@@ -56,8 +56,7 @@ PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_
 PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
 PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png *Mac.mm;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm KillRing.cpp Sound.cpp;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png;
 
 WK_EMPTY_ = YES;
 WK_NOT_ = YES;
index b782a56..4ab593d 100644 (file)
 #include "config.h"
 #include "Sound.h"
 
+#if !PLATFORM(MAC)
+
 namespace PAL {
 
 void systemBeep() { }
 
 } // namespace PAL
+
+#endif // !PLATFORM(MAC)
index b2ef01a..9e000f0 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "Sound.h"
 
+#if PLATFORM(MAC)
+
 #import <AppKit/AppKit.h>
 
 namespace PAL {
@@ -33,3 +35,5 @@ namespace PAL {
 void systemBeep() { NSBeep(); }
 
 } // namespace PAL
+
+#endif // PLATFORM(MAC)
index 73dd5bd..34c126b 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "KillRing.h"
 
+#if !PLATFORM(MAC)
+
 namespace PAL {
 
 void KillRing::append(const String&)
@@ -50,3 +52,5 @@ void KillRing::setToYankedState()
 }
 
 } // namespace PAL
+
+#endif // !PLATFORM(MAC)
index e9af442..f8353ed 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "KillRing.h"
 
+#if PLATFORM(MAC)
+
 namespace PAL {
 
 extern "C" {
@@ -87,3 +89,4 @@ void KillRing::setToYankedState()
 
 } // namespace PAL
 
+#endif // PLATFORM(MAC)
index e0672b0..81f736f 100644 (file)
 
 #import "config.h"
 #import "AccessibilityObject.h"
+
+#if HAVE(ACCESSIBILITY) && PLATFORM(IOS)
+
 #import "AccessibilityRenderObject.h"
 #import "EventNames.h"
 #import "HTMLInputElement.h"
 #import "RenderObject.h"
 #import "WAKView.h"
-
-#if HAVE(ACCESSIBILITY) && PLATFORM(IOS)
-
 #import "WebAccessibilityObjectWrapperIOS.h"
 
 namespace WebCore {
index f94bad5..399177f 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "AXObjectCache.h"
 
-#if HAVE(ACCESSIBILITY)
+#if HAVE(ACCESSIBILITY) && PLATFORM(MAC)
 
 #import "AccessibilityObject.h"
 #import "AccessibilityTable.h"
@@ -521,4 +521,4 @@ void AXObjectCache::handleScrolledToAnchor(const Node*)
 
 }
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // HAVE(ACCESSIBILITY) && PLATFORM(MAC)
index 2b83da4..af199d7 100644 (file)
@@ -30,7 +30,7 @@
 #import "RenderObject.h"
 #import "Settings.h"
 
-#if HAVE(ACCESSIBILITY)
+#if HAVE(ACCESSIBILITY) && PLATFORM(MAC)
 
 #import "WebAccessibilityObjectWrapperMac.h"
 #import "Widget.h"
@@ -126,4 +126,4 @@ void AccessibilityObject::setCaretBrowsingEnabled(bool on)
 
 } // WebCore
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // HAVE(ACCESSIBILITY) && PLATFORM(MAC)
index 51fb519..ec9c057 100644 (file)
@@ -30,6 +30,8 @@
 
 #import "WebAccessibilityObjectWrapperBase.h"
 
+#if PLATFORM(MAC)
+
 @interface WebAccessibilityObjectWrapper : WebAccessibilityObjectWrapperBase
 
 - (id)textMarkerRangeFromVisiblePositions:(const WebCore::VisiblePosition&)startPosition endPosition:(const WebCore::VisiblePosition&)endPosition;
@@ -40,3 +42,5 @@
 - (id)associatedPluginParent;
 
 @end
+
+#endif // PLATFORM(MAC)
index f2c3f19..8290fde 100644 (file)
@@ -29,7 +29,7 @@
 #import "config.h"
 #import "WebAccessibilityObjectWrapperMac.h"
 
-#if HAVE(ACCESSIBILITY)
+#if HAVE(ACCESSIBILITY) && PLATFORM(MAC)
 
 #import "AXObjectCache.h"
 #import "AccessibilityARIAGridRow.h"
@@ -4365,5 +4365,4 @@ static void formatForDebugger(const VisiblePositionRange& range, char* buffer, u
 
 @end
 
-#endif // HAVE(ACCESSIBILITY)
-
+#endif // HAVE(ACCESSIBILITY) && PLATFORM(MAC)
index 94711a0..b6988dc 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "DataTransfer.h"
 
+#if PLATFORM(MAC)
+
 #import "CachedImage.h"
 #import "Element.h"
 #import "DragImage.h"
@@ -58,3 +60,5 @@ DragImageRef DataTransfer::createDragImage(IntPoint& location) const
 }
 
 }
+
+#endif // PLATFORM(MAC)
index c1932de..632fdab 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "DictationCommandIOS.h"
 
+#if PLATFORM(IOS)
+
 #include "Document.h"
 #include "DocumentMarkerController.h"
 #include "Element.h"
@@ -76,3 +78,5 @@ void DictationCommandIOS::doApply()
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index e5b5b3e..6e2dc6a 100644 (file)
@@ -23,8 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DictationCommandIOS_h
-#define DictationCommandIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #import "CompositeEditCommand.h"
 #import <wtf/RetainPtr.h>
@@ -51,4 +52,4 @@ private:
 
 } // namespace WebCore
 
-#endif
+#endif // PLATFORM(IOS)
index 325297e..5621355 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "Editor.h"
 
+#if PLATFORM(IOS)
+
 #import "CSSComputedStyleDeclaration.h"
 #import "CSSPrimitiveValueMappings.h"
 #import "CachedImage.h"
@@ -394,3 +396,5 @@ void Editor::ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping()
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index 203c847..9b310d5 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "WebContentReader.h"
 
+#if PLATFORM(IOS)
+
 #import "ArchiveResource.h"
 #import "Document.h"
 #import "DocumentFragment.h"
@@ -76,3 +78,5 @@ bool WebContentReader::readURL(const URL& url, const String& title)
 }
 
 }
+
+#endif // PLATFORM(IOS)
index 71e3a90..a1f4563 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "Editor.h"
 
+#if PLATFORM(MAC)
+
 #import "Blob.h"
 #import "CSSPrimitiveValueMappings.h"
 #import "CSSValuePool.h"
@@ -299,3 +301,5 @@ void Editor::applyFontStyles(const String& fontFamily, double fontSize, unsigned
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index 4283a4f..eef0672 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "WebContentReader.h"
 
+#if PLATFORM(MAC)
+
 #import "ArchiveResource.h"
 #import "Document.h"
 #import "DocumentFragment.h"
@@ -62,3 +64,5 @@ bool WebContentReader::readURL(const URL& url, const String& title)
 }
 
 }
+
+#endif // PLATFORM(MAC)
index b3c72a8..5be4483 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "EventHandler.h"
 
+#if PLATFORM(IOS)
+
 #import "AXObjectCache.h"
 #import "AutoscrollController.h"
 #import "Chrome.h"
@@ -632,3 +634,5 @@ bool EventHandler::tryToBeginDataInteractionAtPoint(const IntPoint& clientPositi
 #endif
 
 }
+
+#endif // PLATFORM(IOS)
index b164f78..605a921 100644 (file)
@@ -751,4 +751,5 @@ void Frame::resetAllGeolocationPermission()
 }
 
 } // namespace WebCore
+
 #endif // PLATFORM(IOS)
index 329c7c4..0f5c47d 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "EventHandler.h"
 
+#if PLATFORM(MAC)
+
 #include "AXObjectCache.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
@@ -1155,3 +1157,5 @@ IntPoint EventHandler::targetPositionInWindowForSelectionAutoscroll() const
 }
 
 }
+
+#endif // PLATFORM(MAC)
index 3e885b2..2519be7 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(ASYNC_SCROLLING)
+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
 
 #include "AsyncScrollingCoordinator.h"
 
@@ -59,4 +59,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(ASYNC_SCROLLING)
+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
index e000322..c69a140 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(ASYNC_SCROLLING)
+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
 
 #import "ScrollingCoordinatorIOS.h"
 
@@ -100,4 +100,4 @@ void ScrollingCoordinatorIOS::commitTreeState()
 
 } // namespace WebCore
 
-#endif // ENABLE(ASYNC_SCROLLING)
+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
index 1095f0b..ffd9e87 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "ScrollingTreeFrameScrollingNodeIOS.h"
 
-#if ENABLE(ASYNC_SCROLLING)
+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
 
 #import "FrameView.h"
 #import "ScrollingCoordinator.h"
@@ -201,4 +201,4 @@ FloatPoint ScrollingTreeFrameScrollingNodeIOS::maximumScrollPosition() const
 
 } // namespace WebCore
 
-#endif // ENABLE(ASYNC_SCROLLING)
+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
index 91f136d..4609203 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ThreadCheck_h
-#define ThreadCheck_h
+#pragma once
+
+#if PLATFORM(MAC)
 
-#if !PLATFORM(IOS)
 namespace WebCore {
-    enum ThreadViolationBehavior {
-        NoThreadCheck,
-        LogOnFirstThreadViolation,
-        LogOnThreadViolation,
-        RaiseExceptionOnThreadViolation
-    };
-    enum ThreadViolationRound {
-        ThreadViolationRoundOne = 0,
-        ThreadViolationRoundTwo,
-        ThreadViolationRoundThree,
-        MaximumThreadViolationRound
-    };
-    WEBCORE_EXPORT void setDefaultThreadViolationBehavior(ThreadViolationBehavior, ThreadViolationRound);
-    WEBCORE_EXPORT void reportThreadViolation(const char* function, ThreadViolationRound);
+enum ThreadViolationBehavior {
+    NoThreadCheck,
+    LogOnFirstThreadViolation,
+    LogOnThreadViolation,
+    RaiseExceptionOnThreadViolation
+};
+enum ThreadViolationRound {
+    ThreadViolationRoundOne = 0,
+    ThreadViolationRoundTwo,
+    ThreadViolationRoundThree,
+    MaximumThreadViolationRound
+};
+WEBCORE_EXPORT void setDefaultThreadViolationBehavior(ThreadViolationBehavior, ThreadViolationRound);
+WEBCORE_EXPORT void reportThreadViolation(const char* function, ThreadViolationRound);
 }
 
 extern "C" void WebCoreReportThreadViolation(const char* function, WebCore::ThreadViolationRound);
@@ -49,10 +49,11 @@ extern "C" void WebCoreReportThreadViolation(const char* function, WebCore::Thre
 #define WebCoreThreadViolationCheckRoundOne() ::WebCore::reportThreadViolation(WTF_PRETTY_FUNCTION, WebCore::ThreadViolationRoundOne)
 #define WebCoreThreadViolationCheckRoundTwo() ::WebCore::reportThreadViolation(WTF_PRETTY_FUNCTION, WebCore::ThreadViolationRoundTwo)
 #define WebCoreThreadViolationCheckRoundThree() ::WebCore::reportThreadViolation(WTF_PRETTY_FUNCTION, WebCore::ThreadViolationRoundThree)
+
 #else
+
 #define WebCoreThreadViolationCheckRoundOne() do { } while (0)
 #define WebCoreThreadViolationCheckRoundTwo() do { } while (0)
 #define WebCoreThreadViolationCheckRoundThree() do { } while (0)
-#endif // PLATFORM(IOS)
 
-#endif
+#endif // PLATFORM(MAC)
index 6bc046c..cd7ee10 100644 (file)
@@ -27,8 +27,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AudioDestinationIOS_h
-#define AudioDestinationIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #include "AudioBus.h"
 #include "AudioDestination.h"
@@ -75,5 +76,4 @@ private:
 
 } // namespace WebCore
 
-#endif // AudioDestinationIOS_h
-
+#endif // PLATFORM(IOS)
index 7ada4cd..53b7baf 100644 (file)
@@ -27,8 +27,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AudioFileReaderIOS_h
-#define AudioFileReaderIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #include <AudioToolbox/AudioFile.h>
 #include <AudioToolbox/ExtendedAudioFile.h>
@@ -67,4 +68,4 @@ private:
 
 } // namespace WebCore
 
-#endif // AudioFileReaderIOS_h
+#endif // PLATFORM(IOS)
index 7728418..eb70dc2 100644 (file)
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MediaSessionManageriOS_h
-#define MediaSessionManageriOS_h
+#pragma once
 
 #if PLATFORM(IOS)
 
@@ -88,6 +87,4 @@ private:
 
 } // namespace WebCore
 
-#endif // MediaSessionManageriOS_h
-
 #endif // PLATFORM(IOS)
index 3f85cfc..d000f4a 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef DisplayRefreshMonitorIOS_h
-#define DisplayRefreshMonitorIOS_h
+#pragma once
 
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS)
 
 #include "DisplayRefreshMonitor.h"
 #include <wtf/RetainPtr.h>
@@ -54,6 +53,4 @@ private:
 
 }
 
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
-#endif
+#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS)
index bd3e697..f49b4ce 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "DisplayRefreshMonitorIOS.h"
 
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS)
 
 #import "WebCoreThread.h"
 #import <QuartzCore/QuartzCore.h>
@@ -118,4 +118,4 @@ void DisplayRefreshMonitorIOS::displayLinkFired()
 
 }
 
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS)
index 1a064f5..a069f40 100644 (file)
@@ -29,6 +29,8 @@
 #import "config.h"
 #import "FontCache.h"
 
+#if PLATFORM(IOS)
+
 #import "FontCascade.h"
 #import "RenderThemeIOS.h"
 #import <pal/spi/cg/CoreGraphicsSPI.h>
@@ -168,3 +170,5 @@ RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& famil
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index e3647c2..018cf19 100644 (file)
@@ -23,8 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef GraphicsContext3DIOS_h
-#define GraphicsContext3DIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #define glBindFramebufferEXT glBindFramebuffer
 #define glBindRenderbufferEXT glBindRenderbuffer
@@ -70,4 +71,4 @@
 #define GL_STENCIL_ATTACHMENT_EXT GL_STENCIL_ATTACHMENT
 #define GL_UNSIGNED_INT_8_8_8_8_REV GL_UNSIGNED_BYTE
 
-#endif // GraphicsContext3DIOS_h
+#endif // PLATFORM(IOS)
index 36b24f5..cee516e 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if PLATFORM(IOS)
-
 #import "config.h"
 #import "Icon.h"
 
+#if PLATFORM(IOS)
+
 #import "BitmapImage.h"
 #import "GraphicsContext.h"
 
index 97f44c1..8f70138 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ColorMac_h
-#define ColorMac_h
+#pragma once
 
 #include "Color.h"
 
 #if USE(APPKIT)
+
 OBJC_CLASS NSColor;
-#endif
 
 namespace WebCore {
-    
-#if USE(APPKIT)
-    // These functions assume NSColors are in DeviceRGB colorspace
-    WEBCORE_EXPORT Color colorFromNSColor(NSColor *);
-    WEBCORE_EXPORT NSColor *nsColor(const Color&);
-#endif
 
-    WEBCORE_EXPORT bool usesTestModeFocusRingColor();
-    WEBCORE_EXPORT void setUsesTestModeFocusRingColor(bool);
-    
-    // Focus ring color used for testing purposes.
-    Color oldAquaFocusRingColor();
+// These functions assume NSColors are in DeviceRGB colorspace
+WEBCORE_EXPORT Color colorFromNSColor(NSColor *);
+WEBCORE_EXPORT NSColor *nsColor(const Color&);
+
+WEBCORE_EXPORT bool usesTestModeFocusRingColor();
+WEBCORE_EXPORT void setUsesTestModeFocusRingColor(bool);
+
+// Focus ring color used for testing purposes.
+Color oldAquaFocusRingColor();
 
 }
 
-#endif
+#endif // USE(APPKIT)
index a123c5a..78c9e0a 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "ColorMac.h"
 
+#if USE(APPKIT)
+
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/RetainPtr.h>
@@ -113,3 +115,5 @@ NSColor *nsColor(const Color& color)
 
 
 } // namespace WebCore
+
+#endif // USE(APPKIT)
index f8b7210..3b08e18 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "DisplayRefreshMonitorMac.h"
 
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
 
 #include <QuartzCore/QuartzCore.h>
 #include <wtf/CurrentTime.h>
@@ -98,4 +98,4 @@ void DisplayRefreshMonitorMac::displayLinkFired()
 
 }
 
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
index 76b0650..0fdcd9e 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
 
 #include "DisplayRefreshMonitor.h"
 #include <wtf/WeakPtr.h>
@@ -55,4 +55,4 @@ private:
 
 }
 
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
index 211fc83..6143b51 100644 (file)
@@ -21,7 +21,7 @@
 #import "config.h"
 #import "Icon.h"
 
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
 
 #import "GraphicsContext.h"
 #import "IntRect.h"
@@ -103,4 +103,4 @@ void Icon::paint(GraphicsContext& context, const FloatRect& rect)
 
 }
 
-#endif // !PLATFORM(IOS)
+#endif // PLATFORM(MAC)
index 5f76352..2d21f04 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#if ENABLE(GRAPHICS_CONTEXT_3D)
+#if ENABLE(GRAPHICS_CONTEXT_3D) && !PLATFORM(IOS)
 
 #include "GraphicsContext3D.h"
 
@@ -404,4 +404,4 @@ PlatformLayer* GraphicsContext3D::platformLayer() const
 
 }
 
-#endif // ENABLE(GRAPHICS_CONTEXT_3D)
+#endif // ENABLE(GRAPHICS_CONTEXT_3D) && !PLATFORM(IOS)
index c9f0e22..2d3dbe5 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "Cursor.h"
 
+#if PLATFORM(IOS)
+
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
@@ -257,3 +259,5 @@ IntPoint determineHotSpot(Image*, const IntPoint&)
 }
 
 }
+
+#endif // PLATFORM(IOS)
index 95671c3..caf13b7 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DeviceMotionClientIOS_h
-#define DeviceMotionClientIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #include "DeviceMotionClient.h"
 #include "DeviceMotionController.h"
 #include "DeviceMotionData.h"
 #include <wtf/RefPtr.h>
 
-#ifdef __OBJC__
-@class WebCoreMotionManager;
-#else
-class WebCoreMotionManager;
-#endif
+OBJC_CLASS WebCoreMotionManager;
 
 namespace WebCore {
 
@@ -60,4 +57,4 @@ private:
 
 } // namespace WebCore
 
-#endif // DeviceMotionClientIOS_h
+#endif // PLATFORM(IOS)
index 228ef72..d60fe19 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DeviceOrientationClientIOS_h
-#define DeviceOrientationClientIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #include "DeviceOrientationClient.h"
 #include "DeviceOrientationController.h"
 #include "DeviceOrientationData.h"
 #include <wtf/RefPtr.h>
 
-#ifdef __OBJC__
-@class WebCoreMotionManager;
-#else
-class WebCoreMotionManager;
-#endif
+OBJC_CLASS WebCoreMotionManager;
 
 namespace WebCore {
 
@@ -60,4 +57,4 @@ private:
 
 } // namespace WebCore
 
-#endif // DeviceOrientationClientIOS_h
+#endif // PLATFORM(IOS)
index 7998d84..3f61df7 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "EventLoop.h"
 
+#if PLATFORM(IOS)
+
 #include <CoreFoundation/CFRunLoop.h>
 
 namespace WebCore {
@@ -37,3 +39,5 @@ void EventLoop::cycle()
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index b408a15..0e9c722 100644 (file)
@@ -23,8 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef KeyEventCodesIOS_h
-#define KeyEventCodesIOS_h
+#pragma once
+
+#if TARGET_OS_IOS
 
 // Unicodes we reserve for function keys on the keyboard,
 // OpenStep reserves the range 0xF700-0xF8FF for this purpose.
@@ -118,4 +119,4 @@ enum {
     NSDeleteCharacter = 0x007f
 };
 
-#endif // KeyEventCodesIOS_h
+#endif // TARGET_OS_IOS
index 29a3aa8..dc4006c 100644 (file)
@@ -26,6 +26,7 @@
 #import "config.h"
 
 #if PLATFORM(IOS)
+
 #import "LowPowerModeNotifier.h"
 
 #import "Logging.h"
@@ -101,4 +102,4 @@ void notifyLowPowerModeChanged(LowPowerModeNotifier& notifier, bool enabled)
 
 } // namespace WebCore
 
-#endif
+#endif // PLATFORM(IOS)
index c5132e3..2f7120d 100644 (file)
@@ -25,6 +25,8 @@
 #import "config.h"
 #import "Pasteboard.h"
 
+#if PLATFORM(IOS)
+
 #import "DragData.h"
 #import "Image.h"
 #import "NotImplemented.h"
@@ -450,3 +452,5 @@ Vector<String> Pasteboard::readFilePaths()
 }
 
 }
+
+#endif // PLATFORM(IOS)
index 84d08f2..bc74594 100644 (file)
@@ -23,8 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PlatformEventFactoryIOS_h
-#define PlatformEventFactoryIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
@@ -34,7 +35,7 @@
 #include <WebKitAdditions/PlatformTouchEventIOS.h>
 #endif
 
-@class WebEvent;
+OBJC_CLASS WebEvent;
 
 namespace WebCore {
 
@@ -55,4 +56,4 @@ WEBCORE_EXPORT String keyIdentifierForKeyEvent(WebEvent *);
 
 } // namespace WebCore
 
-#endif // PlatformEventFactoryIOS_h
+#endif // PLATFORM(IOS)
index 48c8403..c97459b 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "PlatformEventFactoryIOS.h"
 
+#if PLATFORM(IOS)
+
 #import "IntPoint.h"
 #import "KeyEventCocoa.h"
 #import "Logging.h"
@@ -525,3 +527,5 @@ PlatformTouchEvent PlatformEventFactory::createPlatformSimulatedTouchEvent(Platf
 #endif // ENABLE(TOUCH_EVENTS)
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index 958f5b7..c6b1c13 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "PlatformPasteboard.h"
 
+#if PLATFORM(IOS)
+
 #import "Color.h"
 #import "Image.h"
 #import "Pasteboard.h"
@@ -642,3 +644,5 @@ void PlatformPasteboard::updateSupportedTypeIdentifiers(const Vector<String>& ty
 }
 
 }
+
+#endif // PLATFORM(IOS)
index e6726bc..646dcce 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "PlatformScreen.h"
 
+#if PLATFORM(IOS)
+
 #import "Device.h"
 #import "FloatRect.h"
 #import "FloatSize.h"
@@ -153,3 +155,5 @@ float screenScaleFactor(UIScreen *screen)
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index 1512640..4bbcf38 100644 (file)
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-#include "PlatformSpeechSynthesizer.h"
+#import "config.h"
+#import "PlatformSpeechSynthesizer.h"
 
-#if PLATFORM(IOS)
+#if ENABLE(SPEECH_SYNTHESIS) && PLATFORM(IOS)
 
-#if ENABLE(SPEECH_SYNTHESIS)
-
-#include "PlatformSpeechSynthesisUtterance.h"
-#include "PlatformSpeechSynthesisVoice.h"
-#include <AVFoundation/AVSpeechSynthesis.h>
-#include <wtf/BlockObjCExceptions.h>
-#include <wtf/RetainPtr.h>
-#include <wtf/SoftLinking.h>
+#import "PlatformSpeechSynthesisUtterance.h"
+#import "PlatformSpeechSynthesisVoice.h"
+#import <AVFoundation/AVSpeechSynthesis.h>
+#import <wtf/BlockObjCExceptions.h>
+#import <wtf/RetainPtr.h>
+#import <wtf/SoftLinking.h>
 
 SOFT_LINK_FRAMEWORK(AVFoundation)
 SOFT_LINK_CLASS(AVFoundation, AVSpeechSynthesizer)
@@ -281,6 +279,4 @@ void PlatformSpeechSynthesizer::cancel()
 
 } // namespace WebCore
 
-#endif // ENABLE(SPEECH_SYNTHESIS)
-
-#endif // PLATFORM(IOS)
+#endif // ENABLE(SPEECH_SYNTHESIS) && PLATFORM(IOS)
index be1594e..d507c31 100644 (file)
@@ -23,8 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef RemoteCommandListenerIOS_h
-#define RemoteCommandListenerIOS_h
+#pragma once
 
 #include "RemoteCommandListener.h"
 
@@ -59,6 +58,4 @@ protected:
 
 }
 
-#endif
-
-#endif
+#endif // PLATFORM(IOS)
index b4cce37..cbd11d4 100644 (file)
@@ -25,6 +25,8 @@
 #include "config.h"
 #include "SSLKeyGenerator.h"
 
+#if PLATFORM(IOS)
+
 namespace WebCore {
 
 void getSupportedKeySizes(Vector<String>&)
@@ -39,3 +41,5 @@ String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& ch
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index 74edc8e..af0c96d 100644 (file)
@@ -23,8 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ScrollAnimatorIOS_h
-#define ScrollAnimatorIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #include "ScrollAnimator.h"
 
@@ -69,4 +70,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ScrollAnimatorIOS_h
+#endif // PLATFORM(IOS)
index 9fbea43..e15e6a8 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-#include "ScrollAnimatorIOS.h"
+#import "config.h"
+#import "ScrollAnimatorIOS.h"
 
-#include "Frame.h"
-#include "RenderLayer.h"
-#include "ScrollableArea.h"
+#if PLATFORM(IOS)
+
+#import "Frame.h"
+#import "RenderLayer.h"
+#import "ScrollableArea.h"
 
 #if ENABLE(TOUCH_EVENTS)
-#include "PlatformTouchEventIOS.h"
+#import "PlatformTouchEventIOS.h"
 #endif
 
 namespace WebCore {
@@ -185,3 +187,5 @@ void ScrollAnimatorIOS::determineScrollableAreaForTouchSequence(const IntSize& s
 #endif
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index 3a3b9f9..b293fee 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "ScrollView.h"
 
+#if PLATFORM(IOS)
+
 #import "FloatRect.h"
 #import "IntRect.h"
 #import "Logging.h"
@@ -316,3 +318,5 @@ void ScrollView::platformSetScrollOrigin(const IntPoint& origin, bool updatePosi
 }
 
 }
+
+#endif // PLATFORM(IOS)
index 76499bd..1182c35 100644 (file)
@@ -23,8 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ScrollbarThemeIOS_h
-#define ScrollbarThemeIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #include "ScrollbarThemeComposite.h"
 
@@ -65,4 +66,4 @@ public:
 
 }
 
-#endif // ScrollbarThemeIOS_h
+#endif // PLATFORM(IOS)
index e821ae4..a5590f9 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ScrollbarThemeIOS.h"
 
+#if PLATFORM(IOS)
+
 #include "GraphicsContext.h"
 #include "IntRect.h"
 #include "PlatformMouseEvent.h"
@@ -117,3 +119,5 @@ bool ScrollbarThemeIOS::paint(Scrollbar&, GraphicsContext&, const IntRect& /*dam
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index d888cd2..6ea41de 100644 (file)
@@ -29,6 +29,8 @@
 #include "config.h"
 #include "SystemMemory.h"
 
+#if PLATFORM(IOS)
+
 #include <sys/sysctl.h>
 #include <wtf/Assertions.h>
 #include <wtf/CurrentTime.h>
@@ -53,3 +55,5 @@ int systemMemoryLevel()
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index 70b61ab..287b269 100644 (file)
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#if PLATFORM(IOS)
+
 #include "ThemeCocoa.h"
 
 namespace WebCore {
@@ -35,3 +37,5 @@ private:
 };
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index 31502cb..9f871c7 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "ThemeIOS.h"
 
+#if PLATFORM(IOS)
+
 #import <wtf/NeverDestroyed.h>
 #import <wtf/SoftLinking.h>
 
@@ -48,3 +50,5 @@ bool ThemeIOS::userPrefersReducedMotion() const
 }
 
 }
+
+#endif // PLATFORM(IOS)
index efb2665..0224acb 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "TileControllerMemoryHandlerIOS.h"
 
+#if PLATFORM(IOS)
+
 #include "TileController.h"
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/NeverDestroyed.h>
@@ -85,3 +87,5 @@ TileControllerMemoryHandler& tileControllerMemoryHandler()
 }
 
 }
+
+#endif // PLATFORM(IOS)
index 1323395..2630f7e 100644 (file)
@@ -23,8 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TileControllerMemoryHandlerIOS_h
-#define TileControllerMemoryHandlerIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #include <wtf/ListHashSet.h>
 #include <wtf/NeverDestroyed.h>
@@ -53,4 +54,4 @@ private:
 WEBCORE_EXPORT TileControllerMemoryHandler& tileControllerMemoryHandler();
 }
 
-#endif // TileControllerMemoryHandlerIOS_h
+#endif // PLATFORM(IOS)
index 8077ae1..b2b897e 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "UserAgent.h"
 
+#if PLATFORM(IOS)
+
 #import "Device.h"
 #import "SystemVersion.h"
 #import <pal/spi/ios/MobileGestaltSPI.h>
@@ -96,3 +98,5 @@ String standardUserAgentWithApplicationName(const String& applicationName)
 }
 
 } // namespace WebCore.
+
+#endif // PLATFORM(IOS)
index ebd371e..3978fe0 100644 (file)
@@ -26,6 +26,7 @@
 #import "config.h"
 
 #if PLATFORM(IOS)
+
 #import "ValidationBubble.h"
 
 #import <pal/spi/ios/UIKitSPI.h>
index d8e10d1..8b1e8b5 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "Widget.h"
 
+#if PLATFORM(IOS)
+
 #import "Cursor.h"
 #import "Document.h"
 #import "FontCascade.h"
@@ -273,3 +275,5 @@ void Widget::setPlatformWidget(NSView *widget)
 }
 
 }
+
+#endif // PLATFORM(IOS)
index 16a162d..39d42d6 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "Cursor.h"
 
+#if PLATFORM(MAC)
+
 #import <objc/runtime.h>
 #import <pal/spi/mac/HIServicesSPI.h>
 #import <wtf/BlockObjCExceptions.h>
@@ -382,3 +384,5 @@ NSCursor *Cursor::platformCursor() const
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index 8300445..5affabf 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "EventLoop.h"
 
+#if PLATFORM(MAC)
+
 namespace WebCore {
 
 void EventLoop::cycle()
@@ -42,3 +44,5 @@ void EventLoop::cycle()
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index 48feb2e..efec87c 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
+#pragma once
+
 #include "GraphicsContext.h"
 #include <wtf/Noncopyable.h>
 
+#if USE(APPKIT)
+
 OBJC_CLASS NSGraphicsContext;
 
 namespace WebCore {
@@ -52,3 +56,5 @@ private:
 };
 
 }
+
+#endif // USE(APPKIT)
index 0f39aa5..c98fc28 100644 (file)
@@ -20,6 +20,8 @@
 #include "config.h"
 #include "LocalCurrentGraphicsContext.h"
 
+#if USE(APPKIT)
+
 #include <AppKit/NSGraphicsContext.h>
 
 namespace WebCore {
@@ -62,3 +64,5 @@ CGContextRef LocalCurrentGraphicsContext::cgContext()
 }
 
 }
+
+#endif // USE(APPKIT)
index 4b1f30a..070e353 100644 (file)
@@ -23,8 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef WebCore_NSScrollerImpDetails_h
-#define WebCore_NSScrollerImpDetails_h
+#pragma once
+
+#if USE(APPKIT)
 
 namespace WebCore {
 
@@ -32,4 +33,4 @@ NSScrollerStyle recommendedScrollerStyle();
 
 }
 
-#endif
+#endif // USE(APPKIT)
index c2319f9..3296a39 100644 (file)
  */
 
 
-#include "config.h"
-#include "NSScrollerImpDetails.h"
+#import "config.h"
+#import "NSScrollerImpDetails.h"
 
-#include "DeprecatedGlobalSettings.h"
+#if USE(APPKIT)
+
+#import "DeprecatedGlobalSettings.h"
 
 namespace WebCore {
 
@@ -40,3 +42,5 @@ NSScrollerStyle recommendedScrollerStyle()
 }
 
 }
+
+#endif // USE(APPKIT)
index 6376496..3d5d37d 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "Pasteboard.h"
 
+#if PLATFORM(MAC)
+
 #import "DragData.h"
 #import "Image.h"
 #import "LegacyNSPasteboardTypes.h"
@@ -673,3 +675,5 @@ void Pasteboard::setDragImage(DragImage image, const IntPoint& location)
 #endif
 
 }
+
+#endif // PLATFORM(MAC)
index c40ec21..e2ab405 100644 (file)
@@ -29,6 +29,8 @@
 #include "PlatformMouseEvent.h"
 #include "PlatformWheelEvent.h"
 
+#if PLATFORM(MAC)
+
 namespace WebCore {
 
 class PlatformEventFactory {
@@ -56,3 +58,5 @@ WEBCORE_EXPORT UInt8 keyCharForEvent(NSEvent *);
 #endif
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index 36b49e0..8de9fbb 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "PlatformEventFactoryMac.h"
 
+#if PLATFORM(MAC)
+
 #import "KeyEventCocoa.h"
 #import "Logging.h"
 #import "PlatformScreen.h"
@@ -859,3 +861,5 @@ PlatformKeyboardEvent PlatformEventFactory::createPlatformKeyboardEvent(NSEvent
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index dc22883..144a647 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "PlatformPasteboard.h"
 
+#if PLATFORM(MAC)
+
 #import "Color.h"
 #import "LegacyNSPasteboardTypes.h"
 #import "Pasteboard.h"
@@ -310,3 +312,5 @@ long PlatformPasteboard::setStringForType(const String& string, const String& pa
 }
 
 }
+
+#endif // PLATFORM(MAC)
index 8d7957a..76c7aaa 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "PlatformScreen.h"
 
+#if PLATFORM(MAC)
+
 #import "FloatRect.h"
 #import "FrameView.h"
 #import "HostWindow.h"
@@ -169,3 +171,5 @@ NSPoint flipScreenPoint(const NSPoint& screenPoint, NSScreen *screen)
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index 86f91e1..3f00ff9 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-#include "PlatformSpeechSynthesizer.h"
+#import "config.h"
+#import "PlatformSpeechSynthesizer.h"
 
-#include "PlatformSpeechSynthesisUtterance.h"
-#include "PlatformSpeechSynthesisVoice.h"
-#include <AppKit/NSSpeechSynthesizer.h>
-#include <pal/spi/mac/SpeechSynthesisSPI.h>
-#include <wtf/RetainPtr.h>
+#if ENABLE(SPEECH_SYNTHESIS) && PLATFORM(MAC)
 
-#if ENABLE(SPEECH_SYNTHESIS)
+#import "PlatformSpeechSynthesisUtterance.h"
+#import "PlatformSpeechSynthesisVoice.h"
+#import <AppKit/NSSpeechSynthesizer.h>
+#import <pal/spi/mac/SpeechSynthesisSPI.h>
+#import <wtf/RetainPtr.h>
 
 @interface WebSpeechSynthesisWrapper : NSObject<NSSpeechSynthesizerDelegate>
 {
@@ -279,4 +279,4 @@ void PlatformSpeechSynthesizer::cancel()
 
 } // namespace WebCore
 
-#endif // ENABLE(SPEECH_SYNTHESIS)
+#endif // ENABLE(SPEECH_SYNTHESIS) && PLATFORM(MAC)
index 98e5f17..3e2ce52 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "SSLKeyGenerator.h"
 
+#if PLATFORM(MAC)
+
 #import "LocalizedStrings.h"
 #import "URL.h"
 #import <Security/SecAsn1Coder.h>
@@ -247,3 +249,5 @@ String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& ch
 }
 
 }
+
+#endif // PLATFORM(MAC)
index 1290311..26b6cb4 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "ScrollView.h"
 
+#if PLATFORM(MAC)
+
 #import "FloatRect.h"
 #import "FloatSize.h"
 #import "IntRect.h"
@@ -282,3 +284,5 @@ void ScrollView::platformSetScrollOrigin(const IntPoint& origin, bool updatePosi
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index 26a89ff..47e286e 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ScrollbarThemeMac_h
-#define ScrollbarThemeMac_h
+#pragma once
 
 #include "ScrollbarThemeComposite.h"
 
+#if PLATFORM(MAC)
+
 namespace WebCore {
 
 class ScrollbarThemeMac : public ScrollbarThemeComposite {
@@ -99,4 +100,4 @@ protected:
 
 }
 
-#endif
+#endif // PLATFORM(MAC)
index 769dedc..df41f2d 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "config.h"
-#include "ScrollbarThemeMac.h"
-
-#include "ColorMac.h"
-#include "GraphicsLayer.h"
-#include "ImageBuffer.h"
-#include "LocalCurrentGraphicsContext.h"
-#include "NSScrollerImpDetails.h"
-#include "PlatformMouseEvent.h"
-#include "ScrollAnimatorMac.h"
-#include "ScrollView.h"
-#include <Carbon/Carbon.h>
-#include <pal/spi/cg/CoreGraphicsSPI.h>
-#include <pal/spi/mac/NSScrollerImpSPI.h>
-#include <wtf/BlockObjCExceptions.h>
-#include <wtf/HashMap.h>
-#include <wtf/NeverDestroyed.h>
-#include <wtf/SetForScope.h>
-#include <wtf/StdLibExtras.h>
+#import "config.h"
+#import "ScrollbarThemeMac.h"
+
+#if PLATFORM(MAC)
+
+#import "ColorMac.h"
+#import "GraphicsLayer.h"
+#import "ImageBuffer.h"
+#import "LocalCurrentGraphicsContext.h"
+#import "NSScrollerImpDetails.h"
+#import "PlatformMouseEvent.h"
+#import "ScrollAnimatorMac.h"
+#import "ScrollView.h"
+#import <Carbon/Carbon.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/mac/NSScrollerImpSPI.h>
+#import <wtf/BlockObjCExceptions.h>
+#import <wtf/HashMap.h>
+#import <wtf/NeverDestroyed.h>
+#import <wtf/SetForScope.h>
+#import <wtf/StdLibExtras.h>
 
 // FIXME: There are repainting problems due to Aqua scroll bar buttons' visual overflow.
 
@@ -632,3 +634,5 @@ void ScrollbarThemeMac::setUpContentShadowLayer(GraphicsLayer* graphicsLayer)
 #endif
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index e2c3406..0fbec6f 100644 (file)
@@ -27,6 +27,8 @@
 
 #include "ThemeCocoa.h"
 
+#if PLATFORM(MAC)
+
 namespace WebCore {
 
 class ThemeMac final : public ThemeCocoa {
@@ -58,3 +60,5 @@ private:
 };
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index d8fdfb3..8cd6f41 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "ThemeMac.h"
 
+#if PLATFORM(MAC)
+
 #import "AXObjectCache.h"
 #import "ControlStates.h"
 #import "GraphicsContext.h"
@@ -871,3 +873,5 @@ bool ThemeMac::userPrefersReducedMotion() const
 }
 
 }
+
+#endif // PLATFORM(MAC)
index ec0b999..f151088 100644 (file)
 #import "config.h"
 #import "ThreadCheck.h"
 
+#if PLATFORM(MAC)
+
 #import <wtf/HashSet.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/StdLibExtras.h>
-#include <wtf/text/StringHash.h>
+#import <wtf/text/StringHash.h>
 
 namespace WebCore {
 
@@ -117,3 +119,5 @@ void WebCoreReportThreadViolation(const char* function, WebCore::ThreadViolation
             break;
     }
 }
+
+#endif // PLATFORM(MAC)
index 3eaa82f..da7e183 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "UserAgent.h"
 
+#if PLATFORM(MAC)
+
 #import "SystemVersion.h"
 
 namespace WebCore {
@@ -49,3 +51,5 @@ String standardUserAgentWithApplicationName(const String& applicationName)
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index 2be96c4..e7fef54 100644 (file)
@@ -24,6 +24,9 @@
  */
 
 #import "config.h"
+
+#if USE(APPKIT)
+
 #import "WebCoreView.h"
 
 @interface NSClipView (WebCoreView)
@@ -63,3 +66,4 @@
 
 @end
 
+#endif // USE(APPKIT)
index 848449c..996c19d 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "Widget.h"
 
+#if PLATFORM(MAC)
+
 #import "Chrome.h"
 #import "Cursor.h"
 #import "Document.h"
@@ -348,3 +350,5 @@ void Widget::setPlatformWidget(NSView *widget)
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index 90ddf3a..c027bc4 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "NetworkStateNotifier.h"
 
+#if PLATFORM(IOS)
+
 #import "DeprecatedGlobalSettings.h"
 #import "WebCoreThreadRun.h"
 #import <wtf/SoftLinking.h>
@@ -93,3 +95,5 @@ void NetworkStateNotifier::startObserving()
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index 5ffb7df..8531f32 100644 (file)
@@ -26,8 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebCoreURLResponseIOS_h
-#define WebCoreURLResponseIOS_h
+#pragma once
+
+#if PLATFORM(IOS)
 
 #ifdef __OBJC__
 #include "WebCoreURLResponse.h"
@@ -60,4 +61,4 @@ inline bool shouldUseQuickLookForMIMEType(const WTF::String& mimeType)
 
 } // namespace WebCore
 
-#endif // WebCoreURLResponseIOS_h
+#endif // PLATFORM(IOS)
index c729d6c..757f0f2 100644 (file)
@@ -29,6 +29,8 @@
 #import "config.h"
 #import "WebCoreURLResponseIOS.h"
 
+#if PLATFORM(IOS)
+
 #import "QuickLook.h"
 #import "UTIUtilities.h"
 #import <MobileCoreServices/MobileCoreServices.h>
@@ -74,3 +76,5 @@ void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse, bool isMainResourceL
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(IOS)
index 555ed75..61df783 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "NetworkStateNotifier.h"
 
+#if PLATFORM(MAC)
+
 #include <SystemConfiguration/SystemConfiguration.h>
 
 namespace WebCore {
@@ -96,3 +98,5 @@ void NetworkStateNotifier::startObserving()
 }
     
 }
+
+#endif // PLATFORM(MAC)