Changeset 182748 in webkit

Timestamp:

Apr 13, 2015 12:17:48 PM (9 years ago)

Author:

Beth Dakin

Message:

Add force property to MouseEvents
​https://bugs.webkit.org/show_bug.cgi?id=143569
-and corresponding-
rdar://problem/20472954

Reviewed by Darin Adler.

Source/WebCore:

This patch removes WebKitMouseForceEvent and uses a MouseEvent everywhere that it
was used. That’s possible because this patch also adds a force property to all
MouseEvents and to PlatformMouseEvent.

Remove WebKitMouseForceEvent.

• CMakeLists.txt:
• DerivedSources.cpp:
• DerivedSources.make:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• WebCore.xcodeproj/project.pbxproj:
• dom/DOMAllInOne.cpp:

Create MouseEvents with the appropriate force instead of WebKitMouseForceEvents.
This patch also gets rid of the PlatformMouseEvent parameter for these events.
They were re-using the cached mousedown event before, which they never should have
done. Instead, we create PlatformMouseEvents inside these functions and then use
that to make MouseEvents.

• dom/Element.cpp:

(WebCore::Element::dispatchMouseForceWillBegin):
(WebCore::Element::dispatchMouseForceChanged):
(WebCore::Element::dispatchMouseForceDown):
(WebCore::Element::dispatchMouseForceUp):
(WebCore::Element::dispatchMouseForceClick):
(WebCore::Element::dispatchMouseForceCancelled):

• dom/Element.h:

No More WebKitMouseForceEvent.

• dom/EventNames.in:

Add force to MouseEvent.

• dom/MouseEvent.cpp:

(WebCore::MouseEvent::create):
(WebCore::MouseEvent::MouseEvent):
(WebCore::MouseEvent::cloneFor):
(WebCore::SimulatedMouseEvent::SimulatedMouseEvent):

• dom/MouseEvent.h:

(WebCore::MouseEvent::force):
(WebCore::MouseEvent::setForce):

• dom/MouseEvent.idl:

No More WebKitMouseForceEvent.

• dom/WebKitMouseForceEvent.cpp: Removed.
• dom/WebKitMouseForceEvent.h: Removed.
• dom/WebKitMouseForceEvent.idl: Removed.

PlatformMouseEvent now takes a force parameter.

• dom/WheelEvent.cpp:

(WebCore::WheelEvent::WheelEvent):

• page/ContextMenuController.cpp:

(WebCore::ContextMenuController::showContextMenuAt):

• page/DragController.cpp:

(WebCore::createMouseEvent):

• page/EventHandler.cpp:

(WebCore::EventHandler::dispatchDragEvent):
(WebCore::EventHandler::sendContextMenuEventForKey):
(WebCore::EventHandler::fakeMouseMoveEventTimerFired):

We don’t need lastMouseDownEvent() anymore. We were using it to avoid creating new
PlatformMouseEvents for the force events, but we fix that in this patch.
(WebCore::EventHandler::lastMouseDownEvent): Deleted.

• page/EventHandler.h:

At force to PlatformMouseEvent.

• platform/PlatformMouseEvent.h:

(WebCore::PlatformMouseEvent::PlatformMouseEvent):
(WebCore::PlatformMouseEvent::force):

• replay/SerializationMethods.cpp:

(JSC::EncodingTraits<PlatformMouseEvent>::encodeValue):
(JSC::EncodingTraits<PlatformMouseEvent>::decodeValue):

Source/WebKit/ios:

Send the appropriate force with this simulated click event.

• WebView/WebPDFViewPlaceholder.mm:

(-[WebPDFViewPlaceholder simulateClickOnLinkToURL:]):

Source/WebKit/mac:

PlatformMouseEvent and MouseEvent now take force parameters.

• WebView/WebFrame.mm:

(-[WebFrame _dragSourceEndedAt:operation:]):

• WebView/WebPDFView.mm:

(-[WebPDFView PDFViewWillClickOnLink:withURL:]):

Source/WebKit/win:

PlatformMouseEvent takes a force parameter.

• WebDropSource.cpp:

(generateMouseEvent):

Source/WebKit2:

In order to accommodate adding force to all PlatformMouseEvents, we have to add it
to pass a caches pressure event to NativeWebMouseEvent and add force to
WebMouseEvent.

NativeWebMouseEvent now requires a second NSEvent for the pressureEvent.

• Shared/NativeWebMouseEvent.h:

WebMouseEvent takes a force parameter.

• Shared/WebEvent.h:

(WebKit::WebMouseEvent::force):

• Shared/WebEventConversion.cpp:

(WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):

• Shared/WebMouseEvent.cpp:

(WebKit::WebMouseEvent::WebMouseEvent):
(WebKit::WebMouseEvent::encode):
(WebKit::WebMouseEvent::decode):

• Shared/mac/NativeWebMouseEventMac.mm:

(WebKit::NativeWebMouseEvent::NativeWebMouseEvent):

• Shared/mac/WebEventFactory.h:
• Shared/mac/WebEventFactory.mm:

(WebKit::WebEventFactory::createWebMouseEvent):

Cache the most recent pressureEvent in _data so that it can be sent along to the
NativeWebMouseEvent constructor.

• UIProcess/API/mac/WKView.mm:

(-[WKView pressureChangeWithEvent:]):
(-[WKView acceptsFirstMouse:]):
(-[WKView shouldDelayWindowOrderingForEvent:]):
(-[WKView _postFakeMouseMovedEventForFlagsChangedEvent:]):
(-[WKView initWithFrame:processPool:configuration:webView:]):

WebMouseEvent takes a force parameter.

• WebProcess/Plugins/PDF/PDFPlugin.mm:

(WebKit::PDFPlugin::showContextMenuAtPoint):

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::createWebEvent):

MouseEvent and PlatformMouseEvent both take force parameters too.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::navigateToURLWithSimulatedClick):
(WebKit::WebPage::contextMenuAtPointInWindow):
(WebKit::WebPage::dragEnded):
(WebKit::WebPage::simulateMouseDown):
(WebKit::WebPage::simulateMouseUp):
(WebKit::WebPage::simulateMouseMotion):

The functions that dispatch the force events no longer take a PlatformMouseEvent
as a parameter.

• WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::inputDeviceForceDidChange):
(WebKit::WebPage::immediateActionDidCancel):

LayoutTests:

• platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
• platform/mac/js/dom/global-constructors-attributes-expected.txt:
• platform/win/js/dom/global-constructors-attributes-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (modified) (1 diff)
• LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/DerivedSources.cpp (modified) (1 diff)
• Source/WebCore/DerivedSources.make (modified) (1 diff)
• Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (modified) (4 diffs)
• Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (modified) (4 diffs)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (8 diffs)
• Source/WebCore/dom/DOMAllInOne.cpp (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (4 diffs)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/dom/EventNames.in (modified) (1 diff)
• Source/WebCore/dom/MouseEvent.cpp (modified) (9 diffs)
• Source/WebCore/dom/MouseEvent.h (modified) (5 diffs)
• Source/WebCore/dom/MouseEvent.idl (modified) (2 diffs)
• Source/WebCore/dom/WebKitMouseForceEvent.cpp (deleted)
• Source/WebCore/dom/WebKitMouseForceEvent.h (deleted)
• Source/WebCore/dom/WebKitMouseForceEvent.idl (deleted)
• Source/WebCore/dom/WheelEvent.cpp (modified) (1 diff)
• Source/WebCore/page/ContextMenuController.cpp (modified) (1 diff)
• Source/WebCore/page/DragController.cpp (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (4 diffs)
• Source/WebCore/page/EventHandler.h (modified) (1 diff)
• Source/WebCore/platform/PlatformMouseEvent.h (modified) (5 diffs)
• Source/WebCore/replay/SerializationMethods.cpp (modified) (2 diffs)
• Source/WebKit/ios/ChangeLog (modified) (1 diff)
• Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm (modified) (1 diff)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/WebView/WebFrame.mm (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPDFView.mm (modified) (1 diff)
• Source/WebKit/win/ChangeLog (modified) (1 diff)
• Source/WebKit/win/WebDropSource.cpp (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/NativeWebMouseEvent.h (modified) (1 diff)
• Source/WebKit2/Shared/WebEvent.h (modified) (3 diffs)
• Source/WebKit2/Shared/WebEventConversion.cpp (modified) (1 diff)
• Source/WebKit2/Shared/WebMouseEvent.cpp (modified) (4 diffs)
• Source/WebKit2/Shared/mac/NativeWebMouseEventMac.mm (modified) (1 diff)
• Source/WebKit2/Shared/mac/WebEventFactory.h (modified) (1 diff)
• Source/WebKit2/Shared/mac/WebEventFactory.mm (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/mac/WKView.mm (modified) (12 diffs)
• Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (modified) (1 diff)
• Source/WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (4 diffs)
• Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (3 diffs)
• Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-04-13  Beth Dakin  <bdakin@apple.com>
+
+        Add force property to MouseEvents
+        https://bugs.webkit.org/show_bug.cgi?id=143569
+        -and corresponding-
+        rdar://problem/20472954
+
+        Reviewed by Darin Adler.
+
+        * platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+        * platform/win/js/dom/global-constructors-attributes-expected.txt:
+
 2015-04-13  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt

@@ -2004 +2004 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeys').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeys').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').value is WebKitMouseForceEvent
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').value is WebKitMutationObserver
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').hasOwnProperty('get') is false

trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt

@@ -2024 +2024 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeys').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeys').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').value is WebKitMouseForceEvent
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').value is WebKitMutationObserver
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').hasOwnProperty('get') is false

trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt

@@ -1809 +1809 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeys').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeys').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').value is WebKitMouseForceEvent
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitMouseForceEvent').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').value is WebKitMutationObserver
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').hasOwnProperty('get') is false

trunk/Source/WebCore/CMakeLists.txt

@@ -429 +429 @@
     dom/UIEvent.idl
     dom/WebKitAnimationEvent.idl
-    dom/WebKitMouseForceEvent.idl
     dom/WebKitNamedFlow.idl
     dom/WebKitTransitionEvent.idl
@@ -1457 +1456 @@
     dom/VisitedLinkState.cpp
     dom/WebKitAnimationEvent.cpp
-    dom/WebKitMouseForceEvent.cpp
     dom/WebKitNamedFlow.cpp
     dom/WebKitTransitionEvent.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-13  Beth Dakin  <bdakin@apple.com>
+
+        Add force property to MouseEvents
+        https://bugs.webkit.org/show_bug.cgi?id=143569
+        -and corresponding-
+        rdar://problem/20472954
+
+        Reviewed by Darin Adler.
+
+        This patch removes WebKitMouseForceEvent and uses a MouseEvent everywhere that it 
+        was used. That’s possible because this patch also adds a force property to all 
+        MouseEvents and to PlatformMouseEvent.
+
+        Remove WebKitMouseForceEvent.
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/DOMAllInOne.cpp:
+
+        Create MouseEvents with the appropriate force instead of WebKitMouseForceEvents. 
+        This patch also gets rid of the PlatformMouseEvent parameter for these events. 
+        They were re-using the cached mousedown event before, which they never should have 
+        done. Instead, we create PlatformMouseEvents inside these functions and then use 
+        that to make MouseEvents.
+        * dom/Element.cpp:
+        (WebCore::Element::dispatchMouseForceWillBegin):
+        (WebCore::Element::dispatchMouseForceChanged):
+        (WebCore::Element::dispatchMouseForceDown):
+        (WebCore::Element::dispatchMouseForceUp):
+        (WebCore::Element::dispatchMouseForceClick):
+        (WebCore::Element::dispatchMouseForceCancelled):
+        * dom/Element.h:
+
+        No More WebKitMouseForceEvent.
+        * dom/EventNames.in:
+
+        Add force to MouseEvent.
+        * dom/MouseEvent.cpp:
+        (WebCore::MouseEvent::create):
+        (WebCore::MouseEvent::MouseEvent):
+        (WebCore::MouseEvent::cloneFor):
+        (WebCore::SimulatedMouseEvent::SimulatedMouseEvent):
+        * dom/MouseEvent.h:
+        (WebCore::MouseEvent::force):
+        (WebCore::MouseEvent::setForce):
+        * dom/MouseEvent.idl:
+
+        No More WebKitMouseForceEvent.
+        * dom/WebKitMouseForceEvent.cpp: Removed.
+        * dom/WebKitMouseForceEvent.h: Removed.
+        * dom/WebKitMouseForceEvent.idl: Removed.
+
+        PlatformMouseEvent now takes a force parameter.
+        * dom/WheelEvent.cpp:
+        (WebCore::WheelEvent::WheelEvent):
+        * page/ContextMenuController.cpp:
+        (WebCore::ContextMenuController::showContextMenuAt):
+        * page/DragController.cpp:
+        (WebCore::createMouseEvent):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::dispatchDragEvent):
+        (WebCore::EventHandler::sendContextMenuEventForKey):
+        (WebCore::EventHandler::fakeMouseMoveEventTimerFired):
+
+        We don’t need lastMouseDownEvent() anymore. We were using it to avoid creating new 
+        PlatformMouseEvents for the force events, but we fix that in this patch.
+        (WebCore::EventHandler::lastMouseDownEvent): Deleted.
+        * page/EventHandler.h:
+
+        At force to PlatformMouseEvent.
+        * platform/PlatformMouseEvent.h:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        (WebCore::PlatformMouseEvent::force):
+        * replay/SerializationMethods.cpp:
+        (JSC::EncodingTraits<PlatformMouseEvent>::encodeValue):
+        (JSC::EncodingTraits<PlatformMouseEvent>::decodeValue):
+
 2015-04-13  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/DerivedSources.cpp

@@ -511 +511 @@
 #include "JSWebKitCSSMatrix.cpp"
 #include "JSWebKitCSSRegionRule.cpp"
-#include "JSWebKitMouseForceEvent.cpp"
 #include "JSWebKitNamedFlow.cpp"
 #include "JSWebKitPoint.cpp"

trunk/Source/WebCore/DerivedSources.make

@@ -315 +315 @@
     $(WebCore)/dom/UIEvent.idl \
     $(WebCore)/dom/WebKitAnimationEvent.idl \
-        $(WebCore)/dom/WebKitMouseForceEvent.idl \
     $(WebCore)/dom/WebKitNamedFlow.idl \
     $(WebCore)/dom/WebKitTransitionEvent.idl \

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -6333 +6333 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitMouseForceEvent.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitNamedFlow.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -14244 +14230 @@
     </ClCompile>
     <ClCompile Include="..\dom\WebKitAnimationEvent.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\dom\WebKitMouseForceEvent.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -19122 +19094 @@
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSRegionRule.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSTransformValue.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitMouseForceEvent.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitNamedFlow.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitPoint.h" />
@@ -21045 +21016 @@
     <ClInclude Include="..\dom\ViewportArguments.h" />
     <ClInclude Include="..\dom\WebKitAnimationEvent.h" />
-    <ClInclude Include="..\dom\WebKitMouseForceEvent.h" />
     <ClInclude Include="..\dom\WebKitNamedFlow.h" />
     <ClInclude Include="..\dom\WebKitTransitionEvent.h" />

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

@@ -3379 +3379 @@
       <Filter>dom</Filter>
     </ClCompile>
-    <ClCompile Include="..\dom\WebKitMouseForceEvent.cpp">
-      <Filter>dom</Filter>
-    </ClCompile>
     <ClCompile Include="..\dom\WebKitNamedFlow.cpp">
       <Filter>dom</Filter>
@@ -6216 +6213 @@
     </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSTransformValue.cpp">
