Title: [161658] trunk/Source
- Revision
- 161658
- Author
- [email protected]
- Date
- 2014-01-10 11:32:56 -0800 (Fri, 10 Jan 2014)
Log Message
[iOS] Upstream iOS changes to MigrateHeaders.make
https://bugs.webkit.org/show_bug.cgi?id=126731
Reviewed by David Kilzer.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj: Mark an iOS-specific header at
Private that will later be migrated by WebKit.
Source/WebKit/mac:
* MigrateHeaders.make: Migrate iOS-specific headers when building for iOS.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161657 => 161658)
--- trunk/Source/WebCore/ChangeLog 2014-01-10 19:13:16 UTC (rev 161657)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 19:32:56 UTC (rev 161658)
@@ -1,3 +1,13 @@
+2014-01-09 Andy Estes <[email protected]>
+
+ [iOS] Upstream iOS changes to MigrateHeaders.make
+ https://bugs.webkit.org/show_bug.cgi?id=126731
+
+ Reviewed by David Kilzer.
+
+ * WebCore.xcodeproj/project.pbxproj: Mark an iOS-specific header at
+ Private that will later be migrated by WebKit.
+
2014-01-10 Daniel Bates <[email protected]>
Fix the Production Mac build following <http://trac.webkit.org/changeset/161638>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161657 => 161658)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-10 19:13:16 UTC (rev 161657)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-10 19:32:56 UTC (rev 161658)
@@ -929,7 +929,7 @@
24F54EAD101FE914000AE741 /* ApplicationCacheHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */; settings = {ATTRIBUTES = (); }; };
2542F4DA1166C25A00E89A86 /* UserGestureIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2542F4D81166C25A00E89A86 /* UserGestureIndicator.cpp */; };
2542F4DB1166C25A00E89A86 /* UserGestureIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 265541391489811C000DFC5D /* KeyEventCodesIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 265541371489811C000DFC5D /* KeyEventCodesIOS.h */; };
+ 265541391489811C000DFC5D /* KeyEventCodesIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 265541371489811C000DFC5D /* KeyEventCodesIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
2655413A1489811C000DFC5D /* KeyEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 265541381489811C000DFC5D /* KeyEventIOS.mm */; };
265541521489B233000DFC5D /* CursorIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2655414B1489AA2B000DFC5D /* CursorIOS.cpp */; };
26601EBF14B3B9AD0012C0FE /* PlatformEventFactoryIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 26601EBD14B3B9AD0012C0FE /* PlatformEventFactoryIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -17850,15 +17850,6 @@
name = parser;
sourceTree = "<group>";
};
- A516E8B2136E04C00076C3C0 /* ios */ = {
- isa = PBXGroup;
- children = (
- A516E8B4136E04DB0076C3C0 /* LocalizedDateCache.h */,
- A516E8B5136E04DB0076C3C0 /* LocalizedDateCache.mm */,
- );
- path = ios;
- sourceTree = "<group>";
- };
A148328B187F506800DA63A6 /* wak */ = {
isa = PBXGroup;
children = (
@@ -17898,6 +17889,15 @@
name = wak;
sourceTree = "<group>";
};
+ A516E8B2136E04C00076C3C0 /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ A516E8B4136E04DB0076C3C0 /* LocalizedDateCache.h */,
+ A516E8B5136E04DB0076C3C0 /* LocalizedDateCache.mm */,
+ );
+ path = ios;
+ sourceTree = "<group>";
+ };
A59E3C1B11580F340072928E /* ios */ = {
isa = PBXGroup;
children = (
Modified: trunk/Source/WebKit/mac/ChangeLog (161657 => 161658)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-10 19:13:16 UTC (rev 161657)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-10 19:32:56 UTC (rev 161658)
@@ -1,3 +1,12 @@
+2014-01-09 Andy Estes <[email protected]>
+
+ [iOS] Upstream iOS changes to MigrateHeaders.make
+ https://bugs.webkit.org/show_bug.cgi?id=126731
+
+ Reviewed by David Kilzer.
+
+ * MigrateHeaders.make: Migrate iOS-specific headers when building for iOS.
+
2014-01-10 Daniel Bates <[email protected]>
[iOS] Upstream WebCore and Tools miscellaneous changes
Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (161657 => 161658)
--- trunk/Source/WebKit/mac/MigrateHeaders.make 2014-01-10 19:13:16 UTC (rev 161657)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2014-01-10 19:32:56 UTC (rev 161658)
@@ -190,8 +190,7 @@
$(PUBLIC_HEADERS_DIR)/nptypes.h \
#
-ifeq ($(findstring WTF_PLATFORM_IOS,$(FEATURE_DEFINES)), WTF_PLATFORM_IOS)
-
+ifneq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
all : \
$(PUBLIC_HEADERS_DIR)/DOMGestureEvent.h \
$(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElementPrivate.h \
@@ -221,21 +220,13 @@
$(PRIVATE_HEADERS_DIR)/WebCoreThreadMessage.h \
$(PRIVATE_HEADERS_DIR)/WebCoreThreadRun.h \
$(PRIVATE_HEADERS_DIR)/WebEvent.h \
- $(PRIVATE_HEADERS_DIR)/WebEventRegion.h \
-
+ $(PRIVATE_HEADERS_DIR)/WebEventRegion.h
endif
REPLACE_RULES = -e s/\<WebCore/\<WebKit/ -e s/DOMDOMImplementation/DOMImplementation/
HEADER_MIGRATE_CMD = sed $(REPLACE_RULES) $< > $@
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
-ifeq ($(findstring WTF_PLATFORM_IOS,$(FEATURE_DEFINES)), WTF_PLATFORM_IOS)
-
-$(PRIVATE_HEADERS_DIR)/WAKScrollView.h : WAKScrollView.h MigrateHeaders.make
- cat $< $(PROCESS_HEADER_FOR_MACOSX_TARGET_CMD) > $@
-
-endif
-
$(PUBLIC_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
$(PUBLIC_HEADER_CHECK_CMD)
$(HEADER_MIGRATE_CMD)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
