Title: [184518] branches/safari-601.1.32-branch/Source/WebCore
- Revision
- 184518
- Author
- [email protected]
- Date
- 2015-05-18 16:01:08 -0700 (Mon, 18 May 2015)
Log Message
Merge r184417. rdar://problem/20770052
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184517 => 184518)
--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-18 22:53:08 UTC (rev 184517)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-18 23:01:08 UTC (rev 184518)
@@ -1,5 +1,21 @@
2015-05-18 Matthew Hanson <[email protected]>
+ Merge r184417. rdar://problem/20770052
+
+ 2015-05-15 Beth Dakin <[email protected]>
+
+ Prefix force on MouseEvent and add constants for click and force click values
+ https://bugs.webkit.org/show_bug.cgi?id=145065
+ -and corresponding-
+ rdar://problem/20770052
+
+ Reviewed by Tim Horton.
+
+ (WebCore::MouseEvent::webkitForce):
+ * dom/MouseEvent.idl:
+
+2015-05-18 Matthew Hanson <[email protected]>
+
Merge r184353. rdar://problem/20809399
2015-05-14 Myles C. Maxfield <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebCore/dom/MouseEvent.idl (184517 => 184518)
--- branches/safari-601.1.32-branch/Source/WebCore/dom/MouseEvent.idl 2015-05-18 22:53:08 UTC (rev 184517)
+++ branches/safari-601.1.32-branch/Source/WebCore/dom/MouseEvent.idl 2015-05-18 23:01:08 UTC (rev 184518)
@@ -20,7 +20,13 @@
[
ConstructorConditional=DOM4_EVENTS_CONSTRUCTOR,
ConstructorTemplate=Event,
+ DoNotCheckConstants,
] interface MouseEvent : UIEvent {
+#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+ [Conditional=MOUSE_FORCE_EVENTS] const double WEBKIT_FORCE_AT_MOUSE_DOWN = 1;
+ [Conditional=MOUSE_FORCE_EVENTS] const double WEBKIT_FORCE_AT_FORCE_MOUSE_DOWN = 2;
+#endif
+
[InitializedByEventConstructor] readonly attribute long screenX;
[InitializedByEventConstructor] readonly attribute long screenY;
[InitializedByEventConstructor] readonly attribute long clientX;
@@ -33,7 +39,9 @@
[InitializedByEventConstructor] readonly attribute EventTarget relatedTarget;
[Conditional=POINTER_LOCK] readonly attribute long movementX;
[Conditional=POINTER_LOCK] readonly attribute long movementY;
- [Conditional=MOUSE_FORCE_EVENTS]readonly attribute double force;
+#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+ [Conditional=MOUSE_FORCE_EVENTS, ImplementedAs=force]readonly attribute double webkitForce;
+#endif
[ObjCLegacyUnnamedParameters] void initMouseEvent([Default=Undefined] optional DOMString type,
[Default=Undefined] optional boolean canBubble,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
