summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderBlock.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-35/+53
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-137/+137
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091-14/+12
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-526/+876
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-239/+238
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-277/+614
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-161-80/+84
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-8/+23
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-2/+2
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Use upstream version of ANDROID_HITTEST_WITHSIZESteve Block2010-08-271-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the last occurrences of ANDROID_HITTEST_WITHSIZE and updates WebKit to use the upstream version of this logic. This follows on from https://android-git.corp.google.com/g/#change,60166 which merged the upstream logic into the Android tree but maintained the existing behaviour for Android, guarded with ANDROID_HITTEST_WITHSIZE. This change introduces the following functional changes ... - HitTestResult::addNodeToRectBasedTestResult() The Android version proceeded with the containment test if the node is null. We now early out and continue the hit test. We also record the node's shadowAncestorNode, rather than the node itself. - RenderLayer::hitTestList() The android version always updates the result, but only updates the result layer if the result is not a rect based result. We now always update result layer, but only update the result if the result is not a rect based result. - RenderSVGRoot::nodeAtPoint() The Android version returned true only if it's not a rect based hit test. Now we return true always. - HitTestResult::m_isRectBased In the Android version, a padding must have positive width and height. Now we allow one of the two to be zero, provided the other is positive All other changes are non-functional and should probably have been done as part of https://android-git.corp.google.com/g/#change,60166 Note that the change to RenderBlock::nodeAtPoint() is a non-functional change because we don't pass a rect to addNodeToRectBasedTestResult(), so the default zero rect is used and the hit test always fails. Change-Id: I4163fddad59ad6485df40cd48794aa262f76ced7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-4/+4
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r64523 : Fix conflicts due to ANDROID_HITTEST_WITHSIZESteve Block2010-08-091-61/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+33
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-0/+5
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-12/+12
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Fix issue: 2741016 and refactor visible width logic in android layout.Shimeng (Simon) Wang2010-07-121-9/+1
| | | | | | | | | | | The site is not reflowed, because for some RenderBlock, the m_visibleWidth is set twice before layout; the current logic will think the visibleWidth is not changed, hence no relayout children and no reflow. The logic is refactored to to make it modularlized. issue: 2741016 Change-Id: I1f433e263add974c0981c332ad4ea092ddb395e0
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-8/+8
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-46/+294
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-83/+305
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-83/+86
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-35/+49
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* First draft to add a fat point to WebKit hit test.Grace Kloba2010-05-241-0/+36
| | | | | | | | | | | | | | | | | | | | | | | 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-5/+5
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-81/+101
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-0/+36
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* merge from open-source masterThe Android Open Source Project2010-04-021-4/+0
|\ | | | | | | Change-Id: I87473a9657b8906b4933a7e22bf1125a65e44502
| * Remove old code that was fixed in WebKit r35902Julien Chaffraix2010-03-301-4/+0
| | | | | | | | | | | | | | This code was based on WebKit r30711 which has now been integrated into Android (this fix was introduced in october 2008). Change-Id: I1faf6e611dfe226771ca8f28ee6a9e0cd80535ae
* | Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-42/+89
| | | | | | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* | Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* | Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-38/+100
| | | | | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* | am ffe27b58: Integrate WebKit security fix ↵Grace Kloba2009-11-171-7/+10
|\ \ | |/ | | | | | | | | | | | | | | http://trac.webkit.org/changeset/50466 Merge commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a' into eclair-mr2 * commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a': Integrate WebKit security fix
| * Integrate WebKit security fixGrace Kloba2009-11-171-7/+10
| | | | | | | | | | http://trac.webkit.org/changeset/50466 Fix http://b/issue?id=2268722
* | Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
* | Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-338/+235
|/ | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-51/+30
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-30/+51
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-63/+122
|
* Get WebKit r44544.Feng Qian2009-06-171-145/+172
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-482/+833
| | | | Automated import of CL 145796
* AI 144458: Remove our hack to prevent drawing the selection, and set our ↵Leon Scroggins2009-04-031-11/+0
| | | | | | selection color to transparent. This gets us the same result while simplifying the merge. Automated import of CL 144458
* Automated import from //branches/master/...@141440,141440Grace Kloba2009-03-241-0/+7
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-413/+438
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+4697
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-4697/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-374/+615
|
* Initial ContributionThe Android Open Source Project2008-10-211-31/+88
|
* external/webkit r30707Upstream1970-01-121-0/+4399
generated by cgit v1.1 at 2025-06-08 06:16:34 +0000