Title: [185024] trunk/Source/WebKit/mac
- Revision
- 185024
- Author
- [email protected]
- Date
- 2015-05-29 18:19:38 -0700 (Fri, 29 May 2015)
Log Message
Make the header replace rule more restrictive and get rid of a special case
https://bugs.webkit.org/show_bug.cgi?id=145486
Reviewed by Ryosuke Niwa.
We used to not run the header migration script on WAKScrollView.h since we had a rule that would transform
"<WebCore" to "<WebKitLegacy" to convert header #imports. However, WAKScrollView.h contains "WAKView <WebCoreFrameScrollView>"
which would get transformed to "WAKView <WebKitLegacyFrameScrollView>".
Instead, check for the trailing slash as well and stop special-casing WAKScrollView.h.
* MigrateHeaders.make:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (185023 => 185024)
--- trunk/Source/WebKit/mac/ChangeLog 2015-05-30 00:26:43 UTC (rev 185023)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-30 01:19:38 UTC (rev 185024)
@@ -1,5 +1,20 @@
2015-05-29 Anders Carlsson <[email protected]>
+ Make the header replace rule more restrictive and get rid of a special case
+ https://bugs.webkit.org/show_bug.cgi?id=145486
+
+ Reviewed by Ryosuke Niwa.
+
+ We used to not run the header migration script on WAKScrollView.h since we had a rule that would transform
+ "<WebCore" to "<WebKitLegacy" to convert header #imports. However, WAKScrollView.h contains "WAKView <WebCoreFrameScrollView>"
+ which would get transformed to "WAKView <WebKitLegacyFrameScrollView>".
+
+ Instead, check for the trailing slash as well and stop special-casing WAKScrollView.h.
+
+ * MigrateHeaders.make:
+
+2015-05-29 Anders Carlsson <[email protected]>
+
Get rid of WAKViewPrivate.h
https://bugs.webkit.org/show_bug.cgi?id=145482
rdar://problem/21162149
Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (185023 => 185024)
--- trunk/Source/WebKit/mac/MigrateHeaders.make 2015-05-30 00:26:43 UTC (rev 185023)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2015-05-30 01:19:38 UTC (rev 185024)
@@ -218,13 +218,9 @@
$(PRIVATE_HEADERS_DIR)/WebCoreThread.h \
$(PRIVATE_HEADERS_DIR)/WebCoreThreadMessage.h \
$(PRIVATE_HEADERS_DIR)/WebCoreThreadRun.h \
- $(PRIVATE_HEADERS_DIR)/WebEvent.h
+ $(PRIVATE_HEADERS_DIR)/WebEvent.h \
+#
-# Special case WAKScrollView.h, which contains the protocol named
-# <WebCoreFrameScrollView> and shouldn't be changed by the default rule.
-$(PRIVATE_HEADERS_DIR)/WAKScrollView.h : WAKScrollView.h MigrateHeaders.make
- cat $< > $@
-
endif
ifneq ($(filter ENABLE_IOS_TOUCH_EVENTS ENABLE_TOUCH_EVENTS, $(FEATURE_DEFINES)), )
@@ -244,7 +240,7 @@
$(PRIVATE_HEADERS_DIR)/DOMGestureEvent.h
endif
-WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/ -e "s/(^ *)WEBCORE_EXPORT /\1/"
+WEBCORE_HEADER_REPLACE_RULES = -e 's/\<WebCore\//\<WebKitLegacy\//' -e s/DOMDOMImplementation/DOMImplementation/ -e "s/(^ *)WEBCORE_EXPORT /\1/"
WEBCORE_HEADER_MIGRATE_CMD = sed -E $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
$(PRIVATE_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
