Merge "Translucent background color support for webview"

1 files changed, 12 insertions, 3 deletions

diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 8f7efe2..540b1dd 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -871,16 +871,25 @@ BaseLayerAndroid* WebViewCore::createBaseLayer(SkRegion* region)
 
 #if USE(ACCELERATED_COMPOSITING)
     // We set the background color
+    Color background = Color::white;
     if (m_mainFrame && m_mainFrame->document()
         && m_mainFrame->document()->body()) {
+        bool hasCSSBackground = false;
+
         Document* document = m_mainFrame->document();
         RefPtr<RenderStyle> style = document->styleForElementIgnoringPendingStylesheets(document->body());
         if (style->hasBackground()) {
-            Color color = style->visitedDependentColor(CSSPropertyBackgroundColor);
-            if (color.isValid() && color.alpha() > 0)
-                base->setBackgroundColor(color);
+            background = style->visitedDependentColor(CSSPropertyBackgroundColor);
+            hasCSSBackground = true;
+        }
+
+        WebCore::FrameView* view = m_mainFrame->view();
+        if (view) {
+            Color viewBackground = view->baseBackgroundColor();
+            background = hasCSSBackground ? viewBackground.blend(background) : viewBackground;
         }
     }
+    base->setBackgroundColor(background);
 
     // We update the layers
     ChromeClientAndroid* chromeC = static_cast<ChromeClientAndroid*>(m_mainFrame->page()->chrome()->client());