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

Unified Diff: cc/test/pixel_test_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
« no previous file with comments | « cc/test/pixel_test_output_surface.h ('k') | components/mus/surfaces/direct_output_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/pixel_test_output_surface.cc
diff --git a/cc/test/pixel_test_output_surface.cc b/cc/test/pixel_test_output_surface.cc
index 96ab60d1a2709a8fd4e0ad3acdf125bba6e107b9..b13b46d314307b2111f2b619b873d0a78133bb70 100644
--- a/cc/test/pixel_test_output_surface.cc
+++ b/cc/test/pixel_test_output_surface.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "cc/output/output_surface_client.h"
-#include "cc/scheduler/begin_frame_source.h"
#include "ui/gfx/transform.h"
namespace cc {
@@ -15,12 +14,10 @@ namespace cc {
PixelTestOutputSurface::PixelTestOutputSurface(
scoped_refptr<ContextProvider> context_provider,
scoped_refptr<ContextProvider> worker_context_provider,
- bool flipped_output_surface,
- std::unique_ptr<BeginFrameSource> begin_frame_source)
+ bool flipped_output_surface)
: OutputSurface(std::move(context_provider),
std::move(worker_context_provider),
nullptr),
- begin_frame_source_(std::move(begin_frame_source)),
external_stencil_test_(false) {
capabilities_.adjust_deadline_for_parent = false;
capabilities_.flipped_output_surface = flipped_output_surface;
@@ -28,33 +25,18 @@ PixelTestOutputSurface::PixelTestOutputSurface(
PixelTestOutputSurface::PixelTestOutputSurface(
scoped_refptr<ContextProvider> context_provider,
- bool flipped_output_surface,
- std::unique_ptr<BeginFrameSource> begin_frame_source)
+ bool flipped_output_surface)
: PixelTestOutputSurface(std::move(context_provider),
nullptr,
- flipped_output_surface,
- std::move(begin_frame_source)) {}
+ flipped_output_surface) {}
PixelTestOutputSurface::PixelTestOutputSurface(
- std::unique_ptr<SoftwareOutputDevice> software_device,
- std::unique_ptr<BeginFrameSource> begin_frame_source)
+ std::unique_ptr<SoftwareOutputDevice> software_device)
: OutputSurface(nullptr, nullptr, std::move(software_device)),
- begin_frame_source_(std::move(begin_frame_source)),
external_stencil_test_(false) {}
PixelTestOutputSurface::~PixelTestOutputSurface() {}
-bool PixelTestOutputSurface::BindToClient(OutputSurfaceClient* client) {
- if (!OutputSurface::BindToClient(client))
- return false;
-
- // TODO(enne): Once the renderer uses begin frame sources, this will
- // always be valid.
- if (begin_frame_source_)
- client->SetBeginFrameSource(begin_frame_source_.get());
- return true;
-}
-
void PixelTestOutputSurface::Reshape(const gfx::Size& size,
float scale_factor,
bool has_alpha) {
« no previous file with comments | « cc/test/pixel_test_output_surface.h ('k') | components/mus/surfaces/direct_output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698