diff options
Diffstat (limited to 'WebCore/rendering/RenderView.cpp')
| -rw-r--r-- | WebCore/rendering/RenderView.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp index 439ed76..d9cd152 100644 --- a/WebCore/rendering/RenderView.cpp +++ b/WebCore/rendering/RenderView.cpp @@ -85,8 +85,7 @@ void RenderView::computeLogicalHeight() void RenderView::computeLogicalWidth() { if (!printing() && m_frameView) -<<<<<<< HEAD - setWidth(viewWidth()); + setLogicalWidth(viewLogicalWidth()); #ifdef ANDROID_LAYOUT setVisibleWidth(m_frameView->textWrapWidth()); const Settings * settings = document()->settings(); @@ -94,11 +93,6 @@ void RenderView::computeLogicalWidth() if (settings->useWideViewport() && settings->viewportWidth() == -1 && width() < minPrefWidth()) setWidth(m_minPrefWidth); #endif - m_marginLeft = 0; - m_marginRight = 0; -======= - setLogicalWidth(viewLogicalWidth()); ->>>>>>> webkit.org at r68651 } void RenderView::computePreferredLogicalWidths() |