-      <Filter>DerivedSources</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitMouseForceEvent.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
@@ -10495 +10489 @@
       <Filter>dom</Filter>
     </ClInclude>
-    <ClInclude Include="..\dom\WebKitMouseForceEvent.h">
-      <Filter>dom</Filter>
-    </ClInclude>
     <ClInclude Include="..\dom\WebKitNamedFlow.h">
       <Filter>dom</Filter>
@@ -13600 +13591 @@
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSTransformValue.h">
-      <Filter>DerivedSources</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitMouseForceEvent.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -3428 +3428 @@
                 93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF0260AF6C52900018E89 /* NavigationAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 93CCF0600AF6CA7600018E89 /* NavigationAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF05F0AF6CA7600018E89 /* NavigationAction.cpp */; };
-                93D200ED1AB8ED090025E851 /* WebKitMouseForceEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93D200EB1AB8ED090025E851 /* WebKitMouseForceEvent.cpp */; };
-                93D200EE1AB8ED090025E851 /* WebKitMouseForceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D200EC1AB8ED090025E851 /* WebKitMouseForceEvent.h */; };
-                93D200F21AB8F81F0025E851 /* JSWebKitMouseForceEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93D200F01AB8F81F0025E851 /* JSWebKitMouseForceEvent.cpp */; };
-                93D200F31AB8F8200025E851 /* JSWebKitMouseForceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D200F11AB8F81F0025E851 /* JSWebKitMouseForceEvent.h */; };
                 93D3C1590F97A9D70053C013 /* DOMHTMLCanvasElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D3C1580F97A9D70053C013 /* DOMHTMLCanvasElement.h */; };
                 93D3C17D0F97AA760053C013 /* DOMHTMLCanvasElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 93D3C1580F97A9D70053C013 /* DOMHTMLCanvasElement.h */; };
@@ -10680 +10676 @@
                 93CCF0260AF6C52900018E89 /* NavigationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationAction.h; sourceTree = "<group>"; };
                 93CCF05F0AF6CA7600018E89 /* NavigationAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationAction.cpp; sourceTree = "<group>"; };
-                93D200EB1AB8ED090025E851 /* WebKitMouseForceEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitMouseForceEvent.cpp; sourceTree = "<group>"; };
-                93D200EC1AB8ED090025E851 /* WebKitMouseForceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitMouseForceEvent.h; sourceTree = "<group>"; };
-                93D200EF1AB8ED640025E851 /* WebKitMouseForceEvent.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebKitMouseForceEvent.idl; sourceTree = "<group>"; };
-                93D200F01AB8F81F0025E851 /* JSWebKitMouseForceEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitMouseForceEvent.cpp; sourceTree = "<group>"; };
-                93D200F11AB8F81F0025E851 /* JSWebKitMouseForceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitMouseForceEvent.h; sourceTree = "<group>"; };
                 93D3C1580F97A9D70053C013 /* DOMHTMLCanvasElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLCanvasElement.h; sourceTree = "<group>"; };
                 93D9D53B0DA27E180077216C /* RangeBoundaryPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RangeBoundaryPoint.h; sourceTree = "<group>"; };
@@ -19734 +19725 @@
                                 31C0FF390E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.cpp */,
                                 31C0FF3A0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h */,
-                                93D200F01AB8F81F0025E851 /* JSWebKitMouseForceEvent.cpp */,
-                                93D200F11AB8F81F0025E851 /* JSWebKitMouseForceEvent.h */,
                                 31C0FF3B0E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.cpp */,
                                 31C0FF3C0E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.h */,
@@ -23208 +23197 @@
                                 31C0FF1C0E4CEB6E007D6FE5 /* WebKitAnimationEvent.h */,
                                 31C0FF1D0E4CEB6E007D6FE5 /* WebKitAnimationEvent.idl */,
-                                93D200EB1AB8ED090025E851 /* WebKitMouseForceEvent.cpp */,
-                                93D200EC1AB8ED090025E851 /* WebKitMouseForceEvent.h */,
-                                93D200EF1AB8ED640025E851 /* WebKitMouseForceEvent.idl */,
                                 D7613A4E1474F13F00DB8606 /* WebKitNamedFlow.cpp */,
                                 D7613A4D1474F13F00DB8606 /* WebKitNamedFlow.h */,
@@ -24249 +24235 @@
                                 BC1A37B6097C715F0019F3D8 /* DOMHTML.h in Headers */,
                                 319848081A1E6CB500A13318 /* DOMAnimationEvent.h in Headers */,
-                                93D200F31AB8F8200025E851 /* JSWebKitMouseForceEvent.h in Headers */,
                                 85DF81270AA7787200486AD7 /* DOMHTMLAnchorElement.h in Headers */,
                                 85E7119B0AC5D5350053270F /* DOMHTMLAnchorElementInternal.h in Headers */,
@@ -26614 +26599 @@
                                 B2227A3C0D00BF220071B782 /* SVGLineElement.h in Headers */,
                                 0810764412828556007C63BA /* SVGListProperty.h in Headers */,
-                                93D200EE1AB8ED090025E851 /* WebKitMouseForceEvent.h in Headers */,
                                 088A0E09126EF1DB00978F7A /* SVGListPropertyTearOff.h in Headers */,
                                 B2227A410D00BF220071B782 /* SVGLocatable.h in Headers */,
@@ -27545 +27529 @@
                                 2EDEF1F3121B0EFC00726DB2 /* BlobData.cpp in Sources */,
                                 E1D31CDC19196020001005A3 /* BlobDataFileReference.cpp in Sources */,
-                                93D200ED1AB8ED090025E851 /* WebKitMouseForceEvent.cpp in Sources */,
                                 E164A2ED191AE6350010737D /* BlobDataFileReferenceMac.mm in Sources */,
                                 E14A94D716DFDF950068DE82 /* BlobRegistry.cpp in Sources */,
@@ -27574 +27557 @@
                                 4634592C1AC2271000ECB71C /* PowerObserverMac.cpp in Sources */,
                                 5081E3C33CE580C16EF8B48B /* CachedResourceRequest.cpp in Sources */,
-                                93D200F21AB8F81F0025E851 /* JSWebKitMouseForceEvent.cpp in Sources */,
                                 6C638896A96CCEE50C8C946C /* CachedResourceRequestInitiators.cpp in Sources */,
                                 BCB16C230979C3BD00467741 /* CachedScript.cpp in Sources */,

trunk/Source/WebCore/dom/DOMAllInOne.cpp

@@ -149 +149 @@
 #include "VisitedLinkState.cpp"
 #include "WebKitAnimationEvent.cpp"
-#include "WebKitMouseForceEvent.cpp"
 #include "WebKitNamedFlow.cpp"
 #include "WebKitTransitionEvent.cpp"

trunk/Source/WebCore/dom/Element.cpp

@@ -80 +80 @@
 #include "TextIterator.h"
 #include "VoidCallback.h"
-#include "WebKitMouseForceEvent.h"
 #include "WheelEvent.h"
 #include "XLinkNames.h"
@@ -2245 +2244 @@
         return false;
 
-    PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime());
-    RefPtr<Event> mouseForceWillBeginEvent =  WebKitMouseForceEvent::create(eventNames().webkitmouseforcewillbeginEvent, 0, platformMouseEvent, document().defaultView());
+    PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), ForceAtClick);
+    RefPtr<MouseEvent> mouseForceWillBeginEvent =  MouseEvent::create(eventNames().webkitmouseforcewillbeginEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
     mouseForceWillBeginEvent->setTarget(this);
     dispatchEvent(mouseForceWillBeginEvent);
@@ -2255 +2254 @@
 }
 
