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

Unified Diff: content/browser/renderer_host/compositor_impl_android.h

Issue 888783002: Composite to cc::Display from ui::InProcessContextFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: content/browser/renderer_host/compositor_impl_android.h
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index 9bffa4b13190f67fdf08c280c2dff1cff4061189..09c8b8a010e4241a62febd52ffb1389126c4b3d9 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -27,12 +27,12 @@ struct ANativeWindow;
namespace cc {
class Layer;
class LayerTreeHost;
+class OnscreenDisplayClient;
class SurfaceIdAllocator;
}
namespace content {
class CompositorClient;
-class OnscreenDisplayClient;
// -----------------------------------------------------------------------------
// Browser-side compositor that manages a tree of content and UI layers.
@@ -144,7 +144,7 @@ class CONTENT_EXPORT CompositorImpl
ui::UIResourceProvider ui_resource_provider_;
ui::ResourceManagerImpl resource_manager_;
- scoped_ptr<OnscreenDisplayClient> display_client_;
+ scoped_ptr<cc::OnscreenDisplayClient> display_client_;
scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
gfx::Size size_;

Powered by Google App Engine
This is Rietveld 408576698