Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(848)

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 2702153003: [content] Fix background color update handling in RWHVAura. (Closed)
Patch Set: add back static_casts since compile complains otherwise. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 5b47fbad932eeeef7c367c4b486ad33fdcb5ad88..02fdc8da37376d7d968c38160c306df7cdd51961 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -428,6 +428,7 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
is_in_vr_(false),
content_view_core_(nullptr),
ime_adapter_android_(this),
+ background_color_(SK_ColorWHITE),
cached_background_color_(SK_ColorWHITE),
last_compositor_frame_sink_id_(kUndefinedCompositorFrameSinkId),
gesture_provider_(ui::GetGestureProviderConfig(
@@ -914,11 +915,18 @@ void RenderWidgetHostViewAndroid::SetTooltipText(
}
void RenderWidgetHostViewAndroid::SetBackgroundColor(SkColor color) {
- RenderWidgetHostViewBase::SetBackgroundColor(color);
- host_->SetBackgroundOpaque(GetBackgroundOpaque());
+ background_color_ = color;
+
+ DCHECK(SkColorGetA(color) == SK_AlphaOPAQUE ||
+ SkColorGetA(color) == SK_AlphaTRANSPARENT);
+ host_->SetBackgroundOpaque(SkColorGetA(color) == SK_AlphaOPAQUE);
UpdateBackgroundColor(color);
}
+SkColor RenderWidgetHostViewAndroid::background_color() const {
+ return background_color_;
+}
+
void RenderWidgetHostViewAndroid::CopyFromCompositingSurface(
const gfx::Rect& src_subrect,
const gfx::Size& dst_size,

Powered by Google App Engine
This is Rietveld 408576698