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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 // So holding a ScriptPromise as a member variable in DOM object causes | 43 // So holding a ScriptPromise as a member variable in DOM object causes |
44 // memory leaks since it has a reference from C++ to V8. | 44 // memory leaks since it has a reference from C++ to V8. |
45 // | 45 // |
46 class ScriptPromise { | 46 class ScriptPromise { |
47 public: | 47 public: |
48 ScriptPromise() | 48 ScriptPromise() |
49 : m_promise() | 49 : m_promise() |
50 { | 50 { |
51 } | 51 } |
52 | 52 |
53 explicit ScriptPromise(ScriptValue promise) | 53 explicit ScriptPromise(const 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 ScriptPromise(v8::Handle<v8::Value> promise, v8::Isolate* isolate) |
60 explicit ScriptPromise(v8::Handle<v8::Value> promise) | 60 : m_promise(promise, isolate) |
61 : m_promise(promise, v8::Isolate::GetCurrent()) | |
62 { | 61 { |
63 ASSERT(!m_promise.hasNoValue()); | 62 ASSERT(!m_promise.hasNoValue()); |
64 } | 63 } |
65 | 64 |
66 bool isObject() const | 65 bool isObject() const |
67 { | 66 { |
68 return m_promise.isObject(); | 67 return m_promise.isObject(); |
69 } | 68 } |
70 | 69 |
71 bool isNull() const | 70 bool isNull() const |
(...skipping 22 matching lines...) Expand all Loading... |
94 } | 93 } |
95 | 94 |
96 private: | 95 private: |
97 ScriptValue m_promise; | 96 ScriptValue m_promise; |
98 }; | 97 }; |
99 | 98 |
100 } // namespace WebCore | 99 } // namespace WebCore |
101 | 100 |
102 | 101 |
103 #endif // ScriptPromise_h | 102 #endif // ScriptPromise_h |
OLD | NEW |