[Cocoa] Replace __has_include guards around inclusion of Apple-internal-SDK headers...

https://bugs.webkit.org/show_bug.cgi?id=153963

Reviewed by Sam Weinig.

Source/JavaScriptCore:

* inspector/remote/RemoteInspectorXPCConnection.mm:

Source/WebCore:

* accessibility/mac/AXObjectCacheMac.mm:
* crypto/CommonCryptoUtilities.cpp:
* crypto/CommonCryptoUtilities.h:
* editing/mac/TextUndoInsertionMarkupMac.h:
* editing/mac/TextUndoInsertionMarkupMac.mm:
* platform/cocoa/TelephoneNumberDetectorCocoa.cpp:
* platform/graphics/cg/ImageSourceCG.cpp:
* platform/graphics/mac/PDFDocumentImageMac.mm:
* platform/network/ios/NetworkStateNotifierIOS.mm:
* platform/network/mac/BlobDataFileReferenceMac.mm:
* platform/network/mac/ResourceHandleMac.mm:
* rendering/RenderThemeMac.mm:

Source/WebKit/mac:

* WebView/WebPDFView.mm:

Source/WTF:

* wtf/SystemTracing.h:
* wtf/WTFThreadData.h:
* wtf/spi/darwin/CommonCryptoSPI.h:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index c642f3b..1b6a6e6 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2016-02-07  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Replace __has_include guards around inclusion of Apple-internal-SDK headers with USE(APPLE_INTERNAL_SDK)
+        https://bugs.webkit.org/show_bug.cgi?id=153963
+
+        Reviewed by Sam Weinig.
+
+        * inspector/remote/RemoteInspectorXPCConnection.mm:
+
 2016-02-06  Filip Pizlo  <fpizlo@apple.com>
 
         FTL must store the call site index before runtime calls, even if it's the tail call slow path

diff --git a/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm b/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm
index ee2d546..5a9d348 100644 (file)
--- a/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm
+++ b/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm
@@ -37,7 +37,7 @@
 #import <wtf/spi/cocoa/SecuritySPI.h>
 #import <wtf/spi/darwin/XPCSPI.h>
 
