Merge DevTools Refactor CL to Blink36

Source/core/inspector/AsyncCallStackTracker.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 128 matching lines @@
 static XMLHttpRequest* toXmlHttpRequest(EventTarget* eventTarget)
 {
     const AtomicString& interfaceName = eventTarget->interfaceName();
     if (interfaceName == EventTargetNames::XMLHttpRequest)
         return static_cast<XMLHttpRequest*>(eventTarget);
     if (interfaceName == EventTargetNames::XMLHttpRequestUpload)
         return static_cast<XMLHttpRequestUpload*>(eventTarget)->xmlHttpRequest();
     return 0;
 }
 
-AsyncCallStackTracker::AsyncCallStack::AsyncCallStack(const String& description, const ScriptValue& callFrames)
+AsyncCallStackTracker::AsyncCallStack::AsyncCallStack(const String& description, const StackTrace& callFrames)
     : m_description(description)
     , m_callFrames(callFrames)
 {
 }
 
 AsyncCallStackTracker::AsyncCallStack::~AsyncCallStack()
 {
 }
 
 AsyncCallStackTracker::AsyncCallStackTracker()
@@ skipping 11 matching lines @@
     }
 }
 
 const AsyncCallStackTracker::AsyncCallChain* AsyncCallStackTracker::currentAsyncCallChain() const
 {
     if (m_currentAsyncCallChain)
         ensureMaxAsyncCallChainDepth(m_currentAsyncCallChain.get(), m_maxAsyncCallStackDepth);
     return m_currentAsyncCallChain.get();
 }
 
-void AsyncCallStackTracker::didInstallTimer(ExecutionContext* context, int timerId, bool singleShot, const ScriptValue& callFrames)
+void AsyncCallStackTracker::didInstallTimer(ExecutionContext* context, int timerId, bool singleShot, const StackTrace& callFrames)
 {
     ASSERT(context);
     ASSERT(isEnabled());
     if (!validateCallFrames(callFrames))
         return;
     ASSERT(timerId > 0);
     ExecutionContextData* data = createContextDataIfNeeded(context);
     data->m_timerCallChains.set(timerId, createAsyncCallChain(singleShot ? setTimeoutName : setIntervalName, callFrames));
     if (!singleShot)
         data->m_intervalTimerIds.add(timerId);
@@ skipping 21 matching lines @@
     if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
         if (data->m_intervalTimerIds.contains(timerId))
             setCurrentAsyncCallChain(data->m_timerCallChains.get(timerId));
         else
             setCurrentAsyncCallChain(data->m_timerCallChains.take(timerId));
     } else {
         setCurrentAsyncCallChain(nullptr);
     }
 }
 
-void AsyncCallStackTracker::didRequestAnimationFrame(ExecutionContext* context, int callbackId, const ScriptValue& callFrames)
+void AsyncCallStackTracker::didRequestAnimationFrame(ExecutionContext* context, int callbackId, const StackTrace& callFrames)
 {
     ASSERT(context);
     ASSERT(isEnabled());
     if (!validateCallFrames(callFrames))
         return;
     ASSERT(callbackId > 0);
     ExecutionContextData* data = createContextDataIfNeeded(context);
     data->m_animationFrameCallChains.set(callbackId, createAsyncCallChain(requestAnimationFrameName, callFrames));
 }
 
@@ skipping 12 matching lines @@
     ASSERT(context);
     ASSERT(isEnabled());
     ASSERT(callbackId > 0);
     ASSERT(!m_currentAsyncCallChain);
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         setCurrentAsyncCallChain(data->m_animationFrameCallChains.take(callbackId));
     else
         setCurrentAsyncCallChain(nullptr);
 }
 
-void AsyncCallStackTracker::didAddEventListener(EventTarget* eventTarget, const AtomicString& eventType, EventListener* listener, bool useCapture, const ScriptValue& callFrames)
+void AsyncCallStackTracker::didAddEventListener(EventTarget* eventTarget, const AtomicString& eventType, EventListener* listener, bool useCapture, const StackTrace& callFrames)
 {
     ASSERT(eventTarget->executionContext());
     ASSERT(isEnabled());
     if (!validateCallFrames(callFrames) || toXmlHttpRequest(eventTarget))
         return;
 
     StringBuilder description;
     description.append(eventTarget->interfaceName());
     if (!description.isEmpty())
         description.append(".");
@@ skipping 33 matching lines @@
     if (XMLHttpRequest* xhr = toXmlHttpRequest(eventTarget)) {
         willHandleXHREvent(xhr, eventTarget, eventType);
         return;
     }
     if (ExecutionContextData* data = m_executionContextDataMap.get(eventTarget->executionContext()))
         setCurrentAsyncCallChain(data->findEventListenerData(eventTarget, eventType, RegisteredEventListener(listener, useCapture)));
     else
         setCurrentAsyncCallChain(nullptr);
 }
 
-void AsyncCallStackTracker::willLoadXHR(XMLHttpRequest* xhr, const ScriptValue& callFrames)
+void AsyncCallStackTracker::willLoadXHR(XMLHttpRequest* xhr, const StackTrace& callFrames)
 {
     ASSERT(xhr->executionContext());
     ASSERT(isEnabled());
     if (!validateCallFrames(callFrames))
         return;
     ExecutionContextData* data = createContextDataIfNeeded(xhr->executionContext());
     data->m_xhrCallChains.set(xhr, createAsyncCallChain(xhrSendName, callFrames));
 }
 
 void AsyncCallStackTracker::willHandleXHREvent(XMLHttpRequest* xhr, EventTarget* eventTarget, const AtomicString& eventType)
 {
     ASSERT(xhr->executionContext());
     ASSERT(isEnabled());
     if (ExecutionContextData* data = m_executionContextDataMap.get(xhr->executionContext())) {
         bool isXHRDownload = (xhr == eventTarget);
         if (isXHRDownload && eventType == EventTypeNames::loadend)
             setCurrentAsyncCallChain(data->m_xhrCallChains.take(xhr));
         else
             setCurrentAsyncCallChain(data->m_xhrCallChains.get(xhr));
     } else {
         setCurrentAsyncCallChain(nullptr);
     }
 }
 
