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

Unified Diff: services/ui/gpu/display_compositor/compositor_frame_sink_factory_impl.h

Issue 2386763002: services/ui: Match naming in cc (and jellyfish branch) (Closed)
Patch Set: Removed bad change Created 4 years, 2 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 | services/ui/gpu/display_compositor/compositor_frame_sink_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/gpu/display_compositor/compositor_frame_sink_factory_impl.h
diff --git a/services/ui/gpu/display_compositor/compositor_frame_sink_factory_impl.h b/services/ui/gpu/display_compositor/compositor_frame_sink_factory_impl.h
index 96cbf3818234661102d2d25cbb4a2766463a126e..dfc6a011d61167a492e49ec5898bcd0f871b3c99 100644
--- a/services/ui/gpu/display_compositor/compositor_frame_sink_factory_impl.h
+++ b/services/ui/gpu/display_compositor/compositor_frame_sink_factory_impl.h
@@ -8,7 +8,7 @@
#include "cc/surfaces/surface_id_allocator.h"
#include "services/ui/gpu/display_compositor/compositor_frame_sink_delegate.h"
#include "services/ui/public/interfaces/gpu/display_compositor.mojom.h"
-#include "services/ui/surfaces/surfaces_state.h"
+#include "services/ui/surfaces/display_compositor.h"
namespace ui {
namespace gpu {
@@ -20,7 +20,7 @@ class CompositorFrameSinkFactoryImpl : public mojom::CompositorFrameSinkFactory,
public:
CompositorFrameSinkFactoryImpl(
uint32_t client_id,
- const scoped_refptr<SurfacesState>& surfaces_state);
+ const scoped_refptr<DisplayCompositor>& display_compositor);
~CompositorFrameSinkFactoryImpl() override;
uint32_t client_id() const { return client_id_; }
@@ -37,7 +37,7 @@ class CompositorFrameSinkFactoryImpl : public mojom::CompositorFrameSinkFactory,
private:
const uint32_t client_id_;
- scoped_refptr<SurfacesState> surfaces_state_;
+ scoped_refptr<DisplayCompositor> display_compositor_;
cc::SurfaceIdAllocator allocator_;
using CompositorFrameSinkMap =
std::map<uint32_t, std::unique_ptr<CompositorFrameSinkImpl>>;
« no previous file with comments | « no previous file | services/ui/gpu/display_compositor/compositor_frame_sink_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698