Merge "Support for getting the background color"

1 files changed, 15 insertions, 0 deletions

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 61bc159..236c07b 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -2527,6 +2527,19 @@ static void nativeSetExpandedTileBounds(JNIEnv*, jobject, jboolean enabled)
     TilesManager::instance()->setExpandedTileBounds(enabled);
 }
 
+static int nativeGetBackgroundColor(JNIEnv* env, jobject obj)
+{
+    WebView* view = GET_NATIVE_VIEW(env, obj);
+    BaseLayerAndroid* baseLayer = view->getBaseLayer();
+    if (baseLayer) {
+        WebCore::Color color = baseLayer->getBackgroundColor();
+        if (color.isValid())
+            return SkColorSetARGB(color.alpha(), color.red(),
+                                  color.green(), color.blue());
+    }
+    return SK_ColorWHITE;
+}
+
 /*
  * JNI registration
  */
@@ -2709,6 +2722,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeScrollLayer },
     { "nativeSetExpandedTileBounds", "(Z)V",
         (void*) nativeSetExpandedTileBounds },
+    { "nativeGetBackgroundColor", "()I",
+        (void*) nativeGetBackgroundColor },
 };
 
 int registerWebView(JNIEnv* env)