-#if __has_include(<CoreFoundation/CFXPCBridge.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <CoreFoundation/CFXPCBridge.h>
 #else
 extern "C" {

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index a8547fd..49402d0 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2016-02-07  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Replace __has_include guards around inclusion of Apple-internal-SDK headers with USE(APPLE_INTERNAL_SDK)
+        https://bugs.webkit.org/show_bug.cgi?id=153963
+
+        Reviewed by Sam Weinig.
+
+        * wtf/SystemTracing.h:
+        * wtf/WTFThreadData.h:
+        * wtf/spi/darwin/CommonCryptoSPI.h:
+
 2016-02-06  Darin Adler  <darin@apple.com>
 
         Finish auditing call sites of upper() and lower(), eliminate many, and rename the functions

diff --git a/Source/WTF/wtf/SystemTracing.h b/Source/WTF/wtf/SystemTracing.h
index 27b5028..6546268 100644 (file)
--- a/Source/WTF/wtf/SystemTracing.h
+++ b/Source/WTF/wtf/SystemTracing.h
@@ -26,12 +26,10 @@
 #ifndef SystemTracing_h
 #define SystemTracing_h
 
-#if defined(__has_include)
-#if __has_include(<System/sys/kdebug.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <System/sys/kdebug.h>
 #define HAVE_KDEBUG_H 1
 #endif
-#endif
 
 // No namespaces because this file has to be includable from C and Objective-C.
 

diff --git a/Source/WTF/wtf/WTFThreadData.h b/Source/WTF/wtf/WTFThreadData.h
index 5b5640d..5dfca4f 100644 (file)
--- a/Source/WTF/wtf/WTFThreadData.h
+++ b/Source/WTF/wtf/WTFThreadData.h
@@ -34,11 +34,9 @@
 #include <wtf/StackStats.h>
 #include <wtf/text/StringHash.h>
 
-#if OS(DARWIN)
-#if defined(__has_include) && __has_include(<System/pthread_machdep.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <System/pthread_machdep.h>
 #endif
-#endif
 
 #if defined(__PTK_FRAMEWORK_JAVASCRIPTCORE_KEY1)
 #define USE_PTHREAD_GETSPECIFIC_DIRECT 1

diff --git a/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h b/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h
index 79c0cdd..325cbe8 100644 (file)
--- a/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h
+++ b/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h
@@ -28,11 +28,9 @@
 
 #if OS(DARWIN)
 
-#if defined(__has_include)
-#if __has_include(<CommonCrypto/CommonRandomSPI.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <CommonCrypto/CommonRandomSPI.h>
 #endif
-#endif
 
 typedef struct __CCRandom* CCRandomRef;
 extern const CCRandomRef kCCRandomDefault;

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f56ee3a..e88cdfd 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2016-02-07  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Replace __has_include guards around inclusion of Apple-internal-SDK headers with USE(APPLE_INTERNAL_SDK)
+        https://bugs.webkit.org/show_bug.cgi?id=153963
+
+        Reviewed by Sam Weinig.
+
+        * accessibility/mac/AXObjectCacheMac.mm:
+        * crypto/CommonCryptoUtilities.cpp:
+        * crypto/CommonCryptoUtilities.h:
+        * editing/mac/TextUndoInsertionMarkupMac.h:
+        * editing/mac/TextUndoInsertionMarkupMac.mm:
+        * platform/cocoa/TelephoneNumberDetectorCocoa.cpp:
+        * platform/graphics/cg/ImageSourceCG.cpp:
+        * platform/graphics/mac/PDFDocumentImageMac.mm:
+        * platform/network/ios/NetworkStateNotifierIOS.mm:
+        * platform/network/mac/BlobDataFileReferenceMac.mm:
+        * platform/network/mac/ResourceHandleMac.mm:
+        * rendering/RenderThemeMac.mm:
+
 2016-02-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         REGRESSION(r195661): [GTK] Scrollbar tests crashing after overlay scrollbar groundwork

diff --git a/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm b/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
index 1f35857..b0896da 100644 (file)
--- a/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
+++ b/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
@@ -34,7 +34,7 @@
 #import "WebAccessibilityObjectWrapperMac.h"
 #import "WebCoreSystemInterface.h"
 
-#if __has_include(<HIServices/AccessibilityPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <HIServices/AccessibilityPriv.h>
 #endif
 

diff --git a/Source/WebCore/crypto/CommonCryptoUtilities.cpp b/Source/WebCore/crypto/CommonCryptoUtilities.cpp
index 642bdde..6d4668e 100644 (file)
--- a/Source/WebCore/crypto/CommonCryptoUtilities.cpp
+++ b/Source/WebCore/crypto/CommonCryptoUtilities.cpp
@@ -28,11 +28,9 @@
 
 #if ENABLE(SUBTLE_CRYPTO)
 
-#if defined(__has_include)
-#if __has_include(<CommonCrypto/CommonBigNum.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <CommonCrypto/CommonBigNum.h>
 #endif
-#endif
 
 typedef CCCryptorStatus CCStatus;
 extern "C" CCBigNumRef CCBigNumFromData(CCStatus *status, const void *s, size_t len);

diff --git a/Source/WebCore/crypto/CommonCryptoUtilities.h b/Source/WebCore/crypto/CommonCryptoUtilities.h
index 985d897..61d82c8 100644 (file)
--- a/Source/WebCore/crypto/CommonCryptoUtilities.h
+++ b/Source/WebCore/crypto/CommonCryptoUtilities.h
@@ -32,17 +32,10 @@
 #include <CommonCrypto/CommonCryptor.h>
 #include <wtf/Vector.h>
 
-#if defined(__has_include)
-#if __has_include(<CommonCrypto/CommonRSACryptor.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <CommonCrypto/CommonRSACryptor.h>
-#endif
-#endif
-
-#if defined(__has_include) && PLATFORM(COCOA)
-#if __has_include(<CommonCrypto/CommonRandomSPI.h>)
 #include <CommonCrypto/CommonRandomSPI.h>
 #endif
-#endif
 
 #ifndef _CC_RSACRYPTOR_H_
 enum {

diff --git a/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.h b/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.h
index 5d08899..96b2fdd 100644 (file)
--- a/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.h
+++ b/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.h
@@ -28,7 +28,7 @@
 
 #if USE(INSERTION_UNDO_GROUPING)
 
-#if __has_include(<AppKit/NSTextInputContext_Private.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <AppKit/NSTextInputContext_Private.h>
 #else
 extern "C" NSString *NSTextInsertionUndoableAttributeName;

diff --git a/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.mm b/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.mm
index c9268c0..4d7e71d 100644 (file)
--- a/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.mm
+++ b/Source/WebCore/editing/mac/TextUndoInsertionMarkupMac.mm
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "TextUndoInsertionMarkupMac.h"
 
-#if __has_include(<Foundation/NSUndoManager_Private.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <Foundation/NSUndoManager_Private.h>
 #else
 @interface NSUndoManager (WebCorePrivate)

diff --git a/Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp b/Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp
index bf68257..e466e96 100644 (file)
--- a/Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp
+++ b/Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp
@@ -30,7 +30,7 @@
 
 #include "SoftLinking.h"
 
-#if __has_include(<DataDetectorsCore/DDDFAScanner.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <DataDetectorsCore/DDDFAScanner.h>
 #else
 typedef struct __DDDFAScanner DDDFAScanner, * DDDFAScannerRef;

diff --git a/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp b/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
index 3189ca7..9252d8e 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
@@ -44,7 +44,7 @@
 #include <wtf/RetainPtr.h>
 #endif
 
-#if __has_include(<ImageIO/CGImageSourcePrivate.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <ImageIO/CGImageSourcePrivate.h>
 #else
 const CFStringRef kCGImageSourceSubsampleFactor = CFSTR("kCGImageSourceSubsampleFactor");

diff --git a/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm b/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm
index bfaafa9..78ed247 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm
+++ b/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm
@@ -35,11 +35,9 @@
 #import <objc/objc-class.h>
 #import <wtf/RetainPtr.h>
 
-#ifdef __has_include
-#if __has_include(<ApplicationServices/ApplicationServicesPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <ApplicationServices/ApplicationServicesPriv.h>
 #endif
-#endif
 
 SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, PDFKit)
 SOFT_LINK_CLASS(PDFKit, PDFDocument)

diff --git a/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm b/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm
index e5b5c30..89f2c8c 100644 (file)
--- a/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm
+++ b/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm
@@ -29,7 +29,7 @@
 #import "SoftLinking.h"
 #import "WebCoreThreadRun.h"
 
-#if defined(__has_include) && __has_include(<AppSupport/CPNetworkObserver.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <AppSupport/CPNetworkObserver.h>
 #else
 extern NSString * const CPNetworkObserverReachable;

diff --git a/Source/WebCore/platform/network/mac/BlobDataFileReferenceMac.mm b/Source/WebCore/platform/network/mac/BlobDataFileReferenceMac.mm
index 3cc26d8..65b7199 100644 (file)
--- a/Source/WebCore/platform/network/mac/BlobDataFileReferenceMac.mm
+++ b/Source/WebCore/platform/network/mac/BlobDataFileReferenceMac.mm
@@ -32,11 +32,9 @@
 #include "SoftLinking.h"
 #include <wtf/text/CString.h>
 
-#if defined(__has_include)
-#if __has_include(<Bom/BOMCopier.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <Bom/BOMCopier.h>
 #endif
-#endif
 
 typedef struct _BOMCopier* BOMCopier;
 

diff --git a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
index e5f3e64..8a7633e 100644 (file)
--- a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
+++ b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -58,7 +58,7 @@
 #import <wtf/text/CString.h>
 
 #if USE(CFNETWORK)
-#if __has_include(<CFNetwork/CFURLConnectionPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <CFNetwork/CFURLConnectionPriv.h>
 #endif
 typedef struct _CFURLConnection* CFURLConnectionRef;

diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm
index 522b1af..a192b0e 100644 (file)
--- a/Source/WebCore/rendering/RenderThemeMac.mm
+++ b/Source/WebCore/rendering/RenderThemeMac.mm
@@ -92,15 +92,11 @@
 
 #if ENABLE(SERVICE_CONTROLS) && HAVE(APPKIT_SERVICE_CONTROLS_SUPPORT)
 
-#if __has_include(<AppKit/AppKitDefines_Private.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <AppKit/AppKitDefines_Private.h>
-#else
-#define APPKIT_PRIVATE_CLASS
-#endif
-
-#if __has_include(<AppKit/NSServicesRolloverButtonCell.h>)
 #import <AppKit/NSServicesRolloverButtonCell.h>
 #else
+#define APPKIT_PRIVATE_CLASS
 @interface NSServicesRolloverButtonCell : NSButtonCell
 @end
 #endif

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 8d7385e..51f3e3a 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2016-02-07  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Replace __has_include guards around inclusion of Apple-internal-SDK headers with USE(APPLE_INTERNAL_SDK)
+        https://bugs.webkit.org/show_bug.cgi?id=153963
+
+        Reviewed by Sam Weinig.
+
+        * WebView/WebPDFView.mm:
+
 2016-02-06  Darin Adler  <darin@apple.com>
 
         Finish auditing call sites of upper() and lower(), eliminate many, and rename the functions

diff --git a/Source/WebKit/mac/WebView/WebPDFView.mm b/Source/WebKit/mac/WebView/WebPDFView.mm
index b1a26be..ef345a3 100644 (file)
--- a/Source/WebKit/mac/WebView/WebPDFView.mm
+++ b/Source/WebKit/mac/WebView/WebPDFView.mm
@@ -67,11 +67,9 @@
 
 #import <PDFKit/PDFKit.h>
 
-#ifdef __has_include
-#if __has_include(<ApplicationServices/ApplicationServicesPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <ApplicationServices/ApplicationServicesPriv.h>
 #endif
-#endif
 
 extern "C" {
     bool CGContextGetAllowsFontSmoothing(CGContextRef context);