summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderTableSection.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-161-1/+3
| | | | | | http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-061-1/+0
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-221-0/+1
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-23/+32
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r71558: Fix conflicts.Teng-Hui Zhu2010-11-171-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/loader/FrameLoader.cpp http://trac.webkit.org/changeset/70960 http://trac.webkit.org/changeset/70971 WebCore/css/CSSStyleSelector.cpp http://trac.webkit.org/changeset/71218 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71218 WebCore/html/HTMLLinkElement.cpp http://trac.webkit.org/changeset/71159 WebCore/platform/android/PlatformBridge.h http://trac.webkit.org/changeset/71484 WebCore/platform/android/TemporaryLinkStubs.cpp http://trac.webkit.org/changeset/71484 WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/71382 http://trac.webkit.org/changeset/71251 WebCore/rendering/RenderLayer.cpp http://trac.webkit.org/changeset/71536 WebCore/rendering/RenderTable.cpp http://trac.webkit.org/changeset/71382 WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71515 WebCore/bindings/scripts/CodeGeneratorV8.pm http://trac.webkit.org/changeset/71227 http://trac.webkit.org/changeset/71230 Change-Id: I3ad8c6bc6e36c90aedebedf915a8614b2c786550
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-119/+123
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-18/+36
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-9/+9
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-13/+23
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-1/+1
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-30/+77
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r64523 : Fix conflicts due to ANDROID_HITTEST_WITHSIZESteve Block2010-08-091-14/+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 r64264 : Compile fix: CellStruct changed.Kristian Monsen2010-08-041-2/+2
| | | | | | http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.h Change-Id: I52787b9723791822d9c95ef52d7a81c23c2aeca7
* Merge Webkit at r64264 : Fix conflicts.Kristian Monsen2010-08-041-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-122/+150
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-1/+1
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Code clean up, http://b/issue?id=2724743Grace Kloba2010-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change Widget:screenWidth() to Widget:textWrapWidth() as the text wrap width may be different than the screen width after pinch zoom. Change AndroidWebHistoryBridge's m_screenWidthScale to m_textWrapScale to reflect its meaning. Remove unused screenWidth/screenHeight in PlatformBridge. Merge two restore methods to one. There is a matching CL in framework/base. Only setUseFixedLayout if layout width is different than screen width. Change from Node* to Ref<Node> to avoid a crash. Fix http://b/issue?id=2660396
* First draft to add a fat point to WebKit hit test.Grace Kloba2010-05-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | 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-32/+32
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-3/+2
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-5/+11
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Fix the crash in RenderTableSection for Small ScreenGrace Kloba2009-12-101-2/+7
| | | | | | | rendering. The code path was not exercised in the Browser and the crash was triggered by the WebKit integration. Fix http://b/issue?id=2285748
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-18/+19
| | | | | | | | | | | | | 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-16/+16
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-8/+8
|
* Get WebKit r44544.Feng Qian2009-06-171-10/+3
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-37/+91
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-77/+117
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+1181
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-1181/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-44/+28
|
* Initial ContributionThe Android Open Source Project2008-10-211-1/+120
|
* external/webkit r30707Upstream1970-01-121-0/+1078