2 files changed, 5 insertions, 23 deletions

diff --git a/Source/WebCore/html/HTMLBodyElement.cpp b/Source/WebCore/html/HTMLBodyElement.cpp
index 9cf8730..0c93c95 100644
--- a/Source/WebCore/html/HTMLBodyElement.cpp
+++ b/Source/WebCore/html/HTMLBodyElement.cpp
@@ -206,13 +206,7 @@ void HTMLBodyElement::insertedIntoDocument()
         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
-            settings->setMetadataSettings("width", "device-width");
-            // update the meta data if it is the top document
-            if (!ownerElement) {
-                FrameView* view = document()->view();
-                if (view)
-                    PlatformBridge::updateViewport(view);
-            }
+            document()->processViewport("width=device-width");
         }
     }
 #endif
diff --git a/Source/WebCore/html/HTMLMetaElement.cpp b/Source/WebCore/html/HTMLMetaElement.cpp
index d8d9fb3..cb7f4c0 100644
--- a/Source/WebCore/html/HTMLMetaElement.cpp
+++ b/Source/WebCore/html/HTMLMetaElement.cpp
@@ -75,30 +75,18 @@ void HTMLMetaElement::process()
 {
     if (!inDocument() || m_content.isNull())
         return;
+    if (equalIgnoringCase(name(), "viewport"))
+        document()->processViewport(m_content);
 #ifdef ANDROID_META_SUPPORT
     // TODO: Evaluate whether to take upstreamed meta support
-    bool updateViewport = false;
-    if (equalIgnoringCase(name(), "viewport")) {
-        document()->processMetadataSettings(m_content);
-        updateViewport = true;
-    } else if (equalIgnoringCase(name(), "format-detection"))
+    else if (equalIgnoringCase(name(), "format-detection"))
         document()->processMetadataSettings(m_content);
     else if (((equalIgnoringCase(name(), "HandheldFriendly") && equalIgnoringCase(m_content, "true")) || equalIgnoringCase(name(), "MobileOptimized"))
         && document()->settings()
         && document()->settings()->viewportWidth() == -1) {
         // fit mobile sites directly in the screen
-        document()->settings()->setMetadataSettings("width", "device-width");
-        updateViewport = true;
+        document()->processViewport("width=device-width");
     }
-    // update the meta data if it is the top document
-    if (updateViewport && !document()->ownerElement()) {
-        FrameView* view = document()->view();
-        if (view)
-            PlatformBridge::updateViewport(view);
-    }
-#else
-    if (equalIgnoringCase(name(), "viewport"))
-        document()->processViewport(m_content);
 #endif
 
 #if ENABLE(ANDROID_INSTALLABLE_WEB_APPS)