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

Unified Diff: components/mus/surfaces/direct_output_surface_ozone.h

Issue 2029323004: Get rid of virtual Display::CreateScheduler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@onscreendisplayclient
Patch Set: displaytest: androids Created 4 years, 7 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: components/mus/surfaces/direct_output_surface_ozone.h
diff --git a/components/mus/surfaces/direct_output_surface_ozone.h b/components/mus/surfaces/direct_output_surface_ozone.h
index f47725aa0194833840a91d1cd5641264296fe8c2..c083e704948dcca15282bda6c6bea2c3e6c8f0e0 100644
--- a/components/mus/surfaces/direct_output_surface_ozone.h
+++ b/components/mus/surfaces/direct_output_surface_ozone.h
@@ -10,7 +10,6 @@
#include "base/memory/weak_ptr.h"
#include "cc/output/context_provider.h"
#include "cc/output/output_surface.h"
-#include "cc/scheduler/begin_frame_source.h"
#include "components/display_compositor/gl_helper.h"
#include "components/mus/surfaces/ozone_gpu_memory_buffer_manager.h"
#include "ui/gfx/geometry/size.h"
@@ -28,6 +27,7 @@ class LatencyInfo;
namespace cc {
class CompositorFrame;
+class SyntheticBeginFrameSource;
} // namespace cc
namespace mus {
@@ -43,12 +43,16 @@ class DirectOutputSurfaceOzone : public cc::OutputSurface {
DirectOutputSurfaceOzone(
scoped_refptr<SurfacesContextProvider> context_provider,
gfx::AcceleratedWidget widget,
- base::SingleThreadTaskRunner* task_runner,
+ cc::SyntheticBeginFrameSource* synthetic_begin_frame_source,
uint32_t target,
uint32_t internalformat);
~DirectOutputSurfaceOzone() override;
+ cc::BeginFrameSource* GetBeginFrameSource() {
+ return synthetic_begin_frame_source_.get();
+ }
+
// TODO(rjkroege): Implement the equivalent of Reflector.
private:
@@ -70,7 +74,7 @@ class DirectOutputSurfaceOzone : public cc::OutputSurface {
display_compositor::GLHelper gl_helper_;
OzoneGpuMemoryBufferManager gpu_memory_buffer_manager_;
std::unique_ptr<display_compositor::BufferQueue> buffer_queue_;
- std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
+ cc::SyntheticBeginFrameSource* const synthetic_begin_frame_source_;
base::WeakPtrFactory<DirectOutputSurfaceOzone> weak_ptr_factory_;
};

Powered by Google App Engine
This is Rietveld 408576698