diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-10-21 07:00:00 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-10-21 07:00:00 -0700 |
| commit | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (patch) | |
| tree | d49911209b132da58d838efa852daf28d516df21 /WebCore/rendering/RenderView.cpp | |
| parent | 87eb0cb35bad8784770ebc807e6c982432e47107 (diff) | |
| download | external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.zip external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.gz external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.bz2 | |
Initial Contribution
Diffstat (limited to 'WebCore/rendering/RenderView.cpp')
| -rw-r--r-- | WebCore/rendering/RenderView.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp index bd9c500..09ecacb 100644 --- a/WebCore/rendering/RenderView.cpp +++ b/WebCore/rendering/RenderView.cpp @@ -29,6 +29,11 @@ #include "GraphicsContext.h" #include "RenderLayer.h" +#ifdef ANDROID_LAYOUT +#include "Settings.h" +#include "WebCoreViewBridge.h" +#endif + namespace WebCore { RenderView::RenderView(Node* node, FrameView* view) @@ -79,6 +84,14 @@ void RenderView::calcWidth() { if (!printing() && m_frameView) m_width = m_frameView->visibleWidth(); +#ifdef ANDROID_LAYOUT + const Settings * settings = document()->settings(); + ASSERT(settings); + if (settings->layoutAlgorithm() == Settings::kLayoutFitColumnToScreen) + m_visibleWidth = m_frameView->getWebCoreViewBridge()->screenWidth(); + if (settings->useWideViewport() && settings->viewportWidth() == -1 && m_width < minPrefWidth()) + m_width = m_minPrefWidth; +#endif m_marginLeft = 0; m_marginRight = 0; } |