Diff
Modified: trunk/Source/WebCore/ChangeLog (228530 => 228531)
--- trunk/Source/WebCore/ChangeLog 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/ChangeLog 2018-02-15 21:08:45 UTC (rev 228531)
@@ -1,3 +1,106 @@
+2018-02-15 Tim Horton <[email protected]>
+
+ 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 <[email protected]>
[RenderTreeBuilder] Move RenderTableSection::addChild() to RenderTreeBuilder
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (228530 => 228531)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-02-15 21:08:45 UTC (rev 228531)
@@ -120,8 +120,8 @@
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_FIL
E_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;
Modified: trunk/Source/WebCore/Modules/geolocation/ios/GeolocationPositionIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/Modules/geolocation/ios/GeolocationPositionIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/Modules/geolocation/ios/GeolocationPositionIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
-#endif
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/PAL/ChangeLog (228530 => 228531)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-02-15 21:08:45 UTC (rev 228531)
@@ -1,3 +1,16 @@
+2018-02-15 Tim Horton <[email protected]>
+
+ 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 <[email protected]>
[CMake] Make PAL headers copies
Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (228530 => 228531)
--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2018-02-15 21:08:45 UTC (rev 228531)
@@ -56,8 +56,7 @@
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;
Modified: trunk/Source/WebCore/PAL/pal/system/Sound.cpp (228530 => 228531)
--- trunk/Source/WebCore/PAL/pal/system/Sound.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/PAL/pal/system/Sound.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,8 +26,12 @@
#include "config.h"
#include "Sound.h"
+#if !PLATFORM(MAC)
+
namespace PAL {
void systemBeep() { }
} // namespace PAL
+
+#endif // !PLATFORM(MAC)
Modified: trunk/Source/WebCore/PAL/pal/system/mac/SoundMac.mm (228530 => 228531)
--- trunk/Source/WebCore/PAL/pal/system/mac/SoundMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/PAL/pal/system/mac/SoundMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,8 @@
#import "config.h"
#import "Sound.h"
+#if PLATFORM(MAC)
+
#import <AppKit/AppKit.h>
namespace PAL {
@@ -33,3 +35,5 @@
void systemBeep() { NSBeep(); }
} // namespace PAL
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/PAL/pal/text/KillRing.cpp (228530 => 228531)
--- trunk/Source/WebCore/PAL/pal/text/KillRing.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/PAL/pal/text/KillRing.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,8 @@
#include "config.h"
#include "KillRing.h"
+#if !PLATFORM(MAC)
+
namespace PAL {
void KillRing::append(const String&)
@@ -50,3 +52,5 @@
}
} // namespace PAL
+
+#endif // !PLATFORM(MAC)
Modified: trunk/Source/WebCore/PAL/pal/text/mac/KillRingMac.mm (228530 => 228531)
--- trunk/Source/WebCore/PAL/pal/text/mac/KillRingMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/PAL/pal/text/mac/KillRingMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,8 @@
#import "config.h"
#import "KillRing.h"
+#if PLATFORM(MAC)
+
namespace PAL {
extern "C" {
@@ -87,3 +89,4 @@
} // namespace PAL
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -25,14 +25,14 @@
#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 {
Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (228530 => 228531)
--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
-#endif // HAVE(ACCESSIBILITY)
+#endif // HAVE(ACCESSIBILITY) && PLATFORM(MAC)
Modified: trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm (228530 => 228531)
--- trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
} // WebCore
-#endif // HAVE(ACCESSIBILITY)
+#endif // HAVE(ACCESSIBILITY) && PLATFORM(MAC)
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h (228530 => 228531)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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)
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (228530 => 228531)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
@end
-#endif // HAVE(ACCESSIBILITY)
-
+#endif // HAVE(ACCESSIBILITY) && PLATFORM(MAC)
Modified: trunk/Source/WebCore/dom/DataTransferMac.mm (228530 => 228531)
--- trunk/Source/WebCore/dom/DataTransferMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/dom/DataTransferMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/editing/ios/DictationCommandIOS.cpp (228530 => 228531)
--- trunk/Source/WebCore/editing/ios/DictationCommandIOS.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/editing/ios/DictationCommandIOS.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/editing/ios/DictationCommandIOS.h (228530 => 228531)
--- trunk/Source/WebCore/editing/ios/DictationCommandIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/editing/ios/DictationCommandIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,9 +23,10 @@
* 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 @@
} // namespace WebCore
-#endif
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/editing/ios/WebContentReaderIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/editing/ios/WebContentReaderIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/editing/ios/WebContentReaderIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (228530 => 228531)
--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/editing/mac/WebContentReaderMac.mm (228530 => 228531)
--- trunk/Source/WebCore/editing/mac/WebContentReaderMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/editing/mac/WebContentReaderMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
#endif
}
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -751,4 +751,5 @@
}
} // namespace WebCore
+
#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (228530 => 228531)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h (228530 => 228531)
--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -25,7 +25,7 @@
#pragma once
-#if ENABLE(ASYNC_SCROLLING)
+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
#include "AsyncScrollingCoordinator.h"
@@ -59,4 +59,4 @@
} // namespace WebCore
-#endif // ENABLE(ASYNC_SCROLLING)
+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(ASYNC_SCROLLING)
+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
#import "ScrollingCoordinatorIOS.h"
@@ -100,4 +100,4 @@
} // namespace WebCore
-#endif // ENABLE(ASYNC_SCROLLING)
+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
} // namespace WebCore
-#endif // ENABLE(ASYNC_SCROLLING)
+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ThreadCheck.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ThreadCheck.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ThreadCheck.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,25 +23,25 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ThreadCheck_h
-#define ThreadCheck_h
+#pragma once
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
+
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 @@
#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)
Modified: trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -27,9 +27,10 @@
* 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"
#include <AudioUnit/AudioUnit.h>
@@ -75,5 +76,4 @@
} // namespace WebCore
-#endif // AudioDestinationIOS_h
-
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -27,9 +27,10 @@
* 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>
#include <wtf/RefPtr.h>
@@ -67,4 +68,4 @@
} // namespace WebCore
-#endif // AudioFileReaderIOS_h
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,8 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef MediaSessionManageriOS_h
-#define MediaSessionManageriOS_h
+#pragma once
#if PLATFORM(IOS)
@@ -88,6 +87,4 @@
} // namespace WebCore
-#endif // MediaSessionManageriOS_h
-
#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,10 +23,9 @@
* 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 @@
}
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
-#endif
+#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/graphics/ios/GraphicsContext3DIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/ios/GraphicsContext3DIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/ios/GraphicsContext3DIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,9 +23,10 @@
* 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
#define glCheckFramebufferStatusEXT glCheckFramebufferStatus
@@ -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)
Modified: trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,11 +23,11 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(IOS)
-
#import "config.h"
#import "Icon.h"
+#if PLATFORM(IOS)
+
#import "BitmapImage.h"
#import "GraphicsContext.h"
Modified: trunk/Source/WebCore/platform/graphics/mac/ColorMac.h (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/mac/ColorMac.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/mac/ColorMac.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,29 +26,26 @@
* 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)
Modified: trunk/Source/WebCore/platform/graphics/mac/ColorMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/mac/ColorMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/mac/ColorMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
} // namespace WebCore
+
+#endif // USE(APPKIT)
Modified: trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/graphics/mac/IconMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
-#endif // !PLATFORM(IOS)
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (228530 => 228531)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
-#endif // ENABLE(GRAPHICS_CONTEXT_3D)
+#endif // ENABLE(GRAPHICS_CONTEXT_3D) && !PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/CursorIOS.cpp (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/CursorIOS.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/CursorIOS.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,8 @@
#include "config.h"
#include "Cursor.h"
+#if PLATFORM(IOS)
+
#include <wtf/NeverDestroyed.h>
namespace WebCore {
@@ -257,3 +259,5 @@
}
}
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,19 +23,16 @@
* 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 @@
} // namespace WebCore
-#endif // DeviceMotionClientIOS_h
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,19 +23,16 @@
* 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 @@
} // namespace WebCore
-#endif // DeviceOrientationClientIOS_h
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/EventLoopIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/EventLoopIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/EventLoopIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,8 @@
#include "config.h"
#include "EventLoop.h"
+#if PLATFORM(IOS)
+
#include <CoreFoundation/CFRunLoop.h>
namespace WebCore {
@@ -37,3 +39,5 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/KeyEventCodesIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/KeyEventCodesIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/KeyEventCodesIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,9 +23,10 @@
* 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.
// The availability of various keys will be system dependent.
@@ -118,4 +119,4 @@
NSDeleteCharacter = 0x007f
};
-#endif // KeyEventCodesIOS_h
+#endif // TARGET_OS_IOS
Modified: trunk/Source/WebCore/platform/ios/LowPowerModeNotifierIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/LowPowerModeNotifierIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/LowPowerModeNotifierIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,7 @@
#import "config.h"
#if PLATFORM(IOS)
+
#import "LowPowerModeNotifier.h"
#import "Logging.h"
@@ -101,4 +102,4 @@
} // namespace WebCore
-#endif
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,9 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef PlatformEventFactoryIOS_h
-#define PlatformEventFactoryIOS_h
+#pragma once
+#if PLATFORM(IOS)
+
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
#include "PlatformWheelEvent.h"
@@ -34,7 +35,7 @@
#include <WebKitAdditions/PlatformTouchEventIOS.h>
#endif
-@class WebEvent;
+OBJC_CLASS WebEvent;
namespace WebCore {
@@ -55,4 +56,4 @@
} // namespace WebCore
-#endif // PlatformEventFactoryIOS_h
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
#endif // ENABLE(TOUCH_EVENTS)
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -22,20 +22,18 @@
* 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)
+#import "PlatformSpeechSynthesisUtterance.h"
+#import "PlatformSpeechSynthesisVoice.h"
+#import <AVFoundation/AVSpeechSynthesis.h>
+#import <wtf/BlockObjCExceptions.h>
+#import <wtf/RetainPtr.h>
+#import <wtf/SoftLinking.h>
-#include "PlatformSpeechSynthesisUtterance.h"
-#include "PlatformSpeechSynthesisVoice.h"
-#include <AVFoundation/AVSpeechSynthesis.h>
-#include <wtf/BlockObjCExceptions.h>
-#include <wtf/RetainPtr.h>
-#include <wtf/SoftLinking.h>
-
SOFT_LINK_FRAMEWORK(AVFoundation)
SOFT_LINK_CLASS(AVFoundation, AVSpeechSynthesizer)
SOFT_LINK_CLASS(AVFoundation, AVSpeechUtterance)
@@ -281,6 +279,4 @@
} // namespace WebCore
-#endif // ENABLE(SPEECH_SYNTHESIS)
-
-#endif // PLATFORM(IOS)
+#endif // ENABLE(SPEECH_SYNTHESIS) && PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
-#endif
-
-#endif
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -148,4 +148,4 @@
}
-#endif
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/SSLKeyGeneratorIOS.cpp (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/SSLKeyGeneratorIOS.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/SSLKeyGeneratorIOS.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -25,6 +25,8 @@
#include "config.h"
#include "SSLKeyGenerator.h"
+#if PLATFORM(IOS)
+
namespace WebCore {
void getSupportedKeySizes(Vector<String>&)
@@ -39,3 +41,5 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,9 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ScrollAnimatorIOS_h
-#define ScrollAnimatorIOS_h
+#pragma once
+#if PLATFORM(IOS)
+
#include "ScrollAnimator.h"
#include "IntPoint.h"
@@ -69,4 +70,4 @@
} // namespace WebCore
-#endif // ScrollAnimatorIOS_h
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,15 +23,17 @@
* 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 @@
#endif
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/ScrollbarThemeIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/ScrollbarThemeIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/ScrollbarThemeIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,9 +23,10 @@
* 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"
namespace WebCore {
@@ -65,4 +66,4 @@
}
-#endif // ScrollbarThemeIOS_h
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/ScrollbarThemeIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/ScrollbarThemeIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/ScrollbarThemeIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/SystemMemoryIOS.cpp (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/SystemMemoryIOS.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/SystemMemoryIOS.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/ThemeIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/ThemeIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/ThemeIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -25,6 +25,8 @@
#pragma once
+#if PLATFORM(IOS)
+
#include "ThemeCocoa.h"
namespace WebCore {
@@ -35,3 +37,5 @@
};
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/ThemeIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/ThemeIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/ThemeIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/TileControllerMemoryHandlerIOS.cpp (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/TileControllerMemoryHandlerIOS.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/TileControllerMemoryHandlerIOS.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/TileControllerMemoryHandlerIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/TileControllerMemoryHandlerIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/TileControllerMemoryHandlerIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,9 +23,10 @@
* 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 @@
WEBCORE_EXPORT TileControllerMemoryHandler& tileControllerMemoryHandler();
}
-#endif // TileControllerMemoryHandlerIOS_h
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/UserAgentIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/UserAgentIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/UserAgentIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore.
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,7 @@
#import "config.h"
#if PLATFORM(IOS)
+
#import "ValidationBubble.h"
#import <pal/spi/ios/UIKitSPI.h>
Modified: trunk/Source/WebCore/platform/ios/WidgetIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/ios/WidgetIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/ios/WidgetIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/mac/CursorMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/CursorMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/CursorMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/EventLoopMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/EventLoopMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/EventLoopMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,8 @@
#include "config.h"
#include "EventLoop.h"
+#if PLATFORM(MAC)
+
namespace WebCore {
void EventLoop::cycle()
@@ -42,3 +44,5 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.h (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -17,9 +17,13 @@
* 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 @@
};
}
+
+#endif // USE(APPKIT)
Modified: trunk/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -20,6 +20,8 @@
#include "config.h"
#include "LocalCurrentGraphicsContext.h"
+#if USE(APPKIT)
+
#include <AppKit/NSGraphicsContext.h>
namespace WebCore {
@@ -62,3 +64,5 @@
}
}
+
+#endif // USE(APPKIT)
Modified: trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,9 +23,10 @@
* 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 {
NSScrollerStyle recommendedScrollerStyle();
@@ -32,4 +33,4 @@
}
-#endif
+#endif // USE(APPKIT)
Modified: trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -25,11 +25,13 @@
*/
-#include "config.h"
-#include "NSScrollerImpDetails.h"
+#import "config.h"
+#import "NSScrollerImpDetails.h"
-#include "DeprecatedGlobalSettings.h"
+#if USE(APPKIT)
+#import "DeprecatedGlobalSettings.h"
+
namespace WebCore {
NSScrollerStyle recommendedScrollerStyle()
@@ -40,3 +42,5 @@
}
}
+
+#endif // USE(APPKIT)
Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
#endif
}
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.h (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -29,6 +29,8 @@
#include "PlatformMouseEvent.h"
#include "PlatformWheelEvent.h"
+#if PLATFORM(MAC)
+
namespace WebCore {
class PlatformEventFactory {
@@ -56,3 +58,5 @@
#endif
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,16 +23,16 @@
* 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 @@
} // namespace WebCore
-#endif // ENABLE(SPEECH_SYNTHESIS)
+#endif // ENABLE(SPEECH_SYNTHESIS) && PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/ScrollViewMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,11 +23,12 @@
* 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 @@
}
-#endif
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -23,26 +23,28 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
-#include "ScrollbarThemeMac.h"
+#import "config.h"
+#import "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>
+#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.
namespace WebCore {
@@ -632,3 +634,5 @@
#endif
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/ThemeMac.h (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/ThemeMac.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -27,6 +27,8 @@
#include "ThemeCocoa.h"
+#if PLATFORM(MAC)
+
namespace WebCore {
class ThemeMac final : public ThemeCocoa {
@@ -58,3 +60,5 @@
};
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
}
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/ThreadCheck.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/ThreadCheck.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/ThreadCheck.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,10 +26,12 @@
#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 @@
break;
}
}
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/UserAgentMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/UserAgentMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/UserAgentMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,8 @@
#import "config.h"
#import "UserAgent.h"
+#if PLATFORM(MAC)
+
#import "SystemVersion.h"
namespace WebCore {
@@ -49,3 +51,5 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mac/WebCoreView.m (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/WebCoreView.m 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/WebCoreView.m 2018-02-15 21:08:45 UTC (rev 228531)
@@ -24,6 +24,9 @@
*/
#import "config.h"
+
+#if USE(APPKIT)
+
#import "WebCoreView.h"
@interface NSClipView (WebCoreView)
@@ -63,3 +66,4 @@
@end
+#endif // USE(APPKIT)
Modified: trunk/Source/WebCore/platform/mac/WidgetMac.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/mac/WidgetMac.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mac/WidgetMac.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -44,4 +44,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_STREAM) && PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.h (228530 => 228531)
--- trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.h 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.h 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,9 +26,10 @@
* 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"
#endif
@@ -60,4 +61,4 @@
} // namespace WebCore
-#endif // WebCoreURLResponseIOS_h
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm (228530 => 228531)
--- trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2018-02-15 21:08:45 UTC (rev 228531)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp (228530 => 228531)
--- trunk/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp 2018-02-15 21:06:53 UTC (rev 228530)
+++ trunk/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp 2018-02-15 21:08:45 UTC (rev 228531)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NetworkStateNotifier.h"
+#if PLATFORM(MAC)
+
#include <SystemConfiguration/SystemConfiguration.h>
namespace WebCore {
@@ -96,3 +98,5 @@
}
}
+
+#endif // PLATFORM(MAC)
