summaryrefslogtreecommitdiffstats
path: root/chromium/cc/layers/deadline_policy.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 10:20:33 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 10:28:57 +0000
commitd17ea114e5ef69ad5d5d7413280a13e6428098aa (patch)
tree2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/cc/layers/deadline_policy.h
parent8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff)
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/cc/layers/deadline_policy.h')
-rw-r--r--chromium/cc/layers/deadline_policy.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/chromium/cc/layers/deadline_policy.h b/chromium/cc/layers/deadline_policy.h
index a5dd80311fb..156c6df9432 100644
--- a/chromium/cc/layers/deadline_policy.h
+++ b/chromium/cc/layers/deadline_policy.h
@@ -18,7 +18,8 @@ class CC_EXPORT DeadlinePolicy {
enum Type {
kUseExistingDeadline,
kUseDefaultDeadline,
- kUseSpecifiedDeadline
+ kUseSpecifiedDeadline,
+ kUseInfiniteDeadline
};
static DeadlinePolicy UseExistingDeadline();
@@ -27,6 +28,8 @@ class CC_EXPORT DeadlinePolicy {
static DeadlinePolicy UseSpecifiedDeadline(uint32_t deadline_in_frames);
+ static DeadlinePolicy UseInfiniteDeadline();
+
DeadlinePolicy(const DeadlinePolicy& other);
DeadlinePolicy& operator=(const DeadlinePolicy& other) = default;
@@ -39,7 +42,8 @@ class CC_EXPORT DeadlinePolicy {
base::Optional<uint32_t> deadline_in_frames() const {
DCHECK(policy_type_ == Type::kUseDefaultDeadline ||
- policy_type_ == Type::kUseSpecifiedDeadline);
+ policy_type_ == Type::kUseSpecifiedDeadline ||
+ policy_type_ == Type::kUseInfiniteDeadline);
return deadline_in_frames_;
}
@@ -55,9 +59,9 @@ class CC_EXPORT DeadlinePolicy {
}
private:
- explicit DeadlinePolicy(Type policy_type);
-
- explicit DeadlinePolicy(uint32_t deadline_in_frames);
+ explicit DeadlinePolicy(
+ Type policy_type,
+ base::Optional<uint32_t> deadline_in_frames = base::nullopt);
Type policy_type_;
base::Optional<uint32_t> deadline_in_frames_;