commit 9f20cbf56188e83d4a3a631aba9607697ebac6c0
author Grace Kloba <klobag@google.com> Thu Jan 14 16:22:56 2010 -0800
committer Grace Kloba <klobag@google.com> Thu Jan 14 16:22:56 2010 -0800
tree ece966f5cba7896f70ffc18d7550304ff1e56931
parent f48712a096831a3b85a5e18dabd44a541f6b4712

For mobile site, allow text wrap to screen if scale
is not same as screen width scale.

Fix http://b/issue?id=2375232

WebCore/rendering/RenderBlockLineLayout.cpp

diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp
index 615a369..cc0fc58 100644
--- a/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -40,6 +40,7 @@
 #include "Settings.h"
 #include "Text.h"
 #include "HTMLNames.h"
+#include "WebViewCore.h"
 #endif // ANDROID_LAYOUT
 
 using namespace std;
@@ -861,8 +862,10 @@
         // will wrap text around screen width so that it doesn't need to scroll
         // horizontally when reading a paragraph.
         const Settings* settings = document()->settings();
-        bool doTextWrap = settings && settings->viewportWidth() != 0 &&
-                settings->layoutAlgorithm() == Settings::kLayoutFitColumnToScreen;
+        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;
         if (doTextWrap) {
             int ta = style()->textAlign();
             int dir = style()->direction();