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

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

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.cc
diff --git a/components/mus/surfaces/direct_output_surface_ozone.cc b/components/mus/surfaces/direct_output_surface_ozone.cc
index bf28be848ca78cf2b7dcc68a15e8bfada551a621..a0a7e8b86ad2184694d02380445f726f9b2957f3 100644
--- a/components/mus/surfaces/direct_output_surface_ozone.cc
+++ b/components/mus/surfaces/direct_output_surface_ozone.cc
@@ -10,6 +10,7 @@
#include "cc/output/compositor_frame.h"
#include "cc/output/context_provider.h"
#include "cc/output/output_surface_client.h"
+#include "cc/scheduler/begin_frame_source.h"
#include "components/display_compositor/buffer_queue.h"
#include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h"
#include "components/mus/surfaces/surfaces_context_provider.h"
@@ -23,7 +24,7 @@ namespace mus {
DirectOutputSurfaceOzone::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)
: cc::OutputSurface(context_provider, nullptr, nullptr),
@@ -35,9 +36,7 @@ DirectOutputSurfaceOzone::DirectOutputSurfaceOzone(
&gl_helper_,
&gpu_memory_buffer_manager_,
widget)),
- synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(
- task_runner,
- cc::BeginFrameArgs::DefaultInterval())),
+ synthetic_begin_frame_source_(synthetic_begin_frame_source),
weak_ptr_factory_(this) {
capabilities_.uses_default_gl_framebuffer = false;
capabilities_.flipped_output_surface = true;
@@ -100,8 +99,6 @@ bool DirectOutputSurfaceOzone::BindToClient(cc::OutputSurfaceClient* client) {
if (!cc::OutputSurface::BindToClient(client))
return false;
- client->SetBeginFrameSource(synthetic_begin_frame_source_.get());
-
if (capabilities_.uses_default_gl_framebuffer) {
capabilities_.flipped_output_surface =
context_provider()->ContextCapabilities().flips_vertically;

Powered by Google App Engine
This is Rietveld 408576698