Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef ExtendableEvent_h | 31 #ifndef ExtendableEvent_h |
| 32 #define ExtendableEvent_h | 32 #define ExtendableEvent_h |
| 33 | 33 |
| 34 #include "bindings/core/v8/ScriptValue.h" | 34 #include "bindings/core/v8/ScriptValue.h" |
|
yhirano
2015/07/29 06:28:40
-ScriptValue
+bindings/core/v8/ScriptPromoise.h
jungkees
2015/07/29 07:55:46
Addressed.
| |
| 35 #include "modules/EventModules.h" | 35 #include "modules/EventModules.h" |
| 36 #include "modules/ModulesExport.h" | 36 #include "modules/ModulesExport.h" |
| 37 #include "modules/serviceworkers/ExtendableEventInit.h" | 37 #include "modules/serviceworkers/ExtendableEventInit.h" |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 class WaitUntilObserver; | 41 class WaitUntilObserver; |
| 42 | 42 |
| 43 class MODULES_EXPORT ExtendableEvent : public Event { | 43 class MODULES_EXPORT ExtendableEvent : public Event { |
| 44 DEFINE_WRAPPERTYPEINFO(); | 44 DEFINE_WRAPPERTYPEINFO(); |
| 45 public: | 45 public: |
| 46 static PassRefPtrWillBeRawPtr<ExtendableEvent> create(); | 46 static PassRefPtrWillBeRawPtr<ExtendableEvent> create(); |
| 47 static PassRefPtrWillBeRawPtr<ExtendableEvent> create(const AtomicString& ty pe, const ExtendableEventInit&); | 47 static PassRefPtrWillBeRawPtr<ExtendableEvent> create(const AtomicString& ty pe, const ExtendableEventInit&); |
| 48 static PassRefPtrWillBeRawPtr<ExtendableEvent> create(const AtomicString& ty pe, const ExtendableEventInit&, WaitUntilObserver*); | 48 static PassRefPtrWillBeRawPtr<ExtendableEvent> create(const AtomicString& ty pe, const ExtendableEventInit&, WaitUntilObserver*); |
| 49 | 49 |
| 50 ~ExtendableEvent() override; | 50 ~ExtendableEvent() override; |
| 51 | 51 |
| 52 void waitUntil(ScriptState*, const ScriptValue&, ExceptionState&); | 52 void waitUntil(ScriptState*, ScriptPromise, ExceptionState&); |
| 53 | 53 |
| 54 const AtomicString& interfaceName() const override; | 54 const AtomicString& interfaceName() const override; |
| 55 DECLARE_VIRTUAL_TRACE(); | 55 DECLARE_VIRTUAL_TRACE(); |
| 56 | 56 |
| 57 protected: | 57 protected: |
| 58 ExtendableEvent(); | 58 ExtendableEvent(); |
| 59 ExtendableEvent(const AtomicString& type, const ExtendableEventInit&); | 59 ExtendableEvent(const AtomicString& type, const ExtendableEventInit&); |
| 60 ExtendableEvent(const AtomicString& type, const ExtendableEventInit&, WaitUn tilObserver*); | 60 ExtendableEvent(const AtomicString& type, const ExtendableEventInit&, WaitUn tilObserver*); |
| 61 | 61 |
| 62 PersistentWillBeMember<WaitUntilObserver> m_observer; | 62 PersistentWillBeMember<WaitUntilObserver> m_observer; |
| 63 }; | 63 }; |
| 64 | 64 |
| 65 } // namespace blink | 65 } // namespace blink |
| 66 | 66 |
| 67 #endif // ExtendableEvent_h | 67 #endif // ExtendableEvent_h |
| OLD | NEW |