summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderBlockLineLayout.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Don't reflow if a RenderBlock has background color or image.Shimeng (Simon) Wang2011-01-061-1/+1
| | | | | issue: 3313826 Change-Id: Ic9c87880eb6f41f72319f72123cc21cc2fe623f0
* Merge WebKit at r72805: Use Node::parent() rather than Node::parentNode()Steve Block2011-01-061-2/+2
| | | | | | | | | | | | | | This is a revert of "Merge WebKit at r73109: use parentNode method." See http://trac.webkit.org/changeset/72825 This reverts commit 23aa22bb0c8bf0d91c99d21c5dca4c64a4825a87. 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: I5ba4d0976c3b87b32326fdc8e2eb1cffdd7541cf
* Merge WebKit at r73109: use parentNode method.Shimeng (Simon) Wang2010-12-221-2/+2
| | | | | | | | This is because of: http://trac.webkit.org/changeset/72825/trunk/WebCore/dom/Node.h which makes the parent method private. Change-Id: I706c4cbc4e69bee990f9e138aeb7ad2ed2a3d42f
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-221-1/+9
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72272: Fix conflicts.Russell Brenner2010-12-021-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-48/+28
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-1/+1
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091-1/+2
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-134/+208
| | | | 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 : Initial merge by git.Kristian Monsen2010-10-071-134/+69
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Fix conflictsSteve Block2010-09-291-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-17/+110
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-2/+2
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-121-6/+6
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-1/+1
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-7/+1
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-22/+90
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Fix for b/2786464Ben Murdoch2010-06-221-2/+3
| | | | | | | | Some renderobjects are "anonymous", i.e. have the document node associated with them and in this case the node() function returns null. We were then using the null RefPtr, hence the crash. RenderListMarker is an example of such an anonymous node which is why websites that use lists exposed the crash. Change-Id: I1a5527c42d99bbe8418b0e7bce4f3c245276e058
* Fix layout test crash: fast/replaced/frame-removed-during-resize.htmlBen Murdoch2010-06-181-0/+15
| | | | | | Fix b/2780565 Change-Id: I4956206dfbfaebd44414adaea7ab80e2c2fd4d1b
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-0/+1
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Code clean up, http://b/issue?id=2724743Grace Kloba2010-05-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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-10/+14
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-9/+14
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-316/+9
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-6/+28
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* No text wrapping in FitToScreen mode when text has background image.Shimeng (Simon) Wang2010-01-271-1/+3
| | | | | | Bug: 2225518 modified: WebCore/rendering/RenderBlockLineLayout.cpp
* Disable "fit to screen" if line height < font size.Shimeng (Simon) Wang2010-01-061-0/+5
| | | | | Bug: 2289376 modified: WebCore/rendering/RenderBlockLineLayout.cpp
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-2/+4
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* am a5605499: Changing fit column to screen to exclude the padding.Grace Kloba2009-11-111-11/+5
|\ | | | | | | | | | | | | Merge commit 'a56054997e46fcd04621cc67d650b6daf85f7b59' into eclair-mr2 * commit 'a56054997e46fcd04621cc67d650b6daf85f7b59': Changing fit column to screen to exclude the padding.
| * Changing fit column to screen to exclude the padding.Grace Kloba2009-11-101-11/+5
| | | | | | Fix http://b/issue?id=2253222
* | We were excluding device-width to fix http://b/issue?id=1331654.Grace Kloba2009-10-271-3/+2
| | | | | | | | | | | | | | | | | | But some mobile sites will have minimum pref width wider than the screen width, like in http://www.boygeniusreport.com/2009/10/23/motorola-droid-preview/. Now we are checking width() > screenWidth before wrapping at line 958, there is no need to exclude the device-width case. Remove the checking and both bugs should be fixed.
* | Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 : Update rendering to use new overflow methods.Steve Block2009-10-201-1/+7
| | | | | | | | | | | | See http://trac.webkit.org/changeset?new=47440 Change-Id: I140b6be130c1fb175c653f5ba2ba19fdc323bbc9
* | Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-34/+18
|/ | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Fix the paragraph is not wrapping with the new WK problem.Grace Kloba2009-08-211-0/+101
| | | | Copy the change from bidi.cpp to RenerBlockLineLayout.cpp as the file is renamed.
* Merge in WebKit r47029.Ben Murdoch2009-08-111-0/+2264
generated by cgit v1.1 at 2025-05-14 05:43:38 +0000