ui/compositor/compositor.h - Issue 10873052: Add ifdef guards to prepare for WebLayerTreeView interface change

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: ui/compositor/compositor.h

Issue 10873052: Add ifdef guards to prepare for WebLayerTreeView interface change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 8 years, 4 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:

Index: ui/compositor/compositor.h

diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h

index 0b83262437149e22104c17ba7a47c0c2a3554d03..619393b9dba4aa6fa3bca913fbed40aef0d18629 100644

--- a/ui/compositor/compositor.h

+++ b/ui/compositor/compositor.h

@@ -241,7 +241,11 @@ class COMPOSITOR_EXPORT Compositor

gfx::AcceleratedWidget widget_;

scoped_ptr<WebKit::WebLayer> root_web_layer_;

+#if defined(WEBLAYERTREEVIEW_IS_PURE_VIRTUAL)

+ scoped_ptr<WebKit::WebLayerTreeView> host_;

+#else

WebKit::WebLayerTreeView host_;

+#endif

// This is set to true when the swap buffers has been posted and we're waiting

// for completion.

« no previous file with comments | « no previous file | ui/compositor/compositor.cc » ('j') | no next file with comments »