summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-09-26 14:01:21 +0100
committerBen Murdoch <benm@google.com>2011-09-26 14:01:21 +0100
commit8e1e8cbc6e8a0b528bb1142a13d349a16d9659b3 (patch)
treec5ee64fe674bf0a02f87317f35eaed575e7ef9dc
parent64df20b404601e03242b00707d8d2cd299e893d1 (diff)
downloadexternal_webkit-8e1e8cbc6e8a0b528bb1142a13d349a16d9659b3.zip
external_webkit-8e1e8cbc6e8a0b528bb1142a13d349a16d9659b3.tar.gz
external_webkit-8e1e8cbc6e8a0b528bb1142a13d349a16d9659b3.tar.bz2
Do not force "mobile" sites to use a viewport
Remove some old code for detecting mobile sites and forcing them to use a mobil viewport. This broke some websites, e.g. Wikipedia. Bug: 5371421 Change-Id: Icb93a1345f24d77d23b783fc965558a11135037a
-rw-r--r--Source/WebCore/html/HTMLBodyElement.cpp17
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())