Title: [184345] trunk/Source
- Revision
- 184345
- Author
- [email protected]
- Date
- 2015-05-14 11:17:39 -0700 (Thu, 14 May 2015)
Log Message
Change range of possible forces for mouseforcechanged DOM event
https://bugs.webkit.org/show_bug.cgi?id=144987
-and corresponding-
rdar://problem/20472802
Reviewed by Tim Horton.
Change to a 0-3 range.
Source/WebCore:
* platform/PlatformMouseEvent.h:
* platform/mac/PlatformEventFactoryMac.mm:
(WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):
Source/WebKit2:
* Shared/mac/WebEventFactory.mm:
(WebKit::WebEventFactory::createWebMouseEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (184344 => 184345)
--- trunk/Source/WebCore/ChangeLog 2015-05-14 18:11:55 UTC (rev 184344)
+++ trunk/Source/WebCore/ChangeLog 2015-05-14 18:17:39 UTC (rev 184345)
@@ -1,3 +1,17 @@
+2015-05-14 Beth Dakin <[email protected]>
+
+ Change range of possible forces for mouseforcechanged DOM event
+ https://bugs.webkit.org/show_bug.cgi?id=144987
+ -and corresponding-
+ rdar://problem/20472802
+
+ Reviewed by Tim Horton.
+
+ Change to a 0-3 range.
+ * platform/PlatformMouseEvent.h:
+ * platform/mac/PlatformEventFactoryMac.mm:
+ (WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):
+
2015-05-14 Manuel Rego Casasnovas <[email protected]>
Fix typo in RenderBox::instrinsicScrollbarLogicalWidth()
Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (184344 => 184345)
--- trunk/Source/WebCore/platform/PlatformMouseEvent.h 2015-05-14 18:11:55 UTC (rev 184344)
+++ trunk/Source/WebCore/platform/PlatformMouseEvent.h 2015-05-14 18:17:39 UTC (rev 184345)
@@ -43,8 +43,8 @@
namespace WebCore {
-const double ForceAtClick = 0;
-const double ForceAtForceClick = 1;
+const double ForceAtClick = 1;
+const double ForceAtForceClick = 2;
// These button numbers match the ones used in the DOM API, 0 through 2, except for NoButton which isn't specified.
enum MouseButton : int8_t { NoButton = -1, LeftButton, MiddleButton, RightButton };
Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (184344 => 184345)
--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2015-05-14 18:11:55 UTC (rev 184344)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2015-05-14 18:17:39 UTC (rev 184345)
@@ -454,7 +454,7 @@
#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
int stage = eventIsPressureEvent ? event.stage : correspondingPressureEvent.stage;
double pressure = eventIsPressureEvent ? event.pressure : correspondingPressureEvent.pressure;
- m_force = stage < 1 ? pressure : pressure + stage - 1;
+ m_force = pressure + stage;
#endif
// Mac specific
Modified: trunk/Source/WebKit2/ChangeLog (184344 => 184345)
--- trunk/Source/WebKit2/ChangeLog 2015-05-14 18:11:55 UTC (rev 184344)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-14 18:17:39 UTC (rev 184345)
@@ -1,3 +1,16 @@
+2015-05-14 Beth Dakin <[email protected]>
+
+ Change range of possible forces for mouseforcechanged DOM event
+ https://bugs.webkit.org/show_bug.cgi?id=144987
+ -and corresponding-
+ rdar://problem/20472802
+
+ Reviewed by Tim Horton.
+
+ Change to a 0-3 range.
+ * Shared/mac/WebEventFactory.mm:
+ (WebKit::WebEventFactory::createWebMouseEvent):
+
2015-05-14 Zan Dobersek <[email protected]>
[GTK] Add missing ENABLE(NETSCAPE_PLUGIN_API) build guards
Modified: trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm (184344 => 184345)
--- trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2015-05-14 18:11:55 UTC (rev 184344)
+++ trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2015-05-14 18:17:39 UTC (rev 184345)
@@ -400,7 +400,7 @@
#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
int stage = [event type] == NSEventTypePressure ? event.stage : lastPressureEvent.stage;
double pressure = [event type] == NSEventTypePressure ? event.pressure : lastPressureEvent.pressure;
- force = stage < 1 ? pressure : pressure + stage - 1;
+ force = pressure + stage;
#endif
return WebMouseEvent(type, button, IntPoint(position), IntPoint(globalPosition), deltaX, deltaY, deltaZ, clickCount, modifiers, timestamp, force, eventNumber, menuTypeForEvent);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
