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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 : m_promise() | 49 : m_promise() |
50 { | 50 { |
51 } | 51 } |
52 | 52 |
53 explicit ScriptPromise(ScriptValue promise) | 53 explicit ScriptPromise(ScriptValue promise) |
54 : m_promise(promise) | 54 : m_promise(promise) |
55 { | 55 { |
56 ASSERT(!m_promise.hasNoValue()); | 56 ASSERT(!m_promise.hasNoValue()); |
57 } | 57 } |
58 | 58 |
| 59 // FIXME: This constructor should take an isolate. |
59 explicit ScriptPromise(v8::Handle<v8::Value> promise) | 60 explicit ScriptPromise(v8::Handle<v8::Value> promise) |
60 : m_promise(promise) | 61 : m_promise(promise, v8::Isolate::GetCurrent()) |
61 { | 62 { |
62 ASSERT(!m_promise.hasNoValue()); | 63 ASSERT(!m_promise.hasNoValue()); |
63 } | 64 } |
64 | 65 |
65 bool isObject() const | 66 bool isObject() const |
66 { | 67 { |
67 return m_promise.isObject(); | 68 return m_promise.isObject(); |
68 } | 69 } |
69 | 70 |
70 bool isNull() const | 71 bool isNull() const |
(...skipping 22 matching lines...) Expand all Loading... |
93 } | 94 } |
94 | 95 |
95 private: | 96 private: |
96 ScriptValue m_promise; | 97 ScriptValue m_promise; |
97 }; | 98 }; |
98 | 99 |
99 } // namespace WebCore | 100 } // namespace WebCore |
100 | 101 |
101 | 102 |
102 #endif // ScriptPromise_h | 103 #endif // ScriptPromise_h |
OLD | NEW |