Change touch-related headers to include WebKitAdditions headers,
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 19:56:38 +0000 (19:56 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 19:56:38 +0000 (19:56 +0000)
which have been renamed to have IOS suffixes.

* WebCore.xcodeproj/project.pbxproj:
* bindings/js/ios/TouchConstructors.cpp:
* dom/Touch.h:
* dom/TouchEvent.h:
* dom/TouchList.h:
* dom/ios/TouchEvents.cpp:

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

Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/ios/TouchConstructors.cpp
Source/WebCore/dom/Touch.h
Source/WebCore/dom/TouchEvent.h
Source/WebCore/dom/TouchList.h
Source/WebCore/dom/ios/TouchEvents.cpp

index 72180e5..5ec8751 100644 (file)
@@ -1,3 +1,15 @@
+2014-01-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Change touch-related headers to include WebKitAdditions headers,
+        which have been renamed to have IOS suffixes.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/ios/TouchConstructors.cpp:
+        * dom/Touch.h:
+        * dom/TouchEvent.h:
+        * dom/TouchList.h:
+        * dom/ios/TouchEvents.cpp:
+
 2014-01-11  Anders Carlsson  <andersca@apple.com>
 
         ScriptDebugServer should use a separate member function for its timer handler
index faa8680..4ef8b67 100644 (file)
                0F54DCE21880F901003EEDBB /* DOMGestureEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCDF1880F901003EEDBB /* DOMGestureEventInternal.h */; };
                0F54DCE51881051D003EEDBB /* TextAutoSizing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F54DCE31881051D003EEDBB /* TextAutoSizing.cpp */; };
                0F54DCE61881051D003EEDBB /* TextAutoSizing.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DCE41881051D003EEDBB /* TextAutoSizing.h */; };
+               0F54DD081881D5F5003EEDBB /* Touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DD051881D5F5003EEDBB /* Touch.h */; };
+               0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DD061881D5F5003EEDBB /* TouchEvent.h */; };
+               0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F54DD071881D5F5003EEDBB /* TouchList.h */; };
                0F56028F0E4B76580065B038 /* RenderMarquee.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F56028D0E4B76580065B038 /* RenderMarquee.h */; };
                0F5602900E4B76580065B038 /* RenderMarquee.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F56028E0E4B76580065B038 /* RenderMarquee.cpp */; };
                0F580B0C0F12A2690051D689 /* GraphicsLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F580B090F12A2690051D689 /* GraphicsLayer.cpp */; };
                0F54DCDF1880F901003EEDBB /* DOMGestureEventInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMGestureEventInternal.h; sourceTree = "<group>"; };
                0F54DCE31881051D003EEDBB /* TextAutoSizing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextAutoSizing.cpp; sourceTree = "<group>"; };
                0F54DCE41881051D003EEDBB /* TextAutoSizing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextAutoSizing.h; sourceTree = "<group>"; };
+               0F54DD051881D5F5003EEDBB /* Touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Touch.h; sourceTree = "<group>"; };
+               0F54DD061881D5F5003EEDBB /* TouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TouchEvent.h; sourceTree = "<group>"; };
+               0F54DD071881D5F5003EEDBB /* TouchList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TouchList.h; sourceTree = "<group>"; };
                0F56028D0E4B76580065B038 /* RenderMarquee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMarquee.h; sourceTree = "<group>"; };
                0F56028E0E4B76580065B038 /* RenderMarquee.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMarquee.cpp; sourceTree = "<group>"; };
                0F580B090F12A2690051D689 /* GraphicsLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayer.cpp; sourceTree = "<group>"; };
                                A77B419F12E675A90054343D /* TextEventInputType.h */,
                                E4D988B317BFD1F60084FB88 /* TextNodeTraversal.h */,
                                E4D988B517BFEB210084FB88 /* TextNodeTraversal.cpp */,
+                               0F54DD051881D5F5003EEDBB /* Touch.h */,
+                               0F54DD061881D5F5003EEDBB /* TouchEvent.h */,
+                               0F54DD071881D5F5003EEDBB /* TouchList.h */,
                                5DB1BC6810715A6400EFAA49 /* TransformSource.h */,
                                5DB1BC6910715A6400EFAA49 /* TransformSourceLibxslt.cpp */,
                                E17B491316A9B093001C8839 /* TransitionEvent.cpp */,
                                85E711AA0AC5D5350053270F /* DOMHTMLFormElementInternal.h in Headers */,
                                85DF81950AA77E4B00486AD7 /* DOMHTMLFrameElement.h in Headers */,
                                85E711AB0AC5D5350053270F /* DOMHTMLFrameElementInternal.h in Headers */,
