Title: [185668] trunk/Source/WebKit/mac
- Revision
- 185668
- Author
- [email protected]
- Date
- 2015-06-17 14:32:14 -0700 (Wed, 17 Jun 2015)
Log Message
<rdar://problem/19034131> Cleaned up the WebDownload.h framework header.
Reviewed by Anders Carlsson.
* Misc/WebDownload.h: Changed to use USE_APPLE_INTERNAL_SDK instead of __has_include.
* postprocess-headers.sh: Define USE_APPLE_INTERNAL_SDK when postprocessing framework
headers.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (185667 => 185668)
--- trunk/Source/WebKit/mac/ChangeLog 2015-06-17 21:27:35 UTC (rev 185667)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-17 21:32:14 UTC (rev 185668)
@@ -1,3 +1,13 @@
+2015-06-17 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19034131> Cleaned up the WebDownload.h framework header.
+
+ Reviewed by Anders Carlsson.
+
+ * Misc/WebDownload.h: Changed to use USE_APPLE_INTERNAL_SDK instead of __has_include.
+ * postprocess-headers.sh: Define USE_APPLE_INTERNAL_SDK when postprocessing framework
+ headers.
+
2015-06-17 Commit Queue <[email protected]>
Unreviewed, rolling out r185636.
Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (185667 => 185668)
--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-06-17 21:27:35 UTC (rev 185667)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-06-17 21:32:14 UTC (rev 185668)
@@ -26,10 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// We explicitly use __has_include() instead of the macro define USE_APPLE_INTERNAL_SDK as
-// the condition for including the header Foundation/NSURLDownload.h to support internal Apple
-// clients that build without header wtf/Platform.h. See <rdar://problem/19034131>.
-#if __has_include(<Foundation/NSURLDownload.h>)
+#if !TARGET_OS_IPHONE || (defined USE_APPLE_INTERNAL_SDK && USE_APPLE_INTERNAL_SDK)
#import <Foundation/NSURLDownload.h>
#else
@interface NSURLDownload : NSObject
Modified: trunk/Source/WebKit/mac/postprocess-headers.sh (185667 => 185668)
--- trunk/Source/WebKit/mac/postprocess-headers.sh 2015-06-17 21:27:35 UTC (rev 185667)
+++ trunk/Source/WebKit/mac/postprocess-headers.sh 2015-06-17 21:32:14 UTC (rev 185668)
@@ -6,12 +6,18 @@
local unifdefOptions sedExpression
+ if [[ ${USE_INTERNAL_SDK} == "YES" ]]; then
+ USE_APPLE_INTERNAL_SDK=1
+ else
+ USE_APPLE_INTERNAL_SDK=0
+ fi
+
if [[ ${PLATFORM_NAME} == macosx ]]; then
unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=0 -DTARGET_IPHONE_SIMULATOR=0";
elif [[ ${PLATFORM_NAME} == *simulator* ]]; then
- unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1 -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
+ unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK} -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
else
- unifdefOptions="-DTARGET_OS_EMBEDDED=1 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0 -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
+ unifdefOptions="-DTARGET_OS_EMBEDDED=1 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK} -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
fi
# FIXME: We should consider making this logic general purpose so as to support keeping or removing
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
