bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when displaying html select popup (issue #1264). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1689 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-05-02 20:28:43 +00:00
parent 7f16f5fbd2
commit 5b4ed93abf
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patch/patches/renderer_host_1161.patch
View File

@ -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 (revision 263053)
+++ render_widget_host_view_aura.cc (working copy) +++ 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 // For non-opaque windows, we don't draw anything, since we depend on the
// canvas coming from the compositor to already be initialized as // canvas coming from the compositor to already be initialized as
// transparent. // transparent.
- if (window_->layer()->fills_bounds_opaquely()) - if (window_->layer()->fills_bounds_opaquely())
- canvas->DrawColor(SK_ColorWHITE); - canvas->DrawColor(SK_ColorWHITE);
+ if (window_->layer()->fills_bounds_opaquely()) { + if (window_->layer()->fills_bounds_opaquely()) {
+ canvas->DrawColor(GetContentClient()->browser()->GetBaseBackgroundColor( + if (host_->IsRenderView()) {
+ RenderViewHost::From(host_))); + canvas->DrawColor(GetContentClient()->browser()->GetBaseBackgroundColor(
+ RenderViewHost::From(host_)));
+ } else {
+ canvas->DrawColor(SK_ColorWHITE);
+ }
+ } + }
} }
} }