diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2011-12-07 18:21:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-07 18:21:50 -0800 |
| commit | e50c6da15806ff91b5e9298cb303f2b8f9ae6b35 (patch) | |
| tree | 5c251360e97361af0ab8f21cc77c5bcf01f56fd6 /Source | |
| parent | c00fdf0b571ebaa5ded52f4eade28e12beea36d2 (diff) | |
| parent | 8ffb902ab85b3eb5e2fad95e38034d67e7e2e463 (diff) | |
| download | external_webkit-e50c6da15806ff91b5e9298cb303f2b8f9ae6b35.zip external_webkit-e50c6da15806ff91b5e9298cb303f2b8f9ae6b35.tar.gz external_webkit-e50c6da15806ff91b5e9298cb303f2b8f9ae6b35.tar.bz2 | |
Merge "Revert change that caused text in floating divs to not reflow." into ics-mr1
Diffstat (limited to 'Source')
| -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()) |