Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: Source/core/inspector/PromiseTracker.cpp

Issue 602183002: Oilpan: fix build after r182688. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 , m_promiseId(promiseId) 55 , m_promiseId(promiseId)
56 , m_promise(scriptState->isolate(), promise) 56 , m_promise(scriptState->isolate(), promise)
57 , m_parentPromiseId(0) 57 , m_parentPromiseId(0)
58 , m_status(0) 58 , m_status(0)
59 #if !ENABLE(OILPAN) 59 #if !ENABLE(OILPAN)
60 , m_weakPtrFactory(this) 60 , m_weakPtrFactory(this)
61 #endif 61 #endif
62 { 62 {
63 } 63 }
64 64
65 RefPtrWillBeMember<ScriptState> m_scriptState; 65 RefPtr<ScriptState> m_scriptState;
66 int m_promiseHash; 66 int m_promiseHash;
67 int m_promiseId; 67 int m_promiseId;
68 ScopedPersistent<v8::Object> m_promise; 68 ScopedPersistent<v8::Object> m_promise;
69 int m_parentPromiseId; 69 int m_parentPromiseId;
70 int m_status; 70 int m_status;
71 RefPtrWillBeMember<ScriptCallStack> m_callStack; 71 RefPtrWillBeMember<ScriptCallStack> m_callStack;
72 ScopedPersistent<v8::Object> m_parentPromise; 72 ScopedPersistent<v8::Object> m_parentPromise;
73 #if !ENABLE(OILPAN) 73 #if !ENABLE(OILPAN)
74 WeakPtrFactory<PromiseData> m_weakPtrFactory; 74 WeakPtrFactory<PromiseData> m_weakPtrFactory;
75 #endif 75 #endif
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 ScriptState* scriptState = data->m_scriptState.get(); 284 ScriptState* scriptState = data->m_scriptState.get();
285 return ScriptValue(scriptState, data->m_promise.newLocal(scriptS tate->isolate())); 285 return ScriptValue(scriptState, data->m_promise.newLocal(scriptS tate->isolate()));
286 } 286 }
287 } 287 }
288 } 288 }
289 289
290 return ScriptValue(); 290 return ScriptValue();
291 } 291 }
292 292
293 } // namespace blink 293 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698