From 5b4ed93abf677552a4e76016bf1b005287ee9362 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 2 May 2014 20:28:43 +0000 Subject: [PATCH] Fix crash when displaying html select popup (issue #1264). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1689 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- patch/patches/renderer_host_1161.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/patch/patches/renderer_host_1161.patch b/patch/patches/renderer_host_1161.patch index f6c7b7aa3..05b39a5f1 100644 --- a/patch/patches/renderer_host_1161.patch +++ b/patch/patches/renderer_host_1161.patch @@ -93,15 +93,19 @@ Index: render_widget_host_view_aura.cc =================================================================== --- render_widget_host_view_aura.cc (revision 263053) +++ render_widget_host_view_aura.cc (working copy) -@@ -2284,8 +2284,10 @@ +@@ -2284,8 +2284,14 @@ // For non-opaque windows, we don't draw anything, since we depend on the // canvas coming from the compositor to already be initialized as // transparent. - if (window_->layer()->fills_bounds_opaquely()) - canvas->DrawColor(SK_ColorWHITE); + if (window_->layer()->fills_bounds_opaquely()) { -+ canvas->DrawColor(GetContentClient()->browser()->GetBaseBackgroundColor( -+ RenderViewHost::From(host_))); ++ if (host_->IsRenderView()) { ++ canvas->DrawColor(GetContentClient()->browser()->GetBaseBackgroundColor( ++ RenderViewHost::From(host_))); ++ } else { ++ canvas->DrawColor(SK_ColorWHITE); ++ } + } } }