diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-05-24 15:28:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-24 15:28:03 -0700 |
| commit | d1a57b82be498d8398b69bf1d4950fe7edd59327 (patch) | |
| tree | 13393a450364cc7151435e2e995923272e3c0a0e /Source/WebCore | |
| parent | 721b0d7e3e0a58ea9124bfc701612a39a23fc1ae (diff) | |
| parent | 70f9c23fc96ec055711830b2d666b56d0192404c (diff) | |
| download | external_webkit-d1a57b82be498d8398b69bf1d4950fe7edd59327.zip external_webkit-d1a57b82be498d8398b69bf1d4950fe7edd59327.tar.gz external_webkit-d1a57b82be498d8398b69bf1d4950fe7edd59327.tar.bz2 | |
Merge "Don't change website's content width."
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/rendering/RenderView.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/RenderView.cpp b/Source/WebCore/rendering/RenderView.cpp index 687ba85..cdd21fa 100644 --- a/Source/WebCore/rendering/RenderView.cpp +++ b/Source/WebCore/rendering/RenderView.cpp @@ -89,10 +89,6 @@ void RenderView::computeLogicalWidth() setLogicalWidth(viewLogicalWidth()); #ifdef ANDROID_LAYOUT setVisibleWidth(m_frameView->textWrapWidth()); - const Settings * settings = document()->settings(); - ASSERT(settings); - if (settings->useWideViewport() && settings->viewportWidth() == -1 && width() < minPreferredLogicalWidth()) - setWidth(m_minPreferredLogicalWidth); #endif } |