-void Element::dispatchMouseForceChanged(float force, const PlatformMouseEvent& platformMouseEvent)
+void Element::dispatchMouseForceChanged(float force)
 {
     if (!document().hasListenerType(Document::FORCECHANGED_LISTENER))
         return;
 
-    RefPtr<WebKitMouseForceEvent> mouseForceChangedEvent = WebKitMouseForceEvent::create(eventNames().webkitmouseforcechangedEvent, force, platformMouseEvent, document().defaultView());
+    Frame* frame = document().frame();
+    if (!frame)
+        return;
+
+    PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), force);
+    RefPtr<MouseEvent> mouseForceChangedEvent =  MouseEvent::create(eventNames().webkitmouseforcechangedEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
+
     mouseForceChangedEvent->setTarget(this);
     dispatchEvent(mouseForceChangedEvent);
 }
 
-void Element::dispatchMouseForceDown(const PlatformMouseEvent& platformMouseEvent)
+void Element::dispatchMouseForceDown()
 {
     if (!document().hasListenerType(Document::FORCEDOWN_LISTENER))
         return;
 
-    RefPtr<Event> mouseForceDownEvent = WebKitMouseForceEvent::create(eventNames().webkitmouseforcedownEvent, 1, platformMouseEvent, document().defaultView());
+    Frame* frame = document().frame();
+    if (!frame)
+        return;
+
+    PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), ForceAtForceClick);
+    RefPtr<MouseEvent> mouseForceDownEvent =  MouseEvent::create(eventNames().webkitmouseforcedownEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
+
     mouseForceDownEvent->setTarget(this);
     dispatchEvent(mouseForceDownEvent);
 }
 
-void Element::dispatchMouseForceUp(const PlatformMouseEvent& platformMouseEvent)
+void Element::dispatchMouseForceUp()
 {
     if (!document().hasListenerType(Document::FORCEUP_LISTENER))
         return;
 
-    RefPtr<Event> mouseForceUpEvent = WebKitMouseForceEvent::create(eventNames().webkitmouseforceupEvent, 1, platformMouseEvent, document().defaultView());
+    Frame* frame = document().frame();
+    if (!frame)
+        return;
+
+    PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), ForceAtForceClick);
+    RefPtr<MouseEvent> mouseForceUpEvent =  MouseEvent::create(eventNames().webkitmouseforceupEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
+
     mouseForceUpEvent->setTarget(this);
     dispatchEvent(mouseForceUpEvent);
 }
 
-void Element::dispatchMouseForceClick(const PlatformMouseEvent& platformMouseEvent)
+void Element::dispatchMouseForceClick()
 {
     if (!document().hasListenerType(Document::FORCECLICK_LISTENER))
         return;
 
-    RefPtr<Event> mouseForceClickEvent = WebKitMouseForceEvent::create(eventNames().webkitmouseforceclickEvent, 1, platformMouseEvent, document().defaultView());
+    Frame* frame = document().frame();
+    if (!frame)
+        return;
+
+    PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), ForceAtForceClick);
+    RefPtr<MouseEvent> mouseForceClickEvent =  MouseEvent::create(eventNames().webkitmouseforceclickEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
+
     mouseForceClickEvent->setTarget(this);
     dispatchEvent(mouseForceClickEvent);
 }
 
-void Element::dispatchMouseForceCancelled(const PlatformMouseEvent& platformMouseEvent)
+void Element::dispatchMouseForceCancelled()
 {
     if (!document().hasListenerType(Document::FORCECANCELLED_LISTENER))
         return;
 
-    RefPtr<Event> mouseForceCancelledEvent = WebKitMouseForceEvent::create(eventNames().webkitmouseforcecancelledEvent, 0, platformMouseEvent, document().defaultView());
+    Frame* frame = document().frame();
+    if (!frame)
+        return;
+
+    PlatformMouseEvent platformMouseEvent(frame->eventHandler().lastKnownMousePosition(), frame->eventHandler().lastKnownMouseGlobalPosition(), NoButton, PlatformEvent::NoType, 1, false, false, false, false, WTF::currentTime(), 0);
+    RefPtr<MouseEvent> mouseForceCancelledEvent =  MouseEvent::create(eventNames().webkitmouseforcecancelledEvent, document().defaultView(), platformMouseEvent, 0, nullptr);
+
     mouseForceCancelledEvent->setTarget(this);
     dispatchEvent(mouseForceCancelledEvent);
@@ -2312 +2341 @@
 }
 
-void Element::dispatchMouseForceChanged(float, const PlatformMouseEvent&)
-{
-}
-
-void Element::dispatchMouseForceDown(const PlatformMouseEvent&)
-{
-}
-
-void Element::dispatchMouseForceUp(const PlatformMouseEvent&)
-{
-}
-
-void Element::dispatchMouseForceClick(const PlatformMouseEvent&)
-{
-}
-
-void Element::dispatchMouseForceCancelled(const PlatformMouseEvent&)
+void Element::dispatchMouseForceChanged(float)
+{
+}
+
+void Element::dispatchMouseForceDown()
+{
+}
+
+void Element::dispatchMouseForceUp()
+{
+}
+
+void Element::dispatchMouseForceClick()
+{
+}
+
+void Element::dispatchMouseForceCancelled()
 {
 }

trunk/Source/WebCore/dom/Element.h

@@ -470 +470 @@
 
     WEBCORE_EXPORT bool dispatchMouseForceWillBegin();
-    WEBCORE_EXPORT void dispatchMouseForceChanged(float force, const PlatformMouseEvent&);
-    WEBCORE_EXPORT void dispatchMouseForceDown(const PlatformMouseEvent&);
-    WEBCORE_EXPORT void dispatchMouseForceUp(const PlatformMouseEvent&);
-    WEBCORE_EXPORT void dispatchMouseForceClick(const PlatformMouseEvent&);
-    WEBCORE_EXPORT void dispatchMouseForceCancelled(const PlatformMouseEvent&);
+    WEBCORE_EXPORT void dispatchMouseForceChanged(float force);
+    WEBCORE_EXPORT void dispatchMouseForceDown();
+    WEBCORE_EXPORT void dispatchMouseForceUp();
+    WEBCORE_EXPORT void dispatchMouseForceClick();
+    WEBCORE_EXPORT void dispatchMouseForceCancelled();
 
     virtual bool willRecalcStyle(Style::Change);

trunk/Source/WebCore/dom/EventNames.in

@@ -29 +29 @@
 UIEvents interfaceName=UIEvent
 WebKitAnimationEvent
-WebKitMouseForceEvent
 WebKitTransitionEvent
 WheelEvent

trunk/Source/WebCore/dom/MouseEvent.cpp

@@ -67 +67 @@
 #endif
         event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), event.button(),
-        relatedTarget);
+        relatedTarget, event.force());
 }
 
@@ -76 +76 @@
 #endif
     bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
-    PassRefPtr<EventTarget> relatedTarget)
+    PassRefPtr<EventTarget> relatedTarget, double force)
 
 {
@@ -84 +84 @@
         movementX, movementY,
 #endif
-        ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, 0, false);
+        ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, force, 0, false);
 }
 
@@ -93 +93 @@
 #endif
     bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
-    PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer> dataTransfer, bool isSimulated)
+    PassRefPtr<EventTarget> relatedTarget, double force, PassRefPtr<DataTransfer> dataTransfer, bool isSimulated)
 {
     return adoptRef(*new MouseEvent(type, canBubble, cancelable, timestamp, view,
@@ -100 +100 @@
         movementX, movementY,
 #endif
-        ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, dataTransfer, isSimulated));
+        ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, force, dataTransfer, isSimulated));
 }
 
@@ -115 +115 @@
 #endif
                        bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
-                       unsigned short button, PassRefPtr<EventTarget> relatedTarget,
+                       unsigned short button, PassRefPtr<EventTarget> relatedTarget, double force,
                        PassRefPtr<DataTransfer> dataTransfer, bool isSimulated)
     : MouseRelatedEvent(eventType, canBubble, cancelable, timestamp, view, detail, IntPoint(screenX, screenY),
@@ -126 +126 @@
     , m_buttonDown(button != (unsigned short)-1)
     , m_relatedTarget(relatedTarget)
+    , m_force(force)
     , m_dataTransfer(dataTransfer)
 {
@@ -255 +256 @@
         // Nullifies relatedTarget.
         0);
+    clonedMouseEvent->setForce(force());
     return clonedMouseEvent.release();
 }
