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

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

Issue 8432020: aura: Work around RenderWidgetHostTest.Background segfault. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 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
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 170d871e3bfb196f2c96f05bbdb364496037078e..9cdd057e07da6128d9dcab886181e7023a7f84c7 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -91,7 +91,7 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host)
RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
}
-void RenderWidgetHostViewAura::Init() {
+void RenderWidgetHostViewAura::InitAsChild() {
window_->Init(ui::Layer::LAYER_HAS_TEXTURE);
}
@@ -104,7 +104,7 @@ void RenderWidgetHostViewAura::InitAsPopup(
popup_parent_host_view_ =
static_cast<RenderWidgetHostViewAura*>(parent_host_view);
window_->SetType(aura::WINDOW_TYPE_MENU);
- Init();
+ window_->Init(ui::Layer::LAYER_HAS_TEXTURE);
window_->SetParent(NULL);
Show();
@@ -113,9 +113,9 @@ void RenderWidgetHostViewAura::InitAsPopup(
void RenderWidgetHostViewAura::InitAsFullscreen(
RenderWidgetHostView* reference_host_view) {
- window_->SetType(aura::WINDOW_TYPE_POPUP);
is_fullscreen_ = true;
- Init();
+ window_->SetType(aura::WINDOW_TYPE_POPUP);
+ window_->Init(ui::Layer::LAYER_HAS_TEXTURE);
window_->SetParent(NULL);
window_->Fullscreen();
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698