Chromium Code Reviews| 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/ScriptCallStackFactory.h" | 8 #include "bindings/core/v8/ScriptCallStackFactory.h" |
| 9 #include "bindings/core/v8/ScriptState.h" | 9 #include "bindings/core/v8/ScriptState.h" |
| 10 #include "bindings/core/v8/ScriptValue.h" | 10 #include "bindings/core/v8/ScriptValue.h" |
| 11 #include "core/inspector/ScriptAsyncCallStack.h" | 11 #include "core/inspector/ScriptAsyncCallStack.h" |
| 12 #include "wtf/CurrentTime.h" | 12 #include "wtf/CurrentTime.h" |
| 13 #include "wtf/PassOwnPtr.h" | 13 #include "wtf/PassOwnPtr.h" |
| 14 #include "wtf/WeakPtr.h" | 14 #include "wtf/WeakPtr.h" |
| 15 | 15 |
| 16 using blink::TypeBuilder::Array; | 16 using blink::TypeBuilder::Array; |
| 17 using blink::TypeBuilder::Console::CallFrame; | 17 using blink::TypeBuilder::Console::CallFrame; |
| 18 using blink::TypeBuilder::Debugger::PromiseDetails; | 18 using blink::TypeBuilder::Debugger::PromiseDetails; |
| 19 | 19 |
| 20 namespace blink { | 20 namespace blink { |
| 21 | 21 |
| 22 class PromiseTracker::PromiseWeakCallbackData final { | 22 class PromiseTracker::PromiseWeakCallbackData final { |
| 23 WTF_MAKE_NONCOPYABLE(PromiseWeakCallbackData); | 23 WTF_MAKE_NONCOPYABLE(PromiseWeakCallbackData); |
| 24 public: | 24 public: |
| 25 PromiseWeakCallbackData(PromiseTracker* tracker, int id) | 25 PromiseWeakCallbackData(PromiseTracker* tracker, int id) |
| 26 #if ENABLE(OILPAN) | |
| 27 : m_tracker(tracker) | |
| 28 #else | |
| 26 : m_tracker(tracker->m_weakPtrFactory.createWeakPtr()) | 29 : m_tracker(tracker->m_weakPtrFactory.createWeakPtr()) |
| 30 #endif | |
| 27 , m_id(id) | 31 , m_id(id) |
| 28 { | 32 { |
| 29 } | 33 } |
| 30 | 34 |
| 31 ~PromiseWeakCallbackData() | 35 ~PromiseWeakCallbackData() |
| 32 { | 36 { |
| 33 if (!m_tracker) | 37 if (!m_tracker) |
| 34 return; | 38 return; |
| 35 RefPtr<PromiseDetails> promiseDetails = PromiseDetails::create().setId(m _id); | 39 RefPtr<PromiseDetails> promiseDetails = PromiseDetails::create().setId(m _id); |
| 36 m_tracker->m_listener->didUpdatePromise(InspectorFrontend::Debugger::Eve ntType::Gc, promiseDetails.release()); | 40 m_tracker->m_listener->didUpdatePromise(InspectorFrontend::Debugger::Eve ntType::Gc, promiseDetails.release()); |
|
haraken
2015/08/21 00:16:25
This does complicated things like posting a messag
| |
| 37 } | 41 } |
| 38 | 42 |
| 39 WeakPtr<PromiseTracker> m_tracker; | 43 WeakPtrWillBeWeakPersistent<PromiseTracker> m_tracker; |
| 40 int m_id; | 44 int m_id; |
| 41 }; | 45 }; |
| 42 | 46 |
| 43 PromiseTracker::IdToPromiseMapTraits::WeakCallbackDataType* PromiseTracker::IdTo PromiseMapTraits::WeakCallbackParameter(MapType* map, int key, v8::Local<v8::Obj ect>& value) | 47 PromiseTracker::IdToPromiseMapTraits::WeakCallbackDataType* PromiseTracker::IdTo PromiseMapTraits::WeakCallbackParameter(MapType* map, int key, v8::Local<v8::Obj ect>& value) |
| 44 { | 48 { |
| 45 // This method is called when promise is added into the map, hence the map m ust be alive at this point. The tracker in turn must be alive too. | 49 // This method is called when promise is added into the map, hence the map m ust be alive at this point. The tracker in turn must be alive too. |
| 46 PromiseTracker* tracker = reinterpret_cast<PromiseTracker*>(reinterpret_cast <intptr_t>(map) - offsetof(PromiseTracker, m_idToPromise)); | 50 PromiseTracker* tracker = reinterpret_cast<PromiseTracker*>(reinterpret_cast <intptr_t>(map) - offsetof(PromiseTracker, m_idToPromise)); |
| 47 return new PromiseWeakCallbackData(tracker, key); | 51 return new PromiseWeakCallbackData(tracker, key); |
| 48 } | 52 } |
| 49 | 53 |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 66 { | 70 { |
| 67 return info.GetParameter()->m_id; | 71 return info.GetParameter()->m_id; |
| 68 } | 72 } |
| 69 | 73 |
| 70 PromiseTracker::PromiseTracker(Listener* listener, v8::Isolate* isolate) | 74 PromiseTracker::PromiseTracker(Listener* listener, v8::Isolate* isolate) |
| 71 : m_circularSequentialId(0) | 75 : m_circularSequentialId(0) |
| 72 , m_isEnabled(false) | 76 , m_isEnabled(false) |
| 73 , m_captureStacks(false) | 77 , m_captureStacks(false) |
| 74 , m_listener(listener) | 78 , m_listener(listener) |
| 75 , m_isolate(isolate) | 79 , m_isolate(isolate) |
| 80 #if !ENABLE(OILPAN) | |
| 76 , m_weakPtrFactory(this) | 81 , m_weakPtrFactory(this) |
| 82 #endif | |
| 77 , m_idToPromise(isolate) | 83 , m_idToPromise(isolate) |
| 78 { | 84 { |
| 79 clear(); | 85 clear(); |
| 80 } | 86 } |
| 81 | 87 |
| 82 PromiseTracker::~PromiseTracker() | 88 PromiseTracker::~PromiseTracker() |
| 83 { | 89 { |
| 84 } | 90 } |
| 85 | 91 |
| 86 DEFINE_TRACE(PromiseTracker) | 92 DEFINE_TRACE(PromiseTracker) |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 { | 201 { |
| 196 ASSERT(isEnabled()); | 202 ASSERT(isEnabled()); |
| 197 v8::HandleScope scope(m_isolate); | 203 v8::HandleScope scope(m_isolate); |
| 198 v8::Local<v8::Object> value = m_idToPromise.Get(promiseId); | 204 v8::Local<v8::Object> value = m_idToPromise.Get(promiseId); |
| 199 if (value.IsEmpty()) | 205 if (value.IsEmpty()) |
| 200 return ScriptValue(); | 206 return ScriptValue(); |
| 201 return ScriptValue(ScriptState::from(value->CreationContext()) , value); | 207 return ScriptValue(ScriptState::from(value->CreationContext()) , value); |
| 202 } | 208 } |
| 203 | 209 |
| 204 } // namespace blink | 210 } // namespace blink |
| OLD | NEW |