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

Unified Diff: services/ui/gpu/gpu_service.cc

Issue 2881813002: Revert of gpu: GPU service scheduler. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « services/ui/gpu/gpu_service.h ('k') | services/ui/public/cpp/gpu/context_provider_command_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/gpu/gpu_service.cc
diff --git a/services/ui/gpu/gpu_service.cc b/services/ui/gpu/gpu_service.cc
index 0330a13c350e1b7dbd0cd64c058bd08bb9ccfcd6..146e54890d444ba693e980fc312e13b02f055098 100644
--- a/services/ui/gpu/gpu_service.cc
+++ b/services/ui/gpu/gpu_service.cc
@@ -14,7 +14,6 @@
#include "cc/output/in_process_context_provider.h"
#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
#include "gpu/command_buffer/service/gpu_switches.h"
-#include "gpu/command_buffer/service/scheduler.h"
#include "gpu/command_buffer/service/sync_point_manager.h"
#include "gpu/config/gpu_info_collector.h"
#include "gpu/config/gpu_switches.h"
@@ -97,6 +96,7 @@
gpu_workarounds_(base::CommandLine::ForCurrentProcess()),
gpu_info_(gpu_info),
gpu_feature_info_(gpu_feature_info),
+ sync_point_manager_(nullptr),
bindings_(base::MakeUnique<mojo::BindingSet<mojom::GpuService>>()),
weak_ptr_factory_(this) {
DCHECK(!io_runner_->BelongsToCurrentThread());
@@ -176,18 +176,13 @@
shutdown_event_ = owned_shutdown_event_.get();
}
- if (gpu_preferences_.enable_gpu_scheduler) {
- scheduler_ = base::MakeUnique<gpu::Scheduler>(
- base::ThreadTaskRunnerHandle::Get(), sync_point_manager_);
- }
-
// Defer creation of the render thread. This is to prevent it from handling
// IPC messages before the sandbox has been enabled and all other necessary
// initialization has succeeded.
gpu_channel_manager_.reset(new gpu::GpuChannelManager(
gpu_preferences_, gpu_workarounds_, this, watchdog_thread_.get(),
- base::ThreadTaskRunnerHandle::Get(), io_runner_, scheduler_.get(),
- sync_point_manager_, gpu_memory_buffer_factory_.get(), gpu_feature_info_,
+ base::ThreadTaskRunnerHandle::Get(), io_runner_, sync_point_manager_,
+ gpu_memory_buffer_factory_.get(), gpu_feature_info_,
std::move(activity_flags)));
media_gpu_channel_manager_.reset(
« no previous file with comments | « services/ui/gpu/gpu_service.h ('k') | services/ui/public/cpp/gpu/context_provider_command_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698