+                               0F54DD081881D5F5003EEDBB /* Touch.h in Headers */,
                                85DF81970AA77E4B00486AD7 /* DOMHTMLFrameSetElement.h in Headers */,
                                85E711AC0AC5D5350053270F /* DOMHTMLFrameSetElementInternal.h in Headers */,
                                31078CCA1880AACE008099DC /* JSOESTextureHalfFloatLinear.h in Headers */,
                                1AF62EE814DA22A70041556C /* ScrollingCoordinator.h in Headers */,
                                9391A991162746CB00297330 /* ScrollingCoordinatorMac.h in Headers */,
                                93C38BFF164473C700091EB2 /* ScrollingStateFixedNode.h in Headers */,
+                               0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */,
                                931CBD0D161A44E900E4C874 /* ScrollingStateNode.h in Headers */,
                                931CBD0F161A44E900E4C874 /* ScrollingStateScrollingNode.h in Headers */,
                                0FB8890F167D30160010CDA5 /* ScrollingStateStickyNode.h in Headers */,
                                9380F47409A11AB4001FDB34 /* Widget.h in Headers */,
                                CD9DE17517AAC74C00EA386D /* JSMediaSource.h in Headers */,
                                1411DCB1164C39A800D49BC1 /* WidthCache.h in Headers */,
+                               0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */,
                                939B02EF0EA2DBC400C54570 /* WidthIterator.h in Headers */,
                                BC8243E90D0CFD7500460C8F /* WindowFeatures.h in Headers */,
                                7E99AF530B13846468FB01A5 /* WindowFocusAllowedIndicator.h in Headers */,
index 767b178..2d4825c 100644 (file)
@@ -27,7 +27,7 @@
 
 #if PLATFORM(IOS) && ENABLE(TOUCH_EVENTS)
 
-#include <WebKitAdditions/JSTouchConstructor.cpp>
-#include <WebKitAdditions/JSTouchListConstructor.cpp>
+#include <WebKitAdditions/JSTouchConstructorIOS.cpp>
+#include <WebKitAdditions/JSTouchListConstructorIOS.cpp>
 
 #endif
index d236b60..7b3d098 100644 (file)
@@ -26,7 +26,9 @@
 #ifndef Touch_h
 #define Touch_h
 
-#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
+#if PLATFORM(IOS)
+#include <WebKitAdditions/TouchIOS.h>
+#elif ENABLE(TOUCH_EVENTS)
 
 #include "EventTarget.h"
 #include "LayoutPoint.h"
index d5c740d..42d5175 100644 (file)
@@ -27,7 +27,9 @@
 #ifndef TouchEvent_h
 #define TouchEvent_h
 
-#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
+#if PLATFORM(IOS)
+#include <WebKitAdditions/TouchEventIOS.h>
+#elif ENABLE(TOUCH_EVENTS)
 
 #include "MouseRelatedEvent.h"
 #include "TouchList.h"
index 6bf8e75..b78aa4d 100644 (file)
@@ -26,7 +26,9 @@
 #ifndef TouchList_h
 #define TouchList_h
 
-#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
+#if PLATFORM(IOS)
+#include <WebKitAdditions/TouchListIOS.h>
+#elif ENABLE(TOUCH_EVENTS)
 
 #include "Touch.h"
 #include <wtf/RefCounted.h>
index d0cf7a6..1aff2be 100644 (file)
@@ -29,8 +29,8 @@
 
 #include <WebKitAdditions/DocumentIOS.cpp>
 #include <WebKitAdditions/GestureEventIOS.cpp>
-#include <WebKitAdditions/Touch.cpp>
-#include <WebKitAdditions/TouchEvent.cpp>
-#include <WebKitAdditions/TouchList.cpp>
+#include <WebKitAdditions/TouchIOS.cpp>
+#include <WebKitAdditions/TouchEventIOS.cpp>
+#include <WebKitAdditions/TouchListIOS.cpp>
 
 #endif