Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / serviceworkers / WaitUntilObserver.cpp

diff --git a/src/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp b/src/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp
index f3ca247..205e031 100644 (file)
--- a/src/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp
+++ b/src/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp
@@ -10,6 +10,7 @@
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "core/dom/ExecutionContext.h"
+#include "modules/serviceworkers/ServiceWorkerGlobalScope.h"
 #include "platform/NotImplemented.h"
 #include "public/platform/WebServiceWorkerEventResult.h"
 #include "wtf/Assertions.h"
@@ -19,7 +20,7 @@
 
 namespace blink {
 
-class WaitUntilObserver::ThenFunction FINAL : public ScriptFunction {
+class WaitUntilObserver::ThenFunction final : public ScriptFunction {
 public:
     enum ResolveType {
         Fulfilled,
@@ -32,7 +33,7 @@ public:
         return self->bindToV8Function();
     }
 
-    virtual void trace(Visitor* visitor) OVERRIDE
+    virtual void trace(Visitor* visitor) override
     {
         visitor->trace(m_observer);
         ScriptFunction::trace(visitor);
@@ -46,7 +47,7 @@ private:
     {
     }
 
-    virtual ScriptValue call(ScriptValue value) OVERRIDE
+    virtual ScriptValue call(ScriptValue value) override
     {
         ASSERT(m_observer);
         ASSERT(m_resolveType == Fulfilled || m_resolveType == Rejected);
@@ -71,8 +72,10 @@ void WaitUntilObserver::willDispatchEvent()
     incrementPendingActivity();
 }
 
-void WaitUntilObserver::didDispatchEvent()
+void WaitUntilObserver::didDispatchEvent(bool errorOccurred)
 {
+    if (errorOccurred)
+        m_hasError = true;
     decrementPendingActivity();
 }