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

Unified Diff: third_party/WebKit/Source/core/inspector/PromiseTracker.cpp

Issue 1377813002: Oilpan: fix build after r351269. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use a WeakPersistent<InjectedScriptManager> instead Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/PromiseTracker.cpp
diff --git a/third_party/WebKit/Source/core/inspector/PromiseTracker.cpp b/third_party/WebKit/Source/core/inspector/PromiseTracker.cpp
index eb7a4a04d75cde9739b684067d71d81edf434ddc..6a5532f2223e1535575a394c20805e99dfdb5b37 100644
--- a/third_party/WebKit/Source/core/inspector/PromiseTracker.cpp
+++ b/third_party/WebKit/Source/core/inspector/PromiseTracker.cpp
@@ -23,11 +23,7 @@ class PromiseTracker::PromiseWeakCallbackData final {
WTF_MAKE_NONCOPYABLE(PromiseWeakCallbackData);
public:
PromiseWeakCallbackData(PromiseTracker* tracker, int id)
-#if ENABLE(OILPAN)
- : m_tracker(tracker)
-#else
: m_tracker(tracker->m_weakPtrFactory.createWeakPtr())
-#endif
, m_id(id)
{
}
@@ -40,7 +36,7 @@ public:
m_tracker->m_listener->didUpdatePromise(InspectorFrontend::Debugger::EventType::Gc, promiseDetails.release());
}
- WeakPtrWillBeWeakPersistent<PromiseTracker> m_tracker;
+ WeakPtr<PromiseTracker> m_tracker;
int m_id;
};
@@ -77,9 +73,7 @@ PromiseTracker::PromiseTracker(Listener* listener, v8::Isolate* isolate)
, m_captureStacks(false)
, m_listener(listener)
, m_isolate(isolate)
-#if !ENABLE(OILPAN)
, m_weakPtrFactory(this)
-#endif
, m_idToPromise(isolate)
{
clear();
@@ -89,13 +83,6 @@ PromiseTracker::~PromiseTracker()
{
}
-DEFINE_TRACE(PromiseTracker)
-{
-#if ENABLE(OILPAN)
- visitor->trace(m_listener);
-#endif
-}
-
void PromiseTracker::setEnabled(bool enabled, bool captureStacks)
{
m_isEnabled = enabled;

Powered by Google App Engine
This is Rietveld 408576698