OLD | NEW |
---|---|
(Empty) | |
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 | |
3 // found in the LICENSE file. | |
4 | |
5 #include "config.h" | |
6 #include "core/inspector/PromiseTracker.h" | |
7 | |
8 #include "bindings/core/v8/ScriptCallStackFactory.h" | |
9 #include "bindings/core/v8/ScriptState.h" | |
10 | |
11 namespace blink { | |
12 | |
13 namespace { | |
14 | |
15 struct PromiseDataWrapper { | |
16 WTF_MAKE_NONCOPYABLE(PromiseDataWrapper); | |
aandrey
2014/08/07 17:12:47
remove
Alexandra Mikhaylova
2014/08/08 12:20:22
Done.
| |
17 public: | |
aandrey
2014/08/07 17:12:48
remove
Alexandra Mikhaylova
2014/08/08 12:20:22
Done.
| |
18 PromiseDataWrapper(WeakPtr<PromiseTracker::PromiseData> data, PromiseTracker ::PromiseDataMap* map) | |
19 : m_data(data) | |
20 , m_map(map) | |
21 { | |
22 } | |
23 | |
24 static void didRemovePromise(const v8::WeakCallbackData<v8::Object, PromiseD ataWrapper>& data) | |
25 { | |
26 OwnPtr<PromiseDataWrapper> wrapper = adoptPtr(data.GetParameter()); | |
27 WeakPtr<PromiseTracker::PromiseData> promiseData = wrapper->m_data; | |
28 PromiseTracker::PromiseDataMap* map = wrapper->m_map; | |
aandrey
2014/08/07 17:12:48
nit: move below the if- check
Alexandra Mikhaylova
2014/08/08 12:20:22
Done.
| |
29 if (!promiseData) | |
30 return; | |
31 int promiseHash = promiseData->promiseHash(); | |
32 PromiseTracker::PromiseDataVector* vector = &map->find(promiseHash)->val ue; | |
aandrey
2014/08/07 17:29:29
can find nothing, add safety check
Alexandra Mikhaylova
2014/08/08 12:20:23
It should find the correct vector, added an ASSERT
| |
33 for (size_t index = 0; index < vector->size(); ++index) { | |
34 if (vector->at(index)->promise() == promiseData->promise()) { | |
35 vector->remove(index); | |
36 break; | |
37 } | |
38 } | |
39 if (vector->size() == 0) | |
40 map->remove(promiseHash); | |
41 } | |
42 | |
43 WeakPtr<PromiseTracker::PromiseData> m_data; | |
44 PromiseTracker::PromiseDataMap* m_map; | |
aandrey
2014/08/07 17:12:47
m_promiseDataMap
Alexandra Mikhaylova
2014/08/08 12:20:23
Done.
| |
45 }; | |
46 | |
47 } | |
48 | |
49 PromiseTracker::PromiseData::PromiseData(v8::Isolate* isolate, v8::Handle<v8::Ob ject> promise, v8::Handle<v8::Object> parentPromise, int status, PromiseTracker* tracker, bool captureStack) | |
50 : m_promiseHash(promise->GetIdentityHash()) | |
51 , m_promise(isolate, promise) | |
52 , m_parentPromise(isolate, parentPromise) | |
53 , m_status(status) | |
54 , m_weakPtrFactory(this) | |
55 { | |
56 if (captureStack) { | |
57 v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace( isolate, 1)); | |
58 RefPtrWillBeRawPtr<ScriptCallStack> stack = createScriptCallStack(stackT race, 1, isolate); | |
59 if (stack->size()) | |
60 m_callFrame = stack->at(0); | |
61 } | |
62 PromiseDataWrapper* wrapper = new PromiseDataWrapper(m_weakPtrFactory.create WeakPtr(), &tracker->m_promiseDataMap); | |
aandrey
2014/08/07 17:12:47
maybe move this code into the tracker to remove Pr
Alexandra Mikhaylova
2014/08/08 12:20:22
Done.
| |
63 m_promise.setWeak(wrapper, &PromiseDataWrapper::didRemovePromise); | |
64 } | |
65 | |
66 void PromiseTracker::enable() | |
67 { | |
68 m_isEnabled = true; | |
69 } | |
70 | |
71 void PromiseTracker::disable() | |
72 { | |
73 m_isEnabled = false; | |
74 clear(); | |
75 } | |
76 | |
77 void PromiseTracker::clear() | |
78 { | |
79 m_promiseDataMap.clear(); | |
80 } | |
81 | |
82 PromiseTracker::PromiseDataVector* PromiseTracker::promiseVector(int promiseHash ) | |
aandrey
2014/08/07 17:12:47
remove this method
Alexandra Mikhaylova
2014/08/08 12:20:22
Done.
| |
83 { | |
84 PromiseDataMap::iterator it = m_promiseDataMap.find(promiseHash); | |
85 if (it != m_promiseDataMap.end()) | |
86 return &it->value; | |
87 return &m_promiseDataMap.add(promiseHash, PromiseDataVector()).storedValue-> value; | |
88 } | |
89 | |
90 void PromiseTracker::didReceiveV8PromiseEvent(ScriptState* scriptState, v8::Hand le<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status) | |
91 { | |
92 ASSERT(isEnabled()); | |
93 | |
94 PromiseDataVector* vector = promiseVector(promise->GetIdentityHash()); | |
aandrey
2014/08/07 17:12:47
GetIdentityHash should be called once
Alexandra Mikhaylova
2014/08/08 12:20:23
Done.
| |
95 for (size_t index = 0; index < vector->size(); ++index) { | |
96 RefPtr<PromiseData> data = vector->at(index); | |
aandrey
2014/08/07 17:12:47
still code dup. maybe create a static helper metho
Alexandra Mikhaylova
2014/08/08 12:20:22
Introduced a static helper method, but it can't be
| |
97 if (data->m_promise == promise) { | |
98 if (status != 0) { | |
99 data->m_status = status; | |
100 } else { | |
101 ASSERT(parentPromise->IsObject()); | |
102 data->m_parentPromise.set(scriptState->isolate(), parentPromise- >ToObject()); | |
103 } | |
104 return; | |
105 } | |
106 } | |
107 vector->append(adoptRef(new PromiseData(scriptState->isolate(), promise, par entPromise->IsObject() ? parentPromise->ToObject() : v8::Handle<v8::Object>(), 0 , this, status == 0 && !parentPromise->IsObject()))); | |
aandrey
2014/08/07 17:12:47
1) extract bool captureStack
2) status may not be
aandrey
2014/08/07 17:19:02
check parentPromise.IsEmpty()
Alexandra Mikhaylova
2014/08/08 12:20:22
1) Done.
2) Is status != 0, then it is not a new
Alexandra Mikhaylova
2014/08/08 12:20:22
Done.
| |
108 } | |
109 | |
110 } // namespace blink | |
OLD | NEW |