summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering/RenderBlockLineLayout.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert change that caused text in floating divs to not reflow.Mangesh Ghiware2011-12-071-1/+1
| | | | | Bug: 5455817 (Text reflow not working in browser) Change-Id: I2a62a7fb4c7acde640cd87b8d0f03200b8f7fc2f
* Limit RTL text wrapping when having floating element.Shimeng (Simon) Wang2011-07-211-1/+1
| | | | | issue: 5047703 Change-Id: Ie7d9bb54649afb4d025d4ec02bcc42b52b4049d1
* Better way to determine not to reflow.Shimeng (Simon) Wang2011-06-231-2/+2
| | | | | | | | | Instead of using border which may be too broad, using whether an object is floating to fix flickr's reflow issue. Checked sites like slashdot.org and nytimes.com, this works better. issue: 4596265 Change-Id: Ic263b1e6fddedb47e410687ed04cd2ac7ccb7bed
* Do not reflow text if a div has border.Shimeng (Simon) Wang2011-06-231-1/+1
| | | | | | | | This also fixes the case where flickr header's position is not good since it's reflowed for issue 4596265. issue: 4596265 Change-Id: I8445ec408a813935871c5d011b23b70e569105d3
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-141-8/+8
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-280/+417
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-259/+343
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-125/+155
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-251-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Document.cpp Conflict due to AX object cache disabled on Android See http://trac.webkit.org/changeset/78314 - CachedResourceLoader.cpp/h Conflict due to ANDROID_BLOCK_NETWORK_IMAGE See http://trac.webkit.org/changeset/76701 - Source/WebCore/page/ChromeClient.h Conflict due to ANDROID_INSTALLABLE_WEB_APPS See http://trac.webkit.org/changeset/77509 - FrameView.cpp Conflict due to Android FrameView::updatePositionedObjects() See http://trac.webkit.org/changeset/77274 - ScrollView.h Conflict due to Android ScrollView::actualWidth/Height/ScrollX/ScrollY() See http://trac.webkit.org/changeset/76831 - TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp conflict due to Android stubbed out MIMETypeRegistry::getMIMETypeForExtension() See http://trac.webkit.org/changeset/77368 and https://android-git.corp.google.com/g/#change,37272 - ImageDecoder.cpp Conflict due to Android excluding code See http://trac.webkit.org/changeset/77427 - ImageDecoder.h Conflict due to ANDROID guard upstreamed as SKIA guard See http://trac.webkit.org/changeset/77946 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/76743 and http://trac.webkit.org/changeset/77286 - RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT See http://trac.webkit.org/changeset/77062 Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-55/+70
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231-0/+1
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+2244
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2024-08-30 01:57:27 +0000