@@ -272 +274 @@
                  0, 0,
 #endif
-                 false, false, false, false, 0, 0, 0, true)
+                 false, false, false, false, 0, 0, 0, 0, true)
 {
     if (UIEventWithKeyState* keyStateEvent = findEventWithKeyState(underlyingEvent.get())) {

trunk/Source/WebCore/dom/MouseEvent.h

@@ -60 +60 @@
 #endif
         bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
-        PassRefPtr<EventTarget> relatedTarget);
+        PassRefPtr<EventTarget> relatedTarget, double force);
 
     WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, PassRefPtr<AbstractView>,
@@ -68 +68 @@
 #endif
         bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
-        PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer>, bool isSimulated = false);
+        PassRefPtr<EventTarget> relatedTarget, double force, PassRefPtr<DataTransfer>, bool isSimulated = false);
 
     WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomicString& eventType, PassRefPtr<AbstractView>, const PlatformMouseEvent&, int detail, PassRefPtr<Node> relatedTarget);
@@ -87 +87 @@
     virtual EventTarget* relatedTarget() const override final { return m_relatedTarget.get(); }
     void setRelatedTarget(PassRefPtr<EventTarget> relatedTarget) { m_relatedTarget = relatedTarget; }
-
+    double force() const { return m_force; }
+    void setForce(double force) { m_force = force; }
 
     Node* toElement() const;
@@ -113 +114 @@
 #endif
         bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
-        PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer>, bool isSimulated);
+        PassRefPtr<EventTarget> relatedTarget, double force, PassRefPtr<DataTransfer>, bool isSimulated);
 
     MouseEvent(const AtomicString& type, const MouseEventInit&);
@@ -123 +124 @@
     bool m_buttonDown;
     RefPtr<EventTarget> m_relatedTarget;
+    double m_force { 0 };
     RefPtr<DataTransfer> m_dataTransfer;
 };

trunk/Source/WebCore/dom/MouseEvent.idl

@@ -1 +1 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2015 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -34 +34 @@
     [Conditional=POINTER_LOCK]      readonly attribute long             movementX;
     [Conditional=POINTER_LOCK]      readonly attribute long             movementY;
+    [Conditional=MOUSE_FORCE_EVENTS]readonly attribute double           force;
     
     [ObjCLegacyUnnamedParameters] void initMouseEvent([Default=Undefined] optional DOMString type, 

trunk/Source/WebCore/dom/WheelEvent.cpp

@@ -71 +71 @@
                 , 0, 0
 #endif
-                , event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), 0, 0, 0, false)
+                , event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), 0, 0, 0, 0, false)
     , m_wheelDelta(event.wheelTicksX() * TickMultiplier, event.wheelTicksY() * TickMultiplier)
     , m_deltaX(-event.deltaX())

trunk/Source/WebCore/page/ContextMenuController.cpp

@@ -1434 +1434 @@
     
     // Simulate a click in the middle of the accessibility object.
-    PlatformMouseEvent mouseEvent(clickPoint, clickPoint, RightButton, PlatformEvent::MousePressed, 1, false, false, false, false, currentTime());
+    PlatformMouseEvent mouseEvent(clickPoint, clickPoint, RightButton, PlatformEvent::MousePressed, 1, false, false, false, false, currentTime(), ForceAtClick);
     frame->eventHandler().handleMousePressEvent(mouseEvent);
     bool handled = frame->eventHandler().sendContextMenuEvent(mouseEvent);

trunk/Source/WebCore/page/DragController.cpp

@@ -94 +94 @@
     return PlatformMouseEvent(dragData.clientPosition(), dragData.globalPosition(),
                               LeftButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey,
-                              metaKey, currentTime());
+                              metaKey, currentTime(), ForceAtClick);
 }
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2160 +2160 @@
 #endif
         event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(),
-        0, 0, dataTransfer);
+        0, 0, event.force(), dataTransfer);
 
     dragTarget.dispatchEvent(me.get(), IGNORE_EXCEPTION);
@@ -2850 +2850 @@
 #endif
 
-    PlatformMouseEvent platformMouseEvent(position, globalPosition, RightButton, eventType, 1, false, false, false, false, WTF::currentTime());
+    PlatformMouseEvent platformMouseEvent(position, globalPosition, RightButton, eventType, 1, false, false, false, false, WTF::currentTime(), ForceAtClick);
 
     return !dispatchMouseEvent(eventNames().contextmenuEvent, targetNode, true, 0, platformMouseEvent, false);
@@ -2937 +2937 @@
     bool metaKey;
     PlatformKeyboardEvent::getCurrentModifierState(shiftKey, ctrlKey, altKey, metaKey);
-    PlatformMouseEvent fakeMouseMoveEvent(m_lastKnownMousePosition, m_lastKnownMouseGlobalPosition, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, currentTime());
+    PlatformMouseEvent fakeMouseMoveEvent(m_lastKnownMousePosition, m_lastKnownMouseGlobalPosition, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, currentTime(), 0);
     mouseMoved(fakeMouseMoveEvent);
 }
@@ -4021 +4021 @@
 }
 
-const PlatformMouseEvent& EventHandler::lastMouseDownEvent() const
-{
-    return m_mouseDown;
-}
-
 void EventHandler::setImmediateActionStage(ImmediateActionStage stage)
 {

trunk/Source/WebCore/page/EventHandler.h

@@ -313 +313 @@
 
     WEBCORE_EXPORT void setImmediateActionStage(ImmediateActionStage stage);
-    WEBCORE_EXPORT const PlatformMouseEvent& lastMouseDownEvent() const;
 
 private:

trunk/Source/WebCore/platform/PlatformMouseEvent.h

@@ -43 +43 @@
 
 namespace WebCore {
-    
+
+const double ForceAtClick = 0;
+const double ForceAtForceClick = 1;
+
     // 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 };
@@ -64 +67 @@
 
         PlatformMouseEvent(const IntPoint& position, const IntPoint& globalPosition, MouseButton button, PlatformEvent::Type type,
-                           int clickCount, bool shiftKey, bool ctrlKey, bool altKey, bool metaKey, double timestamp)
+                           int clickCount, bool shiftKey, bool ctrlKey, bool altKey, bool metaKey, double timestamp, double force)
             : PlatformEvent(type, shiftKey, ctrlKey, altKey, metaKey, timestamp)
             , m_position(position)
@@ -71 +74 @@
             , m_clickCount(clickCount)
             , m_modifierFlags(0)
+            , m_force(force)
 #if PLATFORM(MAC)
             , m_eventNumber(0)
@@ -89 +93 @@
         int clickCount() const { return m_clickCount; }
         unsigned modifierFlags() const { return m_modifierFlags; }
+        double force() const { return m_force; }
         
 
@@ -124 +129 @@
         int m_clickCount;
         unsigned m_modifierFlags;
+        double m_force { 0 };
 
 #if PLATFORM(MAC)

trunk/Source/WebCore/replay/SerializationMethods.cpp

@@ -315 +315 @@
     ENCODE_TYPE_WITH_KEY(encodedValue, bool, metaKey, input.metaKey());
     ENCODE_TYPE_WITH_KEY(encodedValue, int, timestamp, input.timestamp());
+    ENCODE_TYPE_WITH_KEY(encodedValue, double, force, input.force());
 
     return encodedValue;
@@ -333 +334 @@
     DECODE_TYPE_WITH_KEY(encodedValue, bool, metaKey);
     DECODE_TYPE_WITH_KEY(encodedValue, int, timestamp);
+    DECODE_TYPE_WITH_KEY(encodedValue, double, force);
 
     input = std::make_unique<PlatformMouseEvent>(IntPoint(positionX, positionY),
         IntPoint(globalPositionX, globalPositionY),
         button, type, clickCount,
-        shiftKey, ctrlKey, altKey, metaKey, timestamp);
+        shiftKey, ctrlKey, altKey, metaKey, timestamp, force);
     return true;
 }

