summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderView.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Auto fixed element positioning fixTeng-Hui Zhu2011-01-251-27/+0
| | | | | | | | Webkit is using the transformation to compute the fixed element position. In order to simulate that, we need the Render Layer's position info. bug:3368857 Change-Id: If15c43f76bd528b2e67ac5035c8ba4a0c803e812
* Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-071-3/+10
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-061-25/+5
| | | | | | | 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-5/+25
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72272: Fix conflicts.Russell Brenner2010-12-021-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71802 WebCore/bindings/v8/V8Proxy.cpp http://trac.webkit.org/changeset/71735 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71767 http://trac.webkit.org/changeset/72116 (several APIs purged) WebCore/loader/ResourceLoader.cpp http://trac.webkit.org/changeset/71884 WebCore/platform/graphics/MediaPlayer.cpp http://trac.webkit.org/changeset/72117 WebCore/platform/image-decoders/ImageDecoder.cpp http://trac.webkit.org/changeset/72130 WebCore/rendering/RenderBlockLineLayout.cpp http://trac.webkit.org/changeset/72235 WebCore/rendering/RenderView.cpp http://trac.webkit.org/changeset/71851 Change-Id: If0a3466754b9755c1f4be97bf589f88c48eece0a
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-5/+12
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091-0/+5
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Fix compilation error when ANDROID_LAYOUT is not defined.Shimeng (Simon) Wang2010-11-051-1/+1
| | | | Change-Id: I6bdb9832bd94017a5f4a894474c30f2cea89d39d
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-0/+3
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Renamed variablesKristian Monsen2010-10-071-2/+2
| | | | | | | | | | | | | | 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-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12/+16
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-39/+32
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-161-1/+1
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-1/+1
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-9/+10
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-0/+1
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Fix issue: 2741016 and refactor visible width logic in android layout.Shimeng (Simon) Wang2010-07-121-2/+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 r61871: Initial merge by git.Kristian Monsen2010-07-021-2/+21
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-4/+3
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* 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 r59636: Initial merge by gitKristian Monsen2010-05-251-4/+9
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-10/+0
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-3/+38
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* When handling Fixed position, always relative toGrace Kloba2010-04-061-0/+27
| | | | | the top document. Fix http://b/issue?id=2281574
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-0/+11
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-7/+11
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-6/+8
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-2/+2
|
* Get WebKit r44544.Feng Qian2009-06-171-18/+18
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-73/+147
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-50/+94
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+588
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-588/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-36/+64
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+13
|
* external/webkit r30707Upstream1970-01-121-0/+547
generated by cgit v1.1 at 2025-06-02 03:36:50 +0000