content/browser/web_contents/web_contents_view_aura.cc - Issue 23444051: Move the content-dependent RecreateLayer logic from aura::Window to RWHVA

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/web_contents/web_contents_view_aura.cc

Issue 23444051: Move the content-dependent RecreateLayer logic from aura::Window to RWHVA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix linux_aura Created 7 years, 3 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

« content/browser/renderer_host/render_widget_host_view_aura.cc ('K') | « content/browser/web_contents/web_contents_view_aura.h ('k') | ui/aura/demo/demo_main.cc » ('j') | ui/aura/window_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_view_aura.cc

diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc

index 13d14f7ecc87b1ce8ca140466d862c5da35e4529..47c7beab04f69802fc18e8672126f70f5cfad78d 100644

--- a/content/browser/web_contents/web_contents_view_aura.cc

+++ b/content/browser/web_contents/web_contents_view_aura.cc

@@ -1536,11 +1536,10 @@ bool WebContentsViewAura::HasHitTestMask() const {

void WebContentsViewAura::GetHitTestMask(gfx::Path* mask) const {

}

-scoped_refptr<ui::Texture> WebContentsViewAura::CopyTexture() {

- // The layer we create doesn't have an external texture, so this should never

- // get invoked.

- NOTREACHED();

- return scoped_refptr<ui::Texture>();

+void WebContentsViewAura::DidRecreateLayer(ui::Layer *old_layer,

+ ui::Layer *new_layer) {

+ // The layer we create doesn't have an external texture, so we don't need to

+ // do anything.

}

////////////////////////////////////////////////////////////////////////////////