| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 template<typename T> | 146 template<typename T> |
| 147 v8::Handle<v8::Value> toV8Value(const T& value) | 147 v8::Handle<v8::Value> toV8Value(const T& value) |
| 148 { | 148 { |
| 149 return ToV8Value<ScriptPromiseResolver, ScriptState*>::toV8Value(value,
m_scriptState.get(), m_scriptState->isolate()); | 149 return ToV8Value<ScriptPromiseResolver, ScriptState*>::toV8Value(value,
m_scriptState.get(), m_scriptState->isolate()); |
| 150 } | 150 } |
| 151 | 151 |
| 152 explicit ScriptPromiseResolver(ScriptState*); | 152 explicit ScriptPromiseResolver(ScriptState*); |
| 153 | 153 |
| 154 // FIXME: Remove this once ScriptValue::scriptState() becomes available. | 154 // FIXME: Remove this once ScriptValue::scriptState() becomes available. |
| 155 RefPtr<ScriptState> m_scriptState; | 155 RefPtr<ScriptState> m_scriptState; |
| 156 // Used when scriptPromiseOnV8Promise is disabled. | |
| 157 ScriptPromise m_promise; | |
| 158 // Used when scriptPromiseOnV8Promise is enabled. | |
| 159 ScriptValue m_resolver; | 156 ScriptValue m_resolver; |
| 160 }; | 157 }; |
| 161 | 158 |
| 162 } // namespace WebCore | 159 } // namespace WebCore |
| 163 | 160 |
| 164 | 161 |
| 165 #endif // ScriptPromiseResolver_h | 162 #endif // ScriptPromiseResolver_h |
| OLD | NEW |