content/browser/android/content_view_render_view.cc - Issue 11231017: Remove ::create factory functions from objects created via WebCompositorSupport

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/android/content_view_render_view.cc

Issue 11231017: Remove ::create factory functions from objects created via WebCompositorSupport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix includes Created 8 years, 1 month 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 | « chrome/browser/android/tab_base_android_impl.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/content_view_render_view.cc

diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc

index 1db4e6170516072cf955ea8c0b5d607af404f882..d2d3e2b74e94ccc4410d3c691f829eff11949ba1 100644

--- a/content/browser/android/content_view_render_view.cc

+++ b/content/browser/android/content_view_render_view.cc

@@ -15,6 +15,8 @@

#include "content/public/browser/android/content_view_layer_renderer.h"

#include "content/public/browser/android/draw_delegate.h"

#include "jni/ContentViewRenderView_jni.h"

+#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"

+#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h"

#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"

#include "ui/gfx/size.h"

@@ -90,7 +92,8 @@ void InitCompositor() {

g_global_state.Get().compositor.reset(

Compositor::Create(&g_global_state.Get().client));

DCHECK(!g_global_state.Get().root_layer.get());

- g_global_state.Get().root_layer.reset(WebKit::WebLayer::create());

+ g_global_state.Get().root_layer.reset(

+ WebKit::Platform::current()->compositorSupport()->createLayer());

g_global_state.Get().layer_renderer.reset(new ContentViewLayerRendererImpl());

}