diff options
| author | Ben Murdoch <benm@google.com> | 2011-09-27 10:22:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-27 10:22:51 -0700 |
| commit | f8d9975df6eb26307e824871067f148f0b692ee2 (patch) | |
| tree | 9b7d526b97839040ef9f66bccd862645f8df9ac5 | |
| parent | 53d8ef97560e64d50207a3ed70e9fc3528b9f7fc (diff) | |
| parent | 8e1e8cbc6e8a0b528bb1142a13d349a16d9659b3 (diff) | |
| download | external_webkit-f8d9975df6eb26307e824871067f148f0b692ee2.zip external_webkit-f8d9975df6eb26307e824871067f148f0b692ee2.tar.gz external_webkit-f8d9975df6eb26307e824871067f148f0b692ee2.tar.bz2 | |
Merge "Do not force "mobile" sites to use a viewport"
| -rw-r--r-- | Source/WebCore/html/HTMLBodyElement.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Source/WebCore/html/HTMLBodyElement.cpp b/Source/WebCore/html/HTMLBodyElement.cpp index 421e28e..5e6fd82 100644 --- a/Source/WebCore/html/HTMLBodyElement.cpp +++ b/Source/WebCore/html/HTMLBodyElement.cpp @@ -36,11 +36,6 @@ #include "HTMLParserIdioms.h" #include "ScriptEventListener.h" -#ifdef ANDROID_META_SUPPORT -#include "PlatformBridge.h" -#include "Settings.h" -#endif - namespace WebCore { using namespace HTMLNames; @@ -199,18 +194,6 @@ void HTMLBodyElement::insertedIntoDocument() setAttribute(marginheightAttr, String::number(marginHeight)); } -#ifdef ANDROID_META_SUPPORT - Settings * settings = document()->settings(); - if (settings) { - String host = document()->baseURI().host().lower(); - if (settings->viewportWidth() == -1 && (host.startsWith("m.") || host.startsWith("mobile.") - || host.startsWith("wap.") || host.contains(".m.") || host.contains(".mobile.") || host.contains(".wap."))) { - // fit mobile sites directly in the screen - document()->processViewport("width=device-width"); - } - } -#endif - // FIXME: This call to scheduleRelayout should not be needed here. // But without it we hang during WebKit tests; need to fix that and remove this. if (FrameView* view = document()->view()) |