summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderTable.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at Chromium 9.0.597.106: Initial merge by GitSteve Block2011-02-161-1/+3
| | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78455 on the 597 release branch. Change-Id: I72375d9b61a767449086f0c9dc4105b2a6b62ddc
* Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-161-0/+2
| | | | | | 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-2/+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/+2
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-6/+8
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r71558: Fix conflicts.Teng-Hui Zhu2010-11-171-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-143/+175
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-4/+8
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Renamed variablesKristian Monsen2010-10-071-5/+5
| | | | | | | | | | | | | | Changed m_minPrefWidth and m_maxPrefWidth to m_minPreferredLogicalWidth and m_maxPreferredLogicalWidth in this CL: http://trac.webkit.org/changeset/68276/trunk/WebCore/rendering/RenderBox.h This changed containerWidth to containerLogicalWidth http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp Also changed calcReplacedWidthUsing to computeReplacedWidthUsing here: http://trac.webkit.org/changeset/68239/trunk/WebCore/rendering/RenderBox.h Change-Id: I8eb912128aa5e09f55f4495671209cb8ca2ba3f0
* Merge Webkit at r68651 : Fix conflicts.Kristian Monsen2010-10-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChromeClient.h: Conflict due to ANDROID_INSTALLABLE_WEB_APPS http://trac.webkit.org/changeset/68031/trunk/WebCore/page/ChromeClient.h CSSParser.cpp: Conflict due to ANDROID_INSTRUMENT http://trac.webkit.org/changeset/68521/trunk/WebCore/css/CSSParser.cpp Node.cpp: Conflict due to ANDROID_DOM_LOGGING http://trac.webkit.org/changeset/68541/trunk/WebCore/dom/Node.cpp npapi.h: Conflicts due to various #ifdef ANDROID http://trac.webkit.org/changeset/68390/trunk/WebCore/bridge/npapi.h PlatformTouchEvent.h: PlatformTouchEventAndroid.cpp: PlatformTouchPoint.h: Conflicts due to new BREWMP code next to changed Android code Initial webkit CL: http://trac.webkit.org/changeset/68499 Later fix after merge revision, so cherry-picked: http://trac.webkit.org/changeset/69034 RenderBox.cpp: Several changes, conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68238#file2 http://trac.webkit.org/changeset/68239#file3 http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp The correct resolution here is unclear. A closer investiagtion by somebdoy more familiar with the code is tracked with b/3071198 RenderBox.h: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68417/trunk/WebCore/rendering/RenderBox.h RenderIFrame.cpp: Conflicts due to ANDROID_FLATTEN_IFRAME http://trac.webkit.org/changeset/68238/trunk/WebCore/rendering/RenderIFrame.cpp RenderTable.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68427/trunk/WebCore/rendering/RenderTable.cpp RenderView.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68436/trunk/WebCore/rendering/RenderView.cpp Settings.cpp: Settings.h: Conflicts due to ANDROID_PLUGINS and WEB_AUTOFILL http://trac.webkit.org/changeset/68166 Widget.cpp: http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.cpp Change-Id: I156f537ae0483b89e4c6b9fce0e7b2f931f957a2
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-16/+20
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Fix conflictsSteve Block2010-09-291-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace difference in config.h - http://trac.webkit.org/changeset/67323 - WebCore/config.h Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882 - WebCore/css/CSSComputedStyleDeclaration.cpp Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704 - WebCore/css/CSSParser.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667 - WebCore/css/CSSParser.cpp - WebCore/css/CSSStyleSelector.cpp Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292 - WebCore/dom/Document.cpp Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903 - WebCore/html/HTMLInputElement.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198 - WebCore/loader/DocumentLoader.cpp - WebCore/loader/FrameLoader.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253 - WebCore/loader/FrameLoader.cpp Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762 - WebCore/page/DOMWindow.cpp Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890 - WebCore/page/Settings.cpp - WebCore/page/Settings.h Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375 - WebCore/platform/MIMETypeRegistry.cpp Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325 - WebCore/plugins/PluginView.cpp Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBox.h - WebCore/rendering/RenderTable.cpp Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862 - WebCore/rendering/RenderTableCell.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667 - WebCore/rendering/style/RenderStyle.h Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c fix conflicts Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-0/+8
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-1/+1
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r64523 : Fix conflicts due to ANDROID_HITTEST_WITHSIZESteve Block2010-08-091-33/+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/+16
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-28/+14
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Fix issue: 2741016 and refactor visible width logic in android layout.Shimeng (Simon) Wang2010-07-121-12/+4
| | | | | | | | | | | 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-2/+2
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* 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
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-1/+1
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* First draft to add a fat point to WebKit hit test.Grace Kloba2010-05-241-0/+20
| | | | | | | | | | | | | | | | | | | | | | | 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-39/+57
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-0/+3
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-7/+7
| | | | | | | | | | | | | 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-39/+25
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-1/+20
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-20/+1
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-59/+44
|
* Get WebKit r44544.Feng Qian2009-06-171-26/+18
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-55/+90
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-52/+52
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+1205
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-1205/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-63/+91
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+72
|
* external/webkit r30707Upstream1970-01-121-0/+1105
generated by cgit v1.1 at 2025-06-02 14:58:45 +0000