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

Unified Diff: cc/scheduler/scheduler.h

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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/resources/task_graph_runner.cc ('k') | cc/scheduler/scheduler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler/scheduler.h
diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h
index 370ac25b6c4bf44a5f50db03c7147bae17192a92..8ed584a5d49a7c6492eeef1e37043c538e1d7ecd 100644
--- a/cc/scheduler/scheduler.h
+++ b/cc/scheduler/scheduler.h
@@ -11,8 +11,6 @@
#include "base/basictypes.h"
#include "base/cancelable_callback.h"
#include "base/memory/scoped_ptr.h"
-#include "base/power_monitor/power_monitor.h"
-#include "base/power_monitor/power_observer.h"
#include "base/time/time.h"
#include "cc/base/cc_export.h"
#include "cc/output/begin_frame_args.h"
@@ -75,22 +73,19 @@ class CC_EXPORT SchedulerFrameSourcesConstructor {
friend class Scheduler;
};
-class CC_EXPORT Scheduler : public BeginFrameObserverMixIn,
- public base::PowerObserver {
+class CC_EXPORT Scheduler : public BeginFrameObserverMixIn {
public:
static scoped_ptr<Scheduler> Create(
SchedulerClient* client,
const SchedulerSettings& scheduler_settings,
int layer_tree_host_id,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
- base::PowerMonitor* power_monitor,
scoped_ptr<BeginFrameSource> external_begin_frame_source) {
SchedulerFrameSourcesConstructor frame_sources_constructor;
return make_scoped_ptr(new Scheduler(client,
scheduler_settings,
layer_tree_host_id,
task_runner,
- power_monitor,
external_begin_frame_source.Pass(),
&frame_sources_constructor));
}
@@ -100,9 +95,6 @@ class CC_EXPORT Scheduler : public BeginFrameObserverMixIn,
// BeginFrameObserverMixin
bool OnBeginFrameMixInDelegate(const BeginFrameArgs& args) override;
- // base::PowerObserver method.
- void OnPowerStateChange(bool on_battery_power) override;
-
const SchedulerSettings& settings() const { return settings_; }
void CommitVSyncParameters(base::TimeTicks timebase,
@@ -179,7 +171,6 @@ class CC_EXPORT Scheduler : public BeginFrameObserverMixIn,
const SchedulerSettings& scheduler_settings,
int layer_tree_host_id,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
- base::PowerMonitor* power_monitor,
scoped_ptr<BeginFrameSource> external_begin_frame_source,
SchedulerFrameSourcesConstructor* frame_sources_constructor);
@@ -205,8 +196,6 @@ class CC_EXPORT Scheduler : public BeginFrameObserverMixIn,
int layer_tree_host_id_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
- base::PowerMonitor* power_monitor_;
-
base::TimeDelta estimated_parent_draw_time_;
std::deque<BeginFrameArgs> begin_retro_frame_args_;
@@ -243,8 +232,6 @@ class CC_EXPORT Scheduler : public BeginFrameObserverMixIn,
void OnBeginImplFrameDeadline();
void PollForAnticipatedDrawTriggers();
void PollToAdvanceCommitState();
- void SetupPowerMonitoring();
- void TeardownPowerMonitoring();
void UpdateActiveFrameSource();
base::TimeDelta EstimatedParentDrawTime() {
« no previous file with comments | « cc/resources/task_graph_runner.cc ('k') | cc/scheduler/scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698