diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-14 19:31:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-14 19:31:12 -0800 |
| commit | db0b7b5024daa8b5481127282f6673b74f9aa77a (patch) | |
| tree | f2206e8ad85cdf8f42d7e2682b099b9f52d6e3c8 | |
| parent | 91d051d3b4235037e28c5a250dcebc21cc204694 (diff) | |
| parent | e32bb87640c16f2414a3f35cefd3c4146a174091 (diff) | |
| download | external_webkit-db0b7b5024daa8b5481127282f6673b74f9aa77a.zip external_webkit-db0b7b5024daa8b5481127282f6673b74f9aa77a.tar.gz external_webkit-db0b7b5024daa8b5481127282f6673b74f9aa77a.tar.bz2 | |
am e32bb876: Revert https://android-git.corp.google.com/g/37444 as https://android-git.corp.google.com/g/37486 is a better fix for http://b/issue?id=2375232
Merge commit 'e32bb87640c16f2414a3f35cefd3c4146a174091' into eclair-plus-aosp
* commit 'e32bb87640c16f2414a3f35cefd3c4146a174091':
Revert https://android-git.corp.google.com/g/37444
| -rw-r--r-- | WebCore/rendering/RenderBlockLineLayout.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp index cc0fc58..615a369 100644 --- a/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/WebCore/rendering/RenderBlockLineLayout.cpp @@ -40,7 +40,6 @@ #include "Settings.h" #include "Text.h" #include "HTMLNames.h" -#include "WebViewCore.h" #endif // ANDROID_LAYOUT using namespace std; @@ -862,10 +861,8 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintTop, i // will wrap text around screen width so that it doesn't need to scroll // horizontally when reading a paragraph. const Settings* settings = document()->settings(); - android::WebViewCore* core = android::WebViewCore::getWebViewCore(view()->frameView()); - bool doTextWrap = settings && (settings->viewportWidth() != 0 - || fabs(core->scale() - core->screenWidthScale()) > 0.01) - && settings->layoutAlgorithm() == Settings::kLayoutFitColumnToScreen; + bool doTextWrap = settings && settings->viewportWidth() != 0 && + settings->layoutAlgorithm() == Settings::kLayoutFitColumnToScreen; if (doTextWrap) { int ta = style()->textAlign(); int dir = style()->direction(); |