diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2011-12-07 19:03:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 19:03:21 -0800 |
| commit | 46ded0d896cca693053fe2459c1930de95b65cd9 (patch) | |
| tree | b5c308cf70f72aed6e277e1f7ff70166a5422498 /Source/WebCore | |
| parent | 99788a87ecfeaf04e4482dd0e540851ee4986e8d (diff) | |
| parent | e50c6da15806ff91b5e9298cb303f2b8f9ae6b35 (diff) | |
| download | external_webkit-46ded0d896cca693053fe2459c1930de95b65cd9.zip external_webkit-46ded0d896cca693053fe2459c1930de95b65cd9.tar.gz external_webkit-46ded0d896cca693053fe2459c1930de95b65cd9.tar.bz2 | |
am e50c6da1: Merge "Revert change that caused text in floating divs to not reflow." into ics-mr1
* commit 'e50c6da15806ff91b5e9298cb303f2b8f9ae6b35':
Revert change that caused text in floating divs to not reflow.
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/rendering/RenderBlockLineLayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp index d4e2aa3..df20063 100644 --- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp @@ -812,7 +812,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica else { #ifdef ANDROID_LAYOUT // ignore text wrap for textField or menuList - if (doTextWrap && (o->isTextField() || o->isMenuList() || o->isFloating())) + if (doTextWrap && (o->isTextField() || o->isMenuList())) doTextWrap = false; #endif if (o->isFloating()) |