diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-12 14:07:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 10:29:26 +0000 |
| commit | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (patch) | |
| tree | 25cde714b2b71eb639d1cd53f5a22e9ba76e14ef /chromium/cc/scheduler/scheduler.h | |
| parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
| download | qtwebengine-chromium-ec02ee4181c49b61fce1c8fb99292dbb8139cc90.tar.gz | |
BASELINE: Update Chromium to 59.0.3071.134
Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/cc/scheduler/scheduler.h')
| -rw-r--r-- | chromium/cc/scheduler/scheduler.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/cc/scheduler/scheduler.h b/chromium/cc/scheduler/scheduler.h index 81a0a345c41..9efd831d76a 100644 --- a/chromium/cc/scheduler/scheduler.h +++ b/chromium/cc/scheduler/scheduler.h @@ -12,7 +12,7 @@ #include "base/cancelable_callback.h" #include "base/macros.h" #include "base/time/time.h" -#include "cc/base/cc_export.h" +#include "cc/cc_export.h" #include "cc/output/begin_frame_args.h" #include "cc/scheduler/begin_frame_source.h" #include "cc/scheduler/begin_frame_tracker.h" @@ -152,6 +152,8 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase { return begin_frame_source_; } + BeginFrameAck CurrentBeginFrameAckForActiveTree() const; + protected: // Virtual for testing. virtual base::TimeTicks Now() const; @@ -204,7 +206,7 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase { bool IsBeginMainFrameSentOrStarted() const; void BeginImplFrameWithDeadline(const BeginFrameArgs& args); void BeginImplFrameSynchronous(const BeginFrameArgs& args); - void BeginImplFrame(const BeginFrameArgs& args); + void BeginImplFrame(const BeginFrameArgs& args, base::TimeTicks now); void FinishImplFrame(); enum BeginFrameResult { kBeginFrameSkipped, kBeginFrameFinished }; void SendBeginFrameAck(const BeginFrameArgs& args, BeginFrameResult result); |