[blink] Support (semi-)transparent background colors in WebView/Frame.

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
index 1520ff5c1370becdc77471eba821be9dd72a6fe3..13a93b4f86584f9a04c20231f6e0c2b6de677ebb 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -30,6 +30,7 @@
 
 #include "web/WebFrameWidgetImpl.h"
 
+#include <memory>

[lfg, 2017/03/23 16:05:21]

nit: blank line after

[Eric Seckler, 2017/03/23 16:34:49]

Done.

 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
@@ -53,6 +54,7 @@
 #include "platform/KeyboardCodes.h"
 #include "platform/WebFrameScheduler.h"
 #include "platform/animation/CompositorAnimationHost.h"
+#include "platform/graphics/Color.h"
 #include "platform/graphics/CompositorMutatorClient.h"
 #include "public/web/WebAutofillClient.h"
 #include "public/web/WebPlugin.h"
@@ -74,7 +76,6 @@
 #include "web/WebViewFrameWidget.h"
 #include "wtf/AutoReset.h"
 #include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
@@ -111,7 +112,10 @@ WebFrameWidgetImpl::WebFrameWidgetImpl(WebWidgetClient* client,
       m_isAcceleratedCompositingActive(false),
       m_layerTreeViewClosed(false),
       m_suppressNextKeypressEvent(false),
-      m_isTransparent(false),
+      m_backgroundColorOverrideEnabled(false),
+      m_backgroundColorOverride(Color::transparent),
+      m_baseBackgroundColorOverrideEnabled(false),
+      m_baseBackgroundColorOverride(Color::transparent),
       m_imeAcceptEvents(true),
       m_selfKeepAlive(this) {
   DCHECK(m_localRoot->frame()->isLocalRoot());
@@ -119,7 +123,7 @@ WebFrameWidgetImpl::WebFrameWidgetImpl(WebWidgetClient* client,
   m_localRoot->setFrameWidget(this);
 
   if (localRoot->parent())
-    setIsTransparent(true);
+    setBackgroundColorOverride(Color::transparent);
 }
 
 WebFrameWidgetImpl::~WebFrameWidgetImpl() {}
@@ -267,7 +271,8 @@ void WebFrameWidgetImpl::updateLayerTreeBackgroundColor() {
   if (!m_layerTreeView)
     return;
 
-  m_layerTreeView->setBackgroundColor(backgroundColor());
+  WebColor color = backgroundColor();
+  m_layerTreeView->setBackgroundColor(color);
 }
 
 void WebFrameWidgetImpl::updateLayerTreeDeviceScaleFactor() {
@@ -278,15 +283,26 @@ void WebFrameWidgetImpl::updateLayerTreeDeviceScaleFactor() {
   m_layerTreeView->setDeviceScaleFactor(deviceScaleFactor);
 }
 
-void WebFrameWidgetImpl::setIsTransparent(bool isTransparent) {
-  m_isTransparent = isTransparent;
+void WebFrameWidgetImpl::setBackgroundColorOverride(WebColor color) {
+  m_backgroundColorOverrideEnabled = true;
+  m_backgroundColorOverride = color;
+  updateLayerTreeBackgroundColor();
+}
 
-  if (m_layerTreeView)
-    m_layerTreeView->setHasTransparentBackground(isTransparent);
+void WebFrameWidgetImpl::clearBackgroundColorOverride() {
+  m_backgroundColorOverrideEnabled = false;
+  updateLayerTreeBackgroundColor();
 }
 
-bool WebFrameWidgetImpl::isTransparent() const {
-  return m_isTransparent;
+void WebFrameWidgetImpl::setBaseBackgroundColorOverride(WebColor color) {
+  m_baseBackgroundColorOverrideEnabled = true;
+  m_baseBackgroundColorOverride = color;
+  updateBaseBackgroundColor();
+}
+
+void WebFrameWidgetImpl::clearBaseBackgroundColorOverride() {
+  m_baseBackgroundColorOverrideEnabled = false;
+  updateBaseBackgroundColor();
 }
 
 void WebFrameWidgetImpl::layoutAndPaintAsync(
@@ -401,13 +417,21 @@ bool WebFrameWidgetImpl::hasTouchEventHandlersAt(const WebPoint& point) {
   return true;
 }
 
+Color WebFrameWidgetImpl::baseBackgroundColor() const {
+  return m_baseBackgroundColorOverrideEnabled ? m_baseBackgroundColorOverride
+                                              : m_baseBackgroundColor;
+}
+
 void WebFrameWidgetImpl::setBaseBackgroundColor(WebColor color) {
   if (m_baseBackgroundColor == color)
     return;
 
   m_baseBackgroundColor = color;
+  updateBaseBackgroundColor();
+}
 
-  m_localRoot->frameView()->setBaseBackgroundColor(color);
+void WebFrameWidgetImpl::updateBaseBackgroundColor() {
+  m_localRoot->frameView()->setBaseBackgroundColor(baseBackgroundColor());
 }
 
 WebInputMethodControllerImpl*
@@ -531,8 +555,8 @@ WebRange WebFrameWidgetImpl::compositionRange() {
 }
 
 WebColor WebFrameWidgetImpl::backgroundColor() const {
-  if (isTransparent())
-    return Color::transparent;
+  if (m_backgroundColorOverrideEnabled)
+    return m_backgroundColorOverride;
   if (!m_localRoot->frameView())
     return m_baseBackgroundColor;
   FrameView* view = m_localRoot->frameView();
@@ -1035,7 +1059,6 @@ void WebFrameWidgetImpl::setIsAcceleratedCompositingActive(bool active) {
     m_layerTreeView->setVisible(page()->isPageVisible());
     updateLayerTreeDeviceScaleFactor();
     updateLayerTreeBackgroundColor();
-    m_layerTreeView->setHasTransparentBackground(isTransparent());
     updateLayerTreeViewport();
     m_isAcceleratedCompositingActive = true;
   }