diff options
| author | Grace Kloba <> | 2009-03-24 17:43:55 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 17:43:55 -0700 |
| commit | 448f1de7e6191fb08e2bbd4751229bbb97df7e4a (patch) | |
| tree | 976186da937110753062090583aa5b35400bb381 | |
| parent | 9c6a7a336175b0e22b40c26e87160efb42831b3f (diff) | |
| download | external_webkit-448f1de7e6191fb08e2bbd4751229bbb97df7e4a.zip external_webkit-448f1de7e6191fb08e2bbd4751229bbb97df7e4a.tar.gz external_webkit-448f1de7e6191fb08e2bbd4751229bbb97df7e4a.tar.bz2 | |
Automated import from //branches/donutburger/...@140474,140474
| -rw-r--r-- | WebCore/rendering/bidi.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp index 212bf3c..accb326 100644 --- a/WebCore/rendering/bidi.cpp +++ b/WebCore/rendering/bidi.cpp @@ -903,8 +903,9 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintTop, i obj = obj->container(); } if (!isConstrained) { - int maxWidth = view()->frameView()->screenWidth() - 2 * ANDROID_FCTS_MARGIN_PADDING; - if (maxWidth > 0) { + int screenWidth = view()->frameView()->screenWidth(); + if (screenWidth > 0 && width() > screenWidth) { + int maxWidth = screenWidth - 2 * ANDROID_FCTS_MARGIN_PADDING; setWidth(min(width(), maxWidth)); m_minPrefWidth = min(m_minPrefWidth, maxWidth); m_maxPrefWidth = min(m_maxPrefWidth, maxWidth); |