trunk/Source/WebKit/ios/ChangeLog

@@ +1 @@
+2015-04-13  Beth Dakin  <bdakin@apple.com>
+
+        Add force property to MouseEvents
+        https://bugs.webkit.org/show_bug.cgi?id=143569
+        -and corresponding-
+        rdar://problem/20472954
+
+        Reviewed by Darin Adler.
+
+        Send the appropriate force with this simulated click event.
+        * WebView/WebPDFViewPlaceholder.mm:
+        (-[WebPDFViewPlaceholder simulateClickOnLinkToURL:]):
+
 2015-03-31  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm

@@ -472 +472 @@
         0, 0,
 #endif
-        false, false, false, false, 0, 0, 0, true);
+        false, false, false, false, 0, 0, 0, 0, true);
 
     // Call to the frame loader because this is where our security checks are made.

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-04-13  Beth Dakin  <bdakin@apple.com>
+
+        Add force property to MouseEvents
+        https://bugs.webkit.org/show_bug.cgi?id=143569
+        -and corresponding-
+        rdar://problem/20472954
+
+        Reviewed by Darin Adler.
+
+        PlatformMouseEvent and MouseEvent now take force parameters.
+        * WebView/WebFrame.mm:
+        (-[WebFrame _dragSourceEndedAt:operation:]):
+        * WebView/WebPDFView.mm:
+        (-[WebPDFView PDFViewWillClickOnLink:withURL:]):
+
 2015-04-12  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebFrame.mm

@@ -967 +967 @@
     // FIXME: These are fake modifier keys here, but they should be real ones instead.
     PlatformMouseEvent event(IntPoint(windowLoc), globalPoint(windowLoc, [view->platformWidget() window]),
-        LeftButton, PlatformEvent::MouseMoved, 0, false, false, false, false, currentTime());
+        LeftButton, PlatformEvent::MouseMoved, 0, false, false, false, false, currentTime(), WebCore::ForceAtClick);
     _private->coreFrame->eventHandler().dragSourceEndedAt(event, (DragOperation)operation);
 }

trunk/Source/WebKit/mac/WebView/WebPDFView.mm

@@ -1028 +1028 @@
             [nsEvent modifierFlags] & NSShiftKeyMask,
             [nsEvent modifierFlags] & NSCommandKeyMask,
-            button, 0, 0, true);
+            button, 0, WebCore::ForceAtClick, 0, true);
     }
 

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2015-04-13  Beth Dakin  <bdakin@apple.com>
+
+        Add force property to MouseEvents
+        https://bugs.webkit.org/show_bug.cgi?id=143569
+        -and corresponding-
+        rdar://problem/20472954
+
+        Reviewed by Darin Adler.
+
+        PlatformMouseEvent takes a force parameter.
+        * WebDropSource.cpp:
+        (generateMouseEvent):
+
 2015-04-13  Per Arne Vollan  <peavo@outlook.com>
 

trunk/Source/WebKit/win/WebDropSource.cpp

@@ -102 +102 @@
         ::ScreenToClient(viewWindow, reinterpret_cast<LPPOINT>(&localpt));
     return PlatformMouseEvent(IntPoint(localpt.x, localpt.y), IntPoint(pt.x, pt.y),
-        isDrag ? LeftButton : NoButton, PlatformEvent::MouseMoved, 0, false, false, false, false, currentTime());
+        isDrag ? LeftButton : NoButton, PlatformEvent::MouseMoved, 0, false, false, false, false, currentTime(), 0);
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-04-13  Beth Dakin  <bdakin@apple.com>
+
+        Add force property to MouseEvents
+        https://bugs.webkit.org/show_bug.cgi?id=143569
+        -and corresponding-
+        rdar://problem/20472954
+
+        Reviewed by Darin Adler.
+
+        In order to accommodate adding force to all PlatformMouseEvents, we have to add it 
+        to pass a caches pressure event to NativeWebMouseEvent and add force to 
+        WebMouseEvent.
+
+        NativeWebMouseEvent now requires a second NSEvent for the pressureEvent. 
+        * Shared/NativeWebMouseEvent.h:
+
+        WebMouseEvent takes a force parameter.
+        * Shared/WebEvent.h:
+        (WebKit::WebMouseEvent::force):
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
+        * Shared/WebMouseEvent.cpp:
+        (WebKit::WebMouseEvent::WebMouseEvent):
+        (WebKit::WebMouseEvent::encode):
+        (WebKit::WebMouseEvent::decode):
+        * Shared/mac/NativeWebMouseEventMac.mm:
+        (WebKit::NativeWebMouseEvent::NativeWebMouseEvent):
+        * Shared/mac/WebEventFactory.h:
+        * Shared/mac/WebEventFactory.mm:
+        (WebKit::WebEventFactory::createWebMouseEvent):
+
+        Cache the most recent pressureEvent in _data so that it can be sent along to the 
+        NativeWebMouseEvent constructor.
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView pressureChangeWithEvent:]):
+        (-[WKView acceptsFirstMouse:]):
+        (-[WKView shouldDelayWindowOrderingForEvent:]):
+        (-[WKView _postFakeMouseMovedEventForFlagsChangedEvent:]):
+        (-[WKView initWithFrame:processPool:configuration:webView:]):
+
+        WebMouseEvent takes a force parameter.
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        (WebKit::PDFPlugin::showContextMenuAtPoint):
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::createWebEvent):
+
+        MouseEvent and PlatformMouseEvent both take force parameters too.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::navigateToURLWithSimulatedClick):
+        (WebKit::WebPage::contextMenuAtPointInWindow):
+        (WebKit::WebPage::dragEnded):
+        (WebKit::WebPage::simulateMouseDown):
+        (WebKit::WebPage::simulateMouseUp):
+        (WebKit::WebPage::simulateMouseMotion):
+
+        The functions that dispatch the force events no longer take a PlatformMouseEvent 
+        as a parameter.
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::inputDeviceForceDidChange):
+        (WebKit::WebPage::immediateActionDidCancel):
+
 2015-04-13  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h

@@ -50 +50 @@
 public:
 #if USE(APPKIT)
-    NativeWebMouseEvent(NSEvent *, NSView *);
+    NativeWebMouseEvent(NSEvent *, NSEvent *pressureEvent, NSView *);
 #elif PLATFORM(GTK)
     NativeWebMouseEvent(const NativeWebMouseEvent&);

trunk/Source/WebKit2/Shared/WebEvent.h

@@ -125 +125 @@
 
 #if PLATFORM(MAC)
-    WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp, int eventNumber = -1, int menuType = 0);
+    WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp, double force, int eventNumber = -1, int menuType = 0);
 #else
-    WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp);
+    WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp, double force = 0);
 #endif
 
@@ -141 +141 @@
     int32_t menuTypeForEvent() const { return m_menuTypeForEvent; }
 #endif
+    double force() const { return m_force; }
 
     void encode(IPC::ArgumentEncoder&) const;
@@ -159 +160 @@
     int32_t m_menuTypeForEvent;
 #endif
+    double m_force { 0 };
 };
 

trunk/Source/WebKit2/Shared/WebEventConversion.cpp

@@ -39 +39 @@
         case WebEvent::MouseDown:
             m_type = WebCore::PlatformEvent::MousePressed;
+            m_force = WebCore::ForceAtClick;
             break;
         case WebEvent::MouseUp:
             m_type = WebCore::PlatformEvent::MouseReleased;
+            m_force = WebCore::ForceAtClick;
             break;
         case WebEvent::MouseMove:
             m_type = WebCore::PlatformEvent::MouseMoved;
+            m_force = webEvent.force();
             break;
         default:

