summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/EllipsisBox.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-126/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-1/+1
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-4/+4
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r64523 : Fix conflicts due to ANDROID_HITTEST_WITHSIZESteve Block2010-08-091-19/+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/+8
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-1/+1
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-2/+2
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* First draft to add a fat point to WebKit hit test.Grace Kloba2010-05-241-0/+13
| | | | | | | | | | | | | | | | | | | | | | | 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.org at r58033 : Initial merge by gitSteve Block2010-05-111-2/+2
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-0/+43
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-4/+2
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-8/+9
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-5/+2
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+85
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-85/+0
|
* external/webkit r30707Upstream1970-01-121-0/+85