Title: [194171] branches/safari-601-branch/Source/WebCore
- Revision
- 194171
- Author
- [email protected]
- Date
- 2015-12-16 13:26:01 -0800 (Wed, 16 Dec 2015)
Log Message
Merged r191121. rdar://problem/23810432
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194170 => 194171)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-16 21:24:43 UTC (rev 194170)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-16 21:26:01 UTC (rev 194171)
@@ -1,5 +1,15 @@
2015-12-16 Babak Shafiei <[email protected]>
+ Merge r191121.
+
+ 2015-10-15 Tim Horton <[email protected]>
+
+ Try to fix the iOS build.
+
+ * page/EventHandler.h:
+
+2015-12-16 Babak Shafiei <[email protected]>
+
Merge r191080.
2015-10-14 Tim Horton <[email protected]>
Modified: branches/safari-601-branch/Source/WebCore/page/EventHandler.h (194170 => 194171)
--- branches/safari-601-branch/Source/WebCore/page/EventHandler.h 2015-12-16 21:24:43 UTC (rev 194170)
+++ branches/safari-601-branch/Source/WebCore/page/EventHandler.h 2015-12-16 21:26:01 UTC (rev 194171)
@@ -110,6 +110,7 @@
#if ENABLE(IOS_GESTURE_EVENTS)
extern const float GestureUnknown;
+extern const unsigned InvalidTouchIdentifier;
#endif
enum AppendTrailingWhitespace { ShouldAppendTrailingWhitespace, DontAppendTrailingWhitespace };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