trunk/Source/WebKit2/Shared/WebMouseEvent.cpp

@@ -49 +49 @@
 
 #if PLATFORM(MAC)
-WebMouseEvent::WebMouseEvent(Type type, Button button, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp, int eventNumber, int menuType)
+WebMouseEvent::WebMouseEvent(Type type, Button button, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp, double force, int eventNumber, int menuType)
 #else
-WebMouseEvent::WebMouseEvent(Type type, Button button, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp)
+WebMouseEvent::WebMouseEvent(Type type, Button button, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp, double force)
 #endif
     : WebEvent(type, modifiers, timestamp)
@@ -65 +65 @@
     , m_menuTypeForEvent(menuType)
 #endif
+    , m_force(force)
 {
     ASSERT(isMouseEventType(type));
@@ -84 +85 @@
     encoder << m_menuTypeForEvent;
 #endif
+    encoder << m_force;
 }
 
@@ -111 +113 @@
         return false;
 #endif
+    if (!decoder.decode(result.m_force))
+        return false;
 
     return true;

trunk/Source/WebKit2/Shared/mac/NativeWebMouseEventMac.mm

@@ -33 +33 @@
 namespace WebKit {
 
-NativeWebMouseEvent::NativeWebMouseEvent(NSEvent* event, NSView* view)
-    : WebMouseEvent(WebEventFactory::createWebMouseEvent(event, view))
+NativeWebMouseEvent::NativeWebMouseEvent(NSEvent *event, NSEvent *pressureEvent, NSView *view)
+    : WebMouseEvent(WebEventFactory::createWebMouseEvent(event, pressureEvent, view))
     , m_nativeEvent(event)
 {

trunk/Source/WebKit2/Shared/mac/WebEventFactory.h

@@ -43 +43 @@
 public:
 #if USE(APPKIT)
-    static WebMouseEvent createWebMouseEvent(NSEvent *, NSView *windowView);
+    static WebMouseEvent createWebMouseEvent(NSEvent *, NSEvent *pressureEvent, NSView *windowView);
     static WebWheelEvent createWebWheelEvent(NSEvent *, NSView *windowView);
     static WebKeyboardEvent createWebKeyboardEvent(NSEvent *, bool handledByInputMethod, const Vector<WebCore::KeypressCommand>&);

trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm

@@ -359 +359 @@
 }
 
-WebMouseEvent WebEventFactory::createWebMouseEvent(NSEvent *event, NSView *windowView)
+WebMouseEvent WebEventFactory::createWebMouseEvent(NSEvent *event, NSEvent *pressureEvent, NSView *windowView)
 {
     NSPoint position = pointForEvent(event, windowView);
@@ -375 +375 @@
     int menuTypeForEvent                    = typeForEvent(event);
 
-    return WebMouseEvent(type, button, IntPoint(position), IntPoint(globalPosition), deltaX, deltaY, deltaZ, clickCount, modifiers, timestamp, eventNumber, menuTypeForEvent);
+    double force = 0;
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+    force = pressureEvent.stage < 1 ? pressureEvent.pressure : pressureEvent.pressure + pressureEvent.stage - 1;
+#endif
+
+    return WebMouseEvent(type, button, IntPoint(position), IntPoint(globalPosition), deltaX, deltaY, deltaZ, clickCount, modifiers, timestamp, force, eventNumber, menuTypeForEvent);
 }
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -225 +225 @@
     BOOL _willBecomeFirstResponderAgain;
     NSEvent *_mouseDownEvent;
+    NSEvent *_pressureEvent;
     BOOL _ignoringMouseDraggedEvents;
 
@@ -1250 +1251 @@
                     LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
                 else { \
-                    NativeWebMouseEvent webEvent(theEvent, self); \
+                    NativeWebMouseEvent webEvent(theEvent, _data->_pressureEvent, self); \
                     _data->_page->handleMouseEvent(webEvent); \
                 } \
@@ -1260 +1261 @@
             return; \
         } \
-        NativeWebMouseEvent webEvent(theEvent, self); \
+        NativeWebMouseEvent webEvent(theEvent, _data->_pressureEvent, self); \
         _data->_page->handleMouseEvent(webEvent); \
     }
@@ -1273 +1274 @@
                     LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
                 else { \
-                    NativeWebMouseEvent webEvent(theEvent, self); \
+                    NativeWebMouseEvent webEvent(theEvent, _data->_pressureEvent, self); \
                     _data->_page->handleMouseEvent(webEvent); \
                 } \
@@ -1279 +1280 @@
             return; \
         } \
-        NativeWebMouseEvent webEvent(theEvent, self); \
+        NativeWebMouseEvent webEvent(theEvent, _data->_pressureEvent, self); \
         _data->_page->handleMouseEvent(webEvent); \
     }
@@ -1296 +1297 @@
             return; \
         } \
-        NativeWebMouseEvent webEvent(theEvent, self); \
+        NativeWebMouseEvent webEvent(theEvent, _data->_pressureEvent, self); \
         _data->_page->handleMouseEvent(webEvent); \
     }
@@ -1308 +1309 @@
             return; \
         } \
-        NativeWebMouseEvent webEvent(theEvent, self); \
+        NativeWebMouseEvent webEvent(theEvent, _data->_pressureEvent, self); \
         _data->_page->handleMouseEvent(webEvent); \
     }
@@ -1418 +1419 @@
 {
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
-    if (event.phase == NSEventPhaseChanged || event.phase == NSEventPhaseBegan || event.phase == NSEventPhaseEnded)
-        _data->_page->inputDeviceForceDidChange(event.pressure, event.stage);
+    if (event == _data->_pressureEvent)
+        return;
+
+    if (event.phase != NSEventPhaseChanged && event.phase != NSEventPhaseBegan && event.phase != NSEventPhaseEnded)
+        return;
+
+    [_data->_pressureEvent release];
+    _data->_pressureEvent = [event retain];
+
+    _data->_page->inputDeviceForceDidChange(event.pressure, event.stage);
 #endif
 }
@@ -1434 +1443 @@
     
     [self _setMouseDownEvent:event];
-    bool result = _data->_page->acceptsFirstMouse([event eventNumber], WebEventFactory::createWebMouseEvent(event, self));
+    bool result = _data->_page->acceptsFirstMouse([event eventNumber], WebEventFactory::createWebMouseEvent(event, _data->_pressureEvent, self));
     [self _setMouseDownEvent:nil];
     return result;
@@ -1455 +1464 @@
     
     [self _setMouseDownEvent:event];
-    bool result = _data->_page->shouldDelayWindowOrderingForEvent(WebEventFactory::createWebMouseEvent(event, self));
+    bool result = _data->_page->shouldDelayWindowOrderingForEvent(WebEventFactory::createWebMouseEvent(event, _data->_pressureEvent, self));
     [self _setMouseDownEvent:nil];
     return result;
@@ -2971 +2980 @@
         modifierFlags:[flagsChangedEvent modifierFlags] timestamp:[flagsChangedEvent timestamp] windowNumber:[flagsChangedEvent windowNumber]
         context:[flagsChangedEvent context] eventNumber:0 clickCount:0 pressure:0];
-    NativeWebMouseEvent webEvent(fakeEvent, self);
+    NativeWebMouseEvent webEvent(fakeEvent, _data->_pressureEvent, self);
     _data->_page->handleMouseEvent(webEvent);
 }
@@ -3776 +3785 @@
 
     _data->_mouseDownEvent = nil;
+    _data->_pressureEvent = nil;
     _data->_ignoringMouseDraggedEvents = NO;
     _data->_clipsToVisibleRect = NO;

trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm

@@ -1459 +1459 @@
     FrameView* frameView = webFrame()->coreFrame()->view();
     IntPoint contentsPoint = frameView->contentsToRootView(point);
