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

Unified Diff: content/browser/compositor/browser_compositor_output_surface.cc

Issue 2029323004: Get rid of virtual Display::CreateScheduler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@onscreendisplayclient
Patch Set: displaytest: unusedvar Created 4 years, 6 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/compositor/browser_compositor_output_surface.cc
diff --git a/content/browser/compositor/browser_compositor_output_surface.cc b/content/browser/compositor/browser_compositor_output_surface.cc
index 3fa2f9ecc1e74060ce796dc4ccd8692926ad932e..b5fbbcf6eb6f04b87ecba1107267c7bb05c2a384 100644
--- a/content/browser/compositor/browser_compositor_output_surface.cc
+++ b/content/browser/compositor/browser_compositor_output_surface.cc
@@ -13,7 +13,7 @@
#include "base/strings/string_number_conversions.h"
#include "cc/base/switches.h"
#include "cc/output/output_surface_client.h"
-#include "cc/scheduler/delay_based_time_source.h"
+#include "cc/scheduler/begin_frame_source.h"
#include "components/display_compositor/compositor_overlay_candidate_validator.h"
#include "content/browser/compositor/reflector_impl.h"
#include "content/common/gpu/client/context_provider_command_buffer.h"
@@ -23,13 +23,12 @@ namespace content {
BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
scoped_refptr<cc::ContextProvider> context_provider,
scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
- base::SingleThreadTaskRunner* task_runner,
+ cc::SyntheticBeginFrameSource* begin_frame_source,
std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
overlay_candidate_validator)
: OutputSurface(std::move(context_provider), nullptr, nullptr),
vsync_manager_(std::move(vsync_manager)),
- synthetic_begin_frame_source_(new cc::DelayBasedBeginFrameSource(
- base::MakeUnique<cc::DelayBasedTimeSource>(task_runner))),
+ synthetic_begin_frame_source_(begin_frame_source),
reflector_(nullptr),
use_begin_frame_scheduling_(
base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -41,11 +40,10 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
std::unique_ptr<cc::SoftwareOutputDevice> software_device,
const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
- base::SingleThreadTaskRunner* task_runner)
+ cc::SyntheticBeginFrameSource* begin_frame_source)
: OutputSurface(nullptr, nullptr, std::move(software_device)),
vsync_manager_(vsync_manager),
- synthetic_begin_frame_source_(new cc::DelayBasedBeginFrameSource(
- base::MakeUnique<cc::DelayBasedTimeSource>(task_runner))),
+ synthetic_begin_frame_source_(begin_frame_source),
reflector_(nullptr),
use_begin_frame_scheduling_(
base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -56,11 +54,10 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
- base::SingleThreadTaskRunner* task_runner)
+ cc::SyntheticBeginFrameSource* begin_frame_source)
: OutputSurface(std::move(vulkan_context_provider)),
vsync_manager_(vsync_manager),
- synthetic_begin_frame_source_(new cc::DelayBasedBeginFrameSource(
- base::MakeUnique<cc::DelayBasedTimeSource>(task_runner))),
+ synthetic_begin_frame_source_(begin_frame_source),
reflector_(nullptr) {
Initialize();
}
@@ -87,9 +84,6 @@ bool BrowserCompositorOutputSurface::BindToClient(
if (!OutputSurface::BindToClient(client))
return false;
- // Pass begin frame source up to Display to use for DisplayScheduler.
- client->SetBeginFrameSource(synthetic_begin_frame_source_.get());
-
// Don't want vsync notifications until there is a client.
if (!use_begin_frame_scheduling_)
vsync_manager_->AddObserver(this);

Powered by Google App Engine
This is Rietveld 408576698