Index: third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h |
diff --git a/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h b/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h |
index 072d09304e728c8fb0174fc78dca29a99637f02c..c43c21a437fe4cdd775868fe668465b56aea0ce5 100644 |
--- a/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h |
+++ b/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h |
@@ -64,7 +64,7 @@ class MODULES_EXPORT WaitUntilObserver final |
WaitUntilObserver(ExecutionContext*, EventType, int event_id); |
- void ReportError(const ScriptValue&); |
+ void ReportPromiseRejected(const ScriptValue&); |
falken
2017/05/09 08:07:31
Maybe just "OnPromiseRejected", as it's not really
leonhsl(Using Gerrit)
2017/05/10 05:03:34
Removed this method, DecrementPendingActivity() co
|
void ConsumeWindowInteraction(TimerBase*); |
@@ -73,6 +73,7 @@ class MODULES_EXPORT WaitUntilObserver final |
int event_id_; |
int pending_activity_ = 0; |
bool has_error_ = false; |
+ bool has_rejected_promise_ = false; |
bool event_dispatched_ = false; |
falken
2017/05/09 08:07:31
Actually, instead of |has_error_| and |event_dispa
leonhsl(Using Gerrit)
2017/05/10 05:03:34
Done.
|
double event_dispatch_time_ = 0; |
TaskRunnerTimer<WaitUntilObserver> consume_window_interaction_timer_; |