-void AsyncCallStackTracker::didEnqueueMutationRecord(ExecutionContext* context, MutationObserver* observer, const ScriptValue& callFrames)
+void AsyncCallStackTracker::didEnqueueMutationRecord(ExecutionContext* context, MutationObserver* observer, const StackTrace& callFrames)
 {
     ASSERT(context);
     ASSERT(isEnabled());
     if (!validateCallFrames(callFrames))
         return;
     ExecutionContextData* data = createContextDataIfNeeded(context);
     data->m_mutationObserverCallChains.set(observer, createAsyncCallChain(enqueueMutationRecordName, callFrames));
 }
 
 bool AsyncCallStackTracker::hasEnqueuedMutationRecord(ExecutionContext* context, MutationObserver* observer)
@@ skipping 16 matching lines @@
 void AsyncCallStackTracker::willDeliverMutationRecords(ExecutionContext* context, MutationObserver* observer)
 {
     ASSERT(context);
     ASSERT(isEnabled());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         setCurrentAsyncCallChain(data->m_mutationObserverCallChains.take(observer));
     else
         setCurrentAsyncCallChain(nullptr);
 }
 
-void AsyncCallStackTracker::didPostPromiseTask(ExecutionContext* context, ExecutionContextTask* task, bool isResolved, const ScriptValue& callFrames)
+void AsyncCallStackTracker::didPostPromiseTask(ExecutionContext* context, ExecutionContextTask* task, bool isResolved, const StackTrace& callFrames)
 {
     ASSERT(context);
     ASSERT(isEnabled());
     if (validateCallFrames(callFrames)) {
         ExecutionContextData* data = createContextDataIfNeeded(context);
         data->m_promiseTaskCallChains.set(task, createAsyncCallChain(isResolved ? promiseResolved : promiseRejected, callFrames));
     } else if (m_currentAsyncCallChain) {
         // Propagate async call stack to the re-posted task to update a derived Promise.
         ExecutionContextData* data = createContextDataIfNeeded(context);
         data->m_promiseTaskCallChains.set(task, m_currentAsyncCallChain);
     }
 }
 
 void AsyncCallStackTracker::willPerformPromiseTask(ExecutionContext* context, ExecutionContextTask* task)
 {
     ASSERT(context);
     ASSERT(isEnabled());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         setCurrentAsyncCallChain(data->m_promiseTaskCallChains.take(task));
     else
         setCurrentAsyncCallChain(nullptr);
 }
 
 void AsyncCallStackTracker::didFireAsyncCall()
 {
     clearCurrentAsyncCallChain();
 }
 
-PassRefPtr<AsyncCallStackTracker::AsyncCallChain> AsyncCallStackTracker::createAsyncCallChain(const String& description, const ScriptValue& callFrames)
+PassRefPtr<AsyncCallStackTracker::AsyncCallChain> AsyncCallStackTracker::createAsyncCallChain(const String& description, const StackTrace& callFrames)
 {
     RefPtr<AsyncCallChain> chain = adoptRef(m_currentAsyncCallChain ? new AsyncCallStackTracker::AsyncCallChain(*m_currentAsyncCallChain) : new AsyncCallStackTracker::AsyncCallChain());
     ensureMaxAsyncCallChainDepth(chain.get(), m_maxAsyncCallStackDepth - 1);
     chain->m_callStacks.prepend(adoptRef(new AsyncCallStackTracker::AsyncCallStack(description, callFrames)));
     return chain.release();
 }
 
 void AsyncCallStackTracker::setCurrentAsyncCallChain(PassRefPtr<AsyncCallChain> chain)
 {
     if (V8RecursionScope::recursionLevel(v8::Isolate::GetCurrent())) {
@@ skipping 14 matching lines @@
     if (!m_nestedAsyncCallCount)
         m_currentAsyncCallChain.clear();
 }
 
 void AsyncCallStackTracker::ensureMaxAsyncCallChainDepth(AsyncCallChain* chain, unsigned maxDepth)
 {
     while (chain->m_callStacks.size() > maxDepth)
         chain->m_callStacks.removeLast();
 }
 
-bool AsyncCallStackTracker::validateCallFrames(const ScriptValue& callFrames)
+bool AsyncCallStackTracker::validateCallFrames(const StackTrace& callFrames)
 {
-    return !callFrames.isEmpty();
+    return !callFrames.isNull();
 }
 
 AsyncCallStackTracker::ExecutionContextData* AsyncCallStackTracker::createContextDataIfNeeded(ExecutionContext* context)
 {
     ExecutionContextData* data = m_executionContextDataMap.get(context);
     if (!data) {
         data = new AsyncCallStackTracker::ExecutionContextData(this, context);
         m_executionContextDataMap.set(context, data);
     }
     return data;
 }
 
 void AsyncCallStackTracker::clear()
 {
     m_currentAsyncCallChain.clear();
     m_nestedAsyncCallCount = 0;
     ExecutionContextDataMap copy;
     m_executionContextDataMap.swap(copy);
     for (ExecutionContextDataMap::const_iterator it = copy.begin(); it != copy.end(); ++it)
         delete it->value;
 }
 
 } // namespace WebCore