From 8e1e8cbc6e8a0b528bb1142a13d349a16d9659b3 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 26 Sep 2011 14:01:21 +0100 Subject: [PATCH] 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 --- Source/WebCore/html/HTMLBodyElement.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Source/WebCore/html/HTMLBodyElement.cpp b/Source/WebCore/html/HTMLBodyElement.cpp index 421e28eda..5e6fd82f9 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()) -- 2.11.0