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

Unified Diff: services/ui/public/cpp/compositor_frame_sink.h

Issue 2337913003: Fork cc::OutputSurface into cc::CompositorFrameSink. (Closed)
Patch Set: cfsfork: android-vulkan Created 4 years, 3 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 | « services/ui/public/cpp/BUILD.gn ('k') | services/ui/public/cpp/compositor_frame_sink.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/public/cpp/compositor_frame_sink.h
diff --git a/services/ui/public/cpp/output_surface.h b/services/ui/public/cpp/compositor_frame_sink.h
similarity index 60%
rename from services/ui/public/cpp/output_surface.h
rename to services/ui/public/cpp/compositor_frame_sink.h
index 02b86ee27dc8b888a02a929e7904242fd9d73ed3..68c38f705ef2a43c8ea1dd5e2e8a3c4f1fab344f 100644
--- a/services/ui/public/cpp/output_surface.h
+++ b/services/ui/public/cpp/compositor_frame_sink.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_UI_PUBLIC_CPP_OUTPUT_SURFACE_H_
-#define SERVICES_UI_PUBLIC_CPP_OUTPUT_SURFACE_H_
+#ifndef SERVICES_UI_PUBLIC_CPP_COMPOSITOR_FRAME_SINK_H_
+#define SERVICES_UI_PUBLIC_CPP_COMPOSITOR_FRAME_SINK_H_
#include "base/macros.h"
-#include "cc/output/output_surface.h"
+#include "cc/output/compositor_frame_sink.h"
#include "cc/scheduler/begin_frame_source.h"
#include "cc/surfaces/surface_id.h"
#include "mojo/public/cpp/bindings/binding.h"
@@ -19,15 +19,16 @@ class GpuChannelHost;
namespace ui {
-class OutputSurface : public cc::OutputSurface, public WindowSurfaceClient {
+class CompositorFrameSink : public cc::CompositorFrameSink,
+ public WindowSurfaceClient {
public:
- OutputSurface(scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
- std::unique_ptr<WindowSurface> surface);
- ~OutputSurface() override;
+ CompositorFrameSink(scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
+ std::unique_ptr<WindowSurface> surface);
+ ~CompositorFrameSink() override;
- // cc::OutputSurface implementation.
+ // cc::CompositorFrameSink implementation.
void SwapBuffers(cc::CompositorFrame frame) override;
- bool BindToClient(cc::OutputSurfaceClient* client) override;
+ bool BindToClient(cc::CompositorFrameSinkClient* client) override;
void DetachFromClient() override;
void BindFramebuffer() override;
uint32_t GetFramebufferCopyTextureFormat() override;
@@ -43,9 +44,9 @@ class OutputSurface : public cc::OutputSurface, public WindowSurfaceClient {
std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
std::unique_ptr<WindowSurface> surface_;
- DISALLOW_COPY_AND_ASSIGN(OutputSurface);
+ DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink);
};
} // namespace ui
-#endif // SERVICES_UI_PUBLIC_CPP_OUTPUT_SURFACE_H_
+#endif // SERVICES_UI_PUBLIC_CPP_COMPOSITOR_FRAME_SINK_H_
« no previous file with comments | « services/ui/public/cpp/BUILD.gn ('k') | services/ui/public/cpp/compositor_frame_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698