summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderBlockLineLayout.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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 2024-09-10 15:51:57 +0000