Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: ui/compositor/compositor.h

Issue 10832355: Prepare ui/compositor for WebLayer type change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/compositor/compositor.cc » ('j') | ui/compositor/layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index f598542ab36e1e0f4be0a9b552eaffea722d6c57..27b8dc370c331be131a4cc7b9883387cc743e4b2 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -7,6 +7,7 @@
#include "base/hash_tables.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
@@ -241,7 +242,11 @@ class COMPOSITOR_EXPORT Compositor
ObserverList<CompositorObserver> observer_list_;
gfx::AcceleratedWidget widget_;
+#if defined(WEBLAYER_IS_PURE_VIRTUAL)
+ scoped_ptr<WebKit::WebLayer> root_web_layer_;
+#else
WebKit::WebLayer root_web_layer_;
+#endif
WebKit::WebLayerTreeView host_;
// This is set to true when the swap buffers has been posted and we're waiting
« no previous file with comments | « no previous file | ui/compositor/compositor.cc » ('j') | ui/compositor/layer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698