summaryrefslogtreecommitdiffstats
path: root/WebCore/page/EventHandler.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-444/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-101-0/+2
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-121-2/+0
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Fix conflicts due to ANDROID_HITTEST_WITHSIZESteve Block2010-08-091-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A modified version of this Android-specific code was upstreamed in http://trac.webkit.org/changeset/64272 For the most part, the differences between the Android and upstreamed versions are syntactic only. In these cases, we take the upstream version. In a small number of cases, logical changes exist. In these cases, the Android logic has been retained, guarded with ANDROID_HITTEST_WITHSIZE, but using the new syntax. In particular ... - Android's HitTestResult::intersects(x, y, rect) is logically equivalent to the uspstream IntRect::intersects(HitTestPoint::rectFromPoint(x, y))). - Android's HitTestResult::addRawNode() is logically equivalent to the upstream HitTestResult::m_rectBasedTestResult.add(). - Android's HitTestResult::isRegionTest() is slightly different from the upstream HitTestResult::isRectBasedTest(). The latter is modified with a new ANDROID_HITTEST_WITHSIZE guard in HitTestResult::HitTestResult() to maintain the same behaviour. - The upstreamed code uses HitTestResult::addNodeToRectBasedTestResult() as a helper method in place of inline logic in the Android version. The slight difference in behaviour between this helper and the Android logic is reflected in the new ANDROID_HITTEST_WITHSIZE guard in the helper. This change should introduce no change in behaviour. Change-Id: I974d68e3ac963f18334418e32b08c3fd9ab1182e
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-091-0/+7
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge Webkit at r64264 : Fix conflicts.Kristian Monsen2010-08-041-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracs of the changes: WebCore/html/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/63998/trunk/WebCore/html/HTMLDocumentParser.cpp WebCore/page/EventHandler.cpp WebCore/page/EventHandler.h http://trac.webkit.org/changeset/63888 WebCore/page/Page.cpp http://trac.webkit.org/changeset/64208 WebCore/page/Settings.cpp WebCore/page/Settings.h http://trac.webkit.org/changeset/64110 WebCore/rendering/RenderLayerCompositor.h http://trac.webkit.org/changeset/64054/trunk/WebCore/rendering/RenderLayerCompositor.h WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.cpp WebCore/rendering/break_lines.cpp http://trac.webkit.org/changeset/64207 Change-Id: I34167b43899ee5066e33b40867cd569ce53f9207
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-0/+4
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859: Fix conflicts.Ben Murdoch2010-07-271-6/+2
| | | | | | | | | | | | html/HTMLCanvasElement.h due to http://trac.webkit.org/changeset/63502 html/HTMLLinkElement.cpp due to http://trac.webkit.org/changeset/63622 Android.mk and WebCore/Android.mk due to http://trac.webkit.org/changeset/63735 WebCore/page/Settings.cpp|h due to http://trac.webkit.org/changeset/63537 WebCore/page/EventHandler.cpp|h due to http://trac.webkit.org/changeset/63807 WebCore/Android.jscbindings.mk due to http://trac.webkit.org/changeset/63193 WebCore/platform/network/ResourceHandle.h due to http://trac.webkit.org/changeset/63332 Change-Id: I03c929b97550014373f044f56c248040b66118f0
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-0/+6
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-0/+1
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-3/+4
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* First draft to add a fat point to WebKit hit test.Grace Kloba2010-05-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | If padding is 0, it is the old style point hit test. If it finds a node, it will break the search loop and return. If padding is non-zero, the first node will be added to HitTestResult's innerNode as before. But instead of finishing the search, hit test will continue to look for other nodes covered by the fat point unless it is fully inside the current node. Here are some highlights of the changes. . instead of testing renderRect.contains(x, y), we now test renderRect.intersect(pointRect) . when a Node is hit, it will be appended to the rawNodeList of HitTestResult. So the order inside the rawNodeList represents the hit test order. Currently the fat point doesn't support SVG nodes. It also doesn't support overflow control yet.
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-3/+3
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-1/+15
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Only call plugin touch code if it is in full screenLeon Scroggins2010-03-091-15/+0
| | | | | | | | | | | | | mode or it is the document focused node. Remove Android special code added to support prevent default for double tap and long press. Long press and double tap needs to call preventDefault if it is needed. Remove Android special code added to pass event time. Need a separate CL for android_npapi.
* The element that receives the touch event should be the target element of ↵Ben Murdoch2010-03-011-1/+0
| | | | | | | | | | the touch that caused the event to be generated. Also build the touch target list based on the target element of the touch that caused the event to be generated. Landed to webkit as http://trac.webkit.org/changeset/55287 Change-Id: I4414b703a7b3e7c6ea6917be624ab9a7786e24a9
* Update touch handler in preparation for upstreaming of ↵Ben Murdoch2010-03-011-2/+1
| | | | | | | | m_originatingTouchTargets map. WebKit bug tracking is https://bugs.webkit.org/show_bug.cgi?id=34585 Landed to webkit as http://trac.webkit.org/changeset/55230 Change-Id: I68fa02615aec35c8c2d3e7c69e8479c33d66293c
* Co-ordinates of a TouchEvent object should be 0,0 to match the behavior on ↵Ben Murdoch2010-02-231-2/+0
| | | | | | | | iPhone. It is the co-ordinates of the Touch object wrapped up by a touch event that should update with motion. Update EventHandler::handleTouchEvent to match what landed to webkit in http://trac.webkit.org/changeset/55146 Change-Id: I91dfcfbbb53020b85f646bcf58eb4f3afd6be8e7
* Store the originating target for a touch (i.e. calculated in touchstart) in ↵Ben Murdoch2010-02-151-0/+8
| | | | | | | | a hash map, so that we can use that originating target as the target for future move/end/cancel events that that touch generates. This matches the behaviour that the iPhone exhibits. Change-Id: Iff5e29c795b8ae6128e67ad5d42a959b61f966f2
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-3/+5
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Fix final trivial mergesSteve Block2010-02-041-4/+0
| | | | Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
* Merge webkit.org at r54127 : Resolve conflicts for handleTouchEventSteve Block2010-02-041-5/+0
| | | | | | On Android, handleTouchEvent returns int, rather than bool. Change-Id: I8ba16342eac7ccca1c7df3fa36b52ca8192a69b5
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-0/+9
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-201-13/+20
| | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-6/+14
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Enable longpress and doubletap to WebKit as touchGrace Kloba2009-12-091-1/+10
| | | | event if it is requested.
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-201-3/+0
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-1/+48
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-3/+16
|
* Get WebKit r44544.Feng Qian2009-06-171-41/+23
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-4/+10
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-4/+3
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+364
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-364/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-7/+46
|
* external/webkit r30707Upstream1970-01-121-0/+325