OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 11 matching lines...) Expand all Loading... |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
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 #include "config.h" | 31 #include "config.h" |
32 #include "V8ErrorEvent.h" | 32 #include "bindings/v8/ScriptPromise.h" |
33 | 33 |
34 #include "RuntimeEnabledFeatures.h" | |
35 #include "V8Event.h" | |
36 #include "bindings/v8/DOMWrapperWorld.h" | |
37 #include "bindings/v8/Dictionary.h" | |
38 #include "bindings/v8/ScriptState.h" | |
39 #include "bindings/v8/SerializedScriptValue.h" | |
40 #include "bindings/v8/V8Binding.h" | 34 #include "bindings/v8/V8Binding.h" |
41 #include "bindings/v8/V8DOMWrapper.h" | 35 #include "bindings/v8/V8DOMWrapper.h" |
42 #include "bindings/v8/V8HiddenPropertyName.h" | 36 #include "bindings/v8/custom/V8PromiseCustom.h" |
43 #include "core/dom/ContextFeatures.h" | 37 |
| 38 #include <v8.h> |
44 | 39 |
45 namespace WebCore { | 40 namespace WebCore { |
46 | 41 |
47 void V8ErrorEvent::errorAttributeGetterCustom(v8::Local<v8::String>, const v8::P
ropertyCallbackInfo<v8::Value>& info) | 42 ScriptPromise ScriptPromise::createPending(ExecutionContext* context) |
48 { | 43 { |
49 v8::Handle<v8::Value> error = info.Holder()->GetHiddenValue(V8HiddenProperty
Name::error(info.GetIsolate())); | 44 ASSERT(v8::Context::InContext()); |
| 45 ASSERT(context); |
| 46 v8::Isolate* isolate = toIsolate(context); |
| 47 v8::Handle<v8::Object> promise = V8PromiseCustom::createPromise(toV8Context(
context, DOMWrapperWorld::current())->Global(), isolate); |
| 48 return ScriptPromise(promise, isolate); |
| 49 } |
50 | 50 |
51 if (!error.IsEmpty()) { | 51 ScriptPromise ScriptPromise::createPending() |
52 v8SetReturnValue(info, error); | 52 { |
53 return; | 53 ASSERT(v8::Context::InContext()); |
54 } | 54 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
55 | 55 v8::Handle<v8::Object> promise = V8PromiseCustom::createPromise(v8::Object::
New(), isolate); |
56 v8SetReturnValueNull(info); | 56 return ScriptPromise(promise, isolate); |
57 } | 57 } |
58 | 58 |
59 } // namespace WebCore | 59 } // namespace WebCore |
OLD | NEW |