Changeset 162021 in webkit

Timestamp:

Jan 14, 2014, 4:00:47 PM (11 years ago)

Author:

Simon Fraser

Message:

Fix header availability checks on iOS
​https://bugs.webkit.org/show_bug.cgi?id=127016

Reviewed by Andy Estes.

Make DOMTouch* and DOMGesture* headers public headers on iOS,
and fix MigrateHeaders.make to skip availability checks when
building for iOS.

• MigrateHeaders.make:

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• MigrateHeaders.make (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-01-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix header availability checks on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=127016
+
+        Reviewed by Andy Estes.
+
+        Make DOMTouch* and DOMGesture* headers public headers on iOS,
+        and fix MigrateHeaders.make to skip availability checks when
+        building for iOS.
+
+        * MigrateHeaders.make:
+
 2014-01-14  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/mac/MigrateHeaders.make

@@ -193 +193 @@
 ifneq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
 all : \
-    $(PRIVATE_HEADERS_DIR)/DOMGestureEvent.h \
+    $(PUBLIC_HEADERS_DIR)/DOMGestureEvent.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElementPrivate.h \
-    $(PRIVATE_HEADERS_DIR)/DOMTouch.h \
-    $(PRIVATE_HEADERS_DIR)/DOMTouchEvent.h \
-    $(PRIVATE_HEADERS_DIR)/DOMTouchList.h \
+    $(PUBLIC_HEADERS_DIR)/DOMTouch.h \
+    $(PUBLIC_HEADERS_DIR)/DOMTouchEvent.h \
+    $(PUBLIC_HEADERS_DIR)/DOMTouchList.h \
     $(PRIVATE_HEADERS_DIR)/DOMUIKitExtensions.h \
     $(PRIVATE_HEADERS_DIR)/KeyEventCodesIOS.h \
@@ -226 +226 @@
 REPLACE_RULES = -e s/\<WebCore/\<WebKit/ -e s/DOMDOMImplementation/DOMImplementation/
 HEADER_MIGRATE_CMD = sed $(REPLACE_RULES) $< > $@
+
+ifeq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
 PUBLIC_HEADER_CHECK_CMD = @if grep -q "AVAILABLE.*TBD" "$<"; then line=$$(awk "/AVAILABLE.*TBD/ { print FNR; exit }" "$<" ); echo "$<:$$line: error: A class within a public header has unspecified availability."; false; fi
+else
+PUBLIC_HEADER_CHECK_CMD =
+endif
 
 $(PUBLIC_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make