Fix a WebCore/WebKit layering violation

Move the call to WebViewCore::updateViewport() from HTMLBodyElement
and HTMLMetaElement to the PlatformBridge so that WebCore code does
not depend on WebKit code to compile.

In addition to being a layering violation, the inclusion of
WebViewCore.h includes WebCoreJni.h, which in a future change
causes LOG to get #undefined when using the chromium net stack.

Change-Id: I1a9fd0b545080c9c0d9d26a3e5eb3b986c3986eb

diff --git a/WebCore/html/HTMLBodyElement.cpp b/WebCore/html/HTMLBodyElement.cpp
index 05c13ac..60126f7 100644 (file)
--- a/WebCore/html/HTMLBodyElement.cpp
+++ b/WebCore/html/HTMLBodyElement.cpp
@@ -36,8 +36,8 @@
 #include "ScriptEventListener.h"
 
 #ifdef ANDROID_META_SUPPORT
+#include "PlatformBridge.h"
 #include "Settings.h"
-#include "WebViewCore.h"
 #endif
 
 namespace WebCore {
@@ -208,7 +208,7 @@ void HTMLBodyElement::insertedIntoDocument()
             if (!ownerElement) {
                 FrameView* view = document()->view();
                 if (view)
-                    android::WebViewCore::getWebViewCore(view)->updateViewport();
+                    PlatformBridge::updateViewport(view);
             }
         }
     }

diff --git a/WebCore/html/HTMLMetaElement.cpp b/WebCore/html/HTMLMetaElement.cpp
index cdb9950..520b9ae 100644 (file)
--- a/WebCore/html/HTMLMetaElement.cpp
+++ b/WebCore/html/HTMLMetaElement.cpp
@@ -28,8 +28,8 @@
 #include "HTMLNames.h"
 
 #ifdef ANDROID_META_SUPPORT
+#include "PlatformBridge.h"
 #include "Settings.h"
-#include "WebViewCore.h"
 #endif
 
 #if ENABLE(ANDROID_INSTALLABLE_WEB_APPS)
@@ -95,7 +95,7 @@ void HTMLMetaElement::process()
     if (updateViewport && !document()->ownerElement()) {
         FrameView* view = document()->view();
         if (view)
-            android::WebViewCore::getWebViewCore(view)->updateViewport();
+            PlatformBridge::updateViewport(view);
     }
 #else
     if (equalIgnoringCase(name(), "viewport"))

diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index bdab26c..948847a 100644 (file)
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -130,6 +130,9 @@ public:
 
     static int screenDepth();
     static FloatRect screenRect();
+
+    // Update the viewport meta data.
+    static void updateViewport(FrameView*);
 };
 
 }

diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index d959cf3..9d28a57 100644 (file)
--- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -160,6 +160,12 @@ FloatRect PlatformBridge::screenRect()
     return FloatRect(0.0, 0.0, info.w, info.h);
 }
 
+void PlatformBridge::updateViewport(FrameView* frameView)
+{
+    android::WebViewCore* webViewCore = android::WebViewCore::getWebViewCore(frameView);
+    webViewCore->updateViewport();
+}
+
 }  // namespace WebCore