content/browser/renderer_host/render_widget_host_view_aura.cc - Issue 152913002: Merge 247881 "Fix windowed plugins not appearing if opened in th..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 152913002: Merge 247881 "Fix windowed plugins not appearing if opened in th..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1750/src/

Patch Set: Created 6 years, 11 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') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_aura.cc

===================================================================

--- content/browser/renderer_host/render_widget_host_view_aura.cc (revision 248504)

+++ content/browser/renderer_host/render_widget_host_view_aura.cc (working copy)

@@ -1337,15 +1337,16 @@

#if defined(OS_WIN)

void RenderWidgetHostViewAura::UpdateConstrainedWindowRects(

const std::vector<gfx::Rect>& rects) {

+ // Check this before setting constrained_rects_, so that next time they're set

+ // and we have a root window we don't early return.

+ if (!window_->GetDispatcher())

+ return;

if (rects == constrained_rects_)

return;

constrained_rects_ = rects;

- UpdateCutoutRects();

-void RenderWidgetHostViewAura::UpdateCutoutRects() {

- if (!window_->GetRootWindow())

- return;

HWND parent = window_->GetDispatcher()->host()->GetAcceleratedWidget();

CutoutRectsParams params;

params.widget = this;