| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index 4df2d63833a4e8510865af3722c37c649bbede38..a735aff095f707f38d36f69c7fe8b78be89dc7c5 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -495,7 +495,7 @@ void RenderWidgetHostViewAura::InitAsChild(
|
| window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
|
| window_->Init(aura::WINDOW_LAYER_SOLID_COLOR);
|
| window_->SetName("RenderWidgetHostViewAura");
|
| - window_->layer()->SetColor(SK_ColorWHITE);
|
| + window_->layer()->SetColor(background_color_);
|
| }
|
|
|
| void RenderWidgetHostViewAura::InitAsPopup(
|
| @@ -524,7 +524,7 @@ void RenderWidgetHostViewAura::InitAsPopup(
|
| window_->SetType(ui::wm::WINDOW_TYPE_MENU);
|
| window_->Init(aura::WINDOW_LAYER_SOLID_COLOR);
|
| window_->SetName("RenderWidgetHostViewAura");
|
| - window_->layer()->SetColor(SK_ColorWHITE);
|
| + window_->layer()->SetColor(background_color_);
|
|
|
| // Setting the transient child allows for the popup to get mouse events when
|
| // in a system modal dialog. Do this before calling ParentWindowWithContext
|
| @@ -553,7 +553,7 @@ void RenderWidgetHostViewAura::InitAsFullscreen(
|
| window_->Init(aura::WINDOW_LAYER_SOLID_COLOR);
|
| window_->SetName("RenderWidgetHostViewAura");
|
| window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
|
| - window_->layer()->SetColor(SK_ColorWHITE);
|
| + window_->layer()->SetColor(background_color_);
|
|
|
| aura::Window* parent = NULL;
|
| gfx::Rect bounds;
|
| @@ -824,12 +824,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const {
|
| return window_->GetBoundsInScreen();
|
| }
|
|
|
| -void RenderWidgetHostViewAura::SetBackgroundOpaque(bool opaque) {
|
| - RenderWidgetHostViewBase::SetBackgroundOpaque(opaque);
|
| +void RenderWidgetHostViewAura::SetBackgroundColor(SkColor color) {
|
| + RenderWidgetHostViewBase::SetBackgroundColor(color);
|
| + bool opaque = GetBackgroundOpaque();
|
| host_->SetBackgroundOpaque(opaque);
|
| window_->layer()->SetFillsBoundsOpaquely(opaque);
|
| - SkColor background_color = opaque ? SK_ColorWHITE : SK_ColorTRANSPARENT;
|
| - window_->layer()->SetColor(background_color);
|
| + window_->layer()->SetColor(color);
|
| }
|
|
|
| gfx::Size RenderWidgetHostViewAura::GetVisibleViewportSize() const {
|
|
|