-    WebMouseEvent event(WebEvent::MouseDown, WebMouseEvent::RightButton, contentsPoint, contentsPoint, 0, 0, 0, 1, static_cast<WebEvent::Modifiers>(0), monotonicallyIncreasingTime());
+    WebMouseEvent event(WebEvent::MouseDown, WebMouseEvent::RightButton, contentsPoint, contentsPoint, 0, 0, 0, 1, static_cast<WebEvent::Modifiers>(0), monotonicallyIncreasingTime(), WebCore::ForceAtClick);
     return handleContextMenuEvent(event);
 }

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -888 +888 @@
         modifiers |= WebEvent::MetaKey;
 
-    return std::make_unique<WebMouseEvent>(type, button, m_plugin->convertToRootView(IntPoint(event->offsetX(), event->offsetY())), event->screenLocation(), 0, 0, 0, clickCount, static_cast<WebEvent::Modifiers>(modifiers), 0);
+    return std::make_unique<WebMouseEvent>(type, button, m_plugin->convertToRootView(IntPoint(event->offsetX(), event->offsetY())), event->screenLocation(), 0, 0, 0, clickCount, static_cast<WebEvent::Modifiers>(modifiers), 0, 0);
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1091 +1091 @@
 
     const int singleClick = 1;
-    RefPtr<MouseEvent> mouseEvent = MouseEvent::create(eventNames().clickEvent, true, true, currentTime(), nullptr, singleClick, screenPoint.x(), screenPoint.y(), documentPoint.x(), documentPoint.y(), false, false, false, false, 0, nullptr, nullptr);
+    RefPtr<MouseEvent> mouseEvent = MouseEvent::create(eventNames().clickEvent, true, true, currentTime(), nullptr, singleClick, screenPoint.x(), screenPoint.y(), documentPoint.x(), documentPoint.y(), false, false, false, false, 0, nullptr, 0, nullptr);
     mainFrame->loader().urlSelected(mainFrameDocument->completeURL(url), emptyString(), mouseEvent.release(), LockHistory::No, LockBackForwardList::No, ShouldSendReferrer::MaybeSendReferrer);
 }
@@ -1783 +1783 @@
     
     // Simulate a mouse click to generate the correct menu.
-    PlatformMouseEvent mouseEvent(point, point, RightButton, PlatformEvent::MousePressed, 1, false, false, false, false, currentTime());
+    PlatformMouseEvent mouseEvent(point, point, RightButton, PlatformEvent::MousePressed, 1, false, false, false, false, currentTime(), WebCore::ForceAtClick);
     bool handled = corePage()->userInputBridge().handleContextMenuEvent(mouseEvent, &corePage()->mainFrame());
     if (!handled)
@@ -3088 +3088 @@
         return;
     // FIXME: These are fake modifier keys here, but they should be real ones instead.
-    PlatformMouseEvent event(adjustedClientPosition, adjustedGlobalPosition, LeftButton, PlatformEvent::MouseMoved, 0, false, false, false, false, currentTime());
+    PlatformMouseEvent event(adjustedClientPosition, adjustedGlobalPosition, LeftButton, PlatformEvent::MouseMoved, 0, false, false, false, false, currentTime(), 0);
     m_page->mainFrame().eventHandler().dragSourceEndedAt(event, (DragOperation)operation);
 }
@@ -4017 +4017 @@
 void WebPage::simulateMouseDown(int button, WebCore::IntPoint position, int clickCount, WKEventModifiers modifiers, double time)
 {
-    mouseEvent(WebMouseEvent(WebMouseEvent::MouseDown, static_cast<WebMouseEvent::Button>(button), position, position, 0, 0, 0, clickCount, static_cast<WebMouseEvent::Modifiers>(modifiers), time));
+    mouseEvent(WebMouseEvent(WebMouseEvent::MouseDown, static_cast<WebMouseEvent::Button>(button), position, position, 0, 0, 0, clickCount, static_cast<WebMouseEvent::Modifiers>(modifiers), time, WebCore::ForceAtClick));
 }
 
 void WebPage::simulateMouseUp(int button, WebCore::IntPoint position, int clickCount, WKEventModifiers modifiers, double time)
 {
-    mouseEvent(WebMouseEvent(WebMouseEvent::MouseUp, static_cast<WebMouseEvent::Button>(button), position, position, 0, 0, 0, clickCount, static_cast<WebMouseEvent::Modifiers>(modifiers), time));
+    mouseEvent(WebMouseEvent(WebMouseEvent::MouseUp, static_cast<WebMouseEvent::Button>(button), position, position, 0, 0, 0, clickCount, static_cast<WebMouseEvent::Modifiers>(modifiers), time, WebCore::ForceAtClick));
 }
 
 void WebPage::simulateMouseMotion(WebCore::IntPoint position, double time)
 {
-    mouseEvent(WebMouseEvent(WebMouseEvent::MouseMove, WebMouseEvent::NoButton, position, position, 0, 0, 0, 0, WebMouseEvent::Modifiers(), time));
+    mouseEvent(WebMouseEvent(WebMouseEvent::MouseMove, WebMouseEvent::NoButton, position, position, 0, 0, 0, 0, WebMouseEvent::Modifiers(), time, 0));
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -523 +523 @@
     WKBeginObservingContentChanges(true);
 
-    mainframe.eventHandler().mouseMoved(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, false, false, false, false, 0));
+    mainframe.eventHandler().mouseMoved(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, false, false, false, false, 0, WebCore::ForceAtClick));
     mainframe.document()->updateStyleIfNeeded();
 
@@ -570 +570 @@
     bool tapWasHandled = false;
     m_lastInteractionLocation = roundedAdjustedPoint;
-    tapWasHandled |= mainframe.eventHandler().handleMousePressEvent(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, LeftButton, PlatformEvent::MousePressed, 1, false, false, false, false, 0));
-    tapWasHandled |= mainframe.eventHandler().handleMouseReleaseEvent(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, LeftButton, PlatformEvent::MouseReleased, 1, false, false, false, false, 0));
+    tapWasHandled |= mainframe.eventHandler().handleMousePressEvent(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, LeftButton, PlatformEvent::MousePressed, 1, false, false, false, false, 0, WebCore::ForceAtClick));
+    tapWasHandled |= mainframe.eventHandler().handleMouseReleaseEvent(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, LeftButton, PlatformEvent::MouseReleased, 1, false, false, false, false, 0, WebCore::ForceAtClick));
 
     RefPtr<Frame> newFocusedFrame = m_page->focusController().focusedFrame();
@@ -686 +686 @@
     Frame& mainframe = m_page->mainFrame();
 
-    mainframe.eventHandler().mouseMoved(PlatformMouseEvent(adjustedPoint, adjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, false, false, false, false, 0));
+    mainframe.eventHandler().mouseMoved(PlatformMouseEvent(adjustedPoint, adjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, false, false, false, false, 0, 0));
     mainframe.document()->updateStyleIfNeeded();
 }

trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

@@ -1149 +1149 @@
 
     float overallForce = stage < 1 ? force : force + stage - 1;
-    element->dispatchMouseForceChanged(overallForce, m_page->mainFrame().eventHandler().lastMouseDownEvent());
+    element->dispatchMouseForceChanged(overallForce);
 
     if (m_lastForceStage == 1 && stage == 2)
-        element->dispatchMouseForceDown(m_page->mainFrame().eventHandler().lastMouseDownEvent());
+        element->dispatchMouseForceDown();
     else if (m_lastForceStage == 2 && stage == 1) {
-        element->dispatchMouseForceUp(m_page->mainFrame().eventHandler().lastMouseDownEvent());
-        element->dispatchMouseForceClick(m_page->mainFrame().eventHandler().lastMouseDownEvent());
+        element->dispatchMouseForceUp();
+        element->dispatchMouseForceClick();
     }
 
@@ -1174 +1174 @@
         return;
 
-    element->dispatchMouseForceCancelled(m_page->mainFrame().eventHandler().lastMouseDownEvent());
+    element->dispatchMouseForceCancelled();
 }