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

Don't render the OSR parent view when a full-screen view is visible (issue #1694)

This commit is contained in:
Marshall Greenblatt 2015-08-20 12:28:48 -07:00
parent b543d3217d
commit 1999a3f237
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcef/browser/render_widget_host_view_osr.cc
View File

@ -518,6 +518,9 @@ void CefRenderWidgetHostViewOSR::InitAsChild(gfx::NativeView parent_view) {
parent_host_view_->set_child_host_view(this); parent_host_view_->set_child_host_view(this);
// The parent view should not render while the full-screen view exists.
parent_host_view_->Hide();
ResizeRootLayer(); ResizeRootLayer();
Show(); Show();
} }
@ -1422,12 +1425,16 @@ void CefRenderWidgetHostViewOSR::CancelWidget() {
} }
if (parent_host_view_) { if (parent_host_view_) {
if (parent_host_view_->popup_host_view_ == this) if (parent_host_view_->popup_host_view_ == this) {
parent_host_view_->set_popup_host_view(NULL); parent_host_view_->set_popup_host_view(NULL);
else if (parent_host_view_->child_host_view_ == this) } else if (parent_host_view_->child_host_view_ == this) {
parent_host_view_->set_child_host_view(NULL); parent_host_view_->set_child_host_view(NULL);
else
// Start rendering the parent view again.
parent_host_view_->Show();
} else {
parent_host_view_->RemoveGuestHostView(this); parent_host_view_->RemoveGuestHostView(this);
}
parent_host_view_ = NULL; parent_host_view_ = NULL;
} }