diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2011-12-07 18:02:46 -0800 |
|---|---|---|
| committer | Mangesh Ghiware <mghiware@google.com> | 2011-12-07 18:02:46 -0800 |
| commit | 8ffb902ab85b3eb5e2fad95e38034d67e7e2e463 (patch) | |
| tree | ceab016fd5a596eb6b88d9ea8dbf7f82f5478e38 | |
| parent | 5b7927778dc52a2279927acdbef479ca994c843e (diff) | |
| download | external_webkit-8ffb902ab85b3eb5e2fad95e38034d67e7e2e463.zip external_webkit-8ffb902ab85b3eb5e2fad95e38034d67e7e2e463.tar.gz external_webkit-8ffb902ab85b3eb5e2fad95e38034d67e7e2e463.tar.bz2 | |
Revert change that caused text in floating divs to not reflow.
Bug: 5455817 (Text reflow not working in browser)
Change-Id: I2a62a7fb4c7acde640cd87b8d0f03200b8f7fc2f
| -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()) |