OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "core/inspector/PromiseTracker.h" | 6 #include "core/inspector/PromiseTracker.h" |
7 | 7 |
8 #include "bindings/core/v8/ScopedPersistent.h" | 8 #include "bindings/core/v8/ScopedPersistent.h" |
9 #include "bindings/core/v8/ScriptCallStackFactory.h" | 9 #include "bindings/core/v8/ScriptCallStackFactory.h" |
10 #include "bindings/core/v8/ScriptState.h" | 10 #include "bindings/core/v8/ScriptState.h" |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 } | 273 } |
274 } | 274 } |
275 } | 275 } |
276 } | 276 } |
277 | 277 |
278 PassRefPtr<Array<PromiseDetails> > PromiseTracker::promises() | 278 PassRefPtr<Array<PromiseDetails> > PromiseTracker::promises() |
279 { | 279 { |
280 ASSERT(isEnabled()); | 280 ASSERT(isEnabled()); |
281 | 281 |
282 RefPtr<Array<PromiseDetails> > result = Array<PromiseDetails>::create(); | 282 RefPtr<Array<PromiseDetails> > result = Array<PromiseDetails>::create(); |
283 for (PromiseDataMap::iterator it = m_promiseDataMap.begin(); it != m_promise
DataMap.end(); ++it) { | 283 for (auto it : m_promiseDataMap) { |
284 PromiseDataVector* vector = &it->value; | 284 PromiseDataVector* vector = &it.value; |
285 for (size_t index = 0; index < vector->size(); ++index) { | 285 for (size_t index = 0; index < vector->size(); ++index) { |
286 RefPtrWillBeRawPtr<PromiseData> data = vector->at(index); | 286 RefPtrWillBeRawPtr<PromiseData> data = vector->at(index); |
287 PromiseDetails::Status::Enum status; | 287 PromiseDetails::Status::Enum status; |
288 if (!data->m_status) | 288 if (!data->m_status) |
289 status = PromiseDetails::Status::Pending; | 289 status = PromiseDetails::Status::Pending; |
290 else if (data->m_status == 1) | 290 else if (data->m_status == 1) |
291 status = PromiseDetails::Status::Resolved; | 291 status = PromiseDetails::Status::Resolved; |
292 else | 292 else |
293 status = PromiseDetails::Status::Rejected; | 293 status = PromiseDetails::Status::Rejected; |
294 RefPtr<PromiseDetails> promiseDetails = PromiseDetails::create() | 294 RefPtr<PromiseDetails> promiseDetails = PromiseDetails::create() |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 if (it == m_promiseIdToDataMap.end()) | 331 if (it == m_promiseIdToDataMap.end()) |
332 return ScriptValue(); | 332 return ScriptValue(); |
333 RefPtrWillBeRawPtr<PromiseData> data = it->value; | 333 RefPtrWillBeRawPtr<PromiseData> data = it->value; |
334 ASSERT(data && data->m_promiseId == promiseId); | 334 ASSERT(data && data->m_promiseId == promiseId); |
335 ScriptState* scriptState = data->m_scriptState.get(); | 335 ScriptState* scriptState = data->m_scriptState.get(); |
336 v8::HandleScope scope(scriptState->isolate()); | 336 v8::HandleScope scope(scriptState->isolate()); |
337 return ScriptValue(scriptState, data->m_promise.newLocal(scriptState->isolat
e())); | 337 return ScriptValue(scriptState, data->m_promise.newLocal(scriptState->isolat
e())); |
338 } | 338 } |
339 | 339 |
340 } // namespace blink | 340 } // namespace blink |
OLD | NEW |