diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-14 18:57:58 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-01-14 18:57:58 -0800 |
| commit | e32bb87640c16f2414a3f35cefd3c4146a174091 (patch) | |
| tree | 05b0f57485f0079620882195380bd758e8af59e9 /WebCore/rendering | |
| parent | 9f20cbf56188e83d4a3a631aba9607697ebac6c0 (diff) | |
| download | external_webkit-e32bb87640c16f2414a3f35cefd3c4146a174091.zip external_webkit-e32bb87640c16f2414a3f35cefd3c4146a174091.tar.gz external_webkit-e32bb87640c16f2414a3f35cefd3c4146a174091.tar.bz2 | |
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
Diffstat (limited to 'WebCore/rendering')
| -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(); |