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

Unified Diff: Source/core/inspector/AsyncCallTracker.cpp

Issue 1315413005: Fix assertion failure in ScriptRegexp::match (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed haraken's comments Created 5 years, 4 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
« no previous file with comments | « no previous file | Source/core/inspector/InspectorDebuggerAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/AsyncCallTracker.cpp
diff --git a/Source/core/inspector/AsyncCallTracker.cpp b/Source/core/inspector/AsyncCallTracker.cpp
index bbaed4b924e4e45fc556141117fe2807b558028a..cf928b9e6d0520cbc0ff51237037a91833d76eb8 100644
--- a/Source/core/inspector/AsyncCallTracker.cpp
+++ b/Source/core/inspector/AsyncCallTracker.cpp
@@ -41,8 +41,6 @@
#include "core/xmlhttprequest/XMLHttpRequest.h"
#include "core/xmlhttprequest/XMLHttpRequestUpload.h"
#include "platform/ScriptForbiddenScope.h"
-#include "wtf/MainThread.h"
-#include "wtf/Optional.h"
#include "wtf/text/StringBuilder.h"
#include "wtf/text/StringHash.h"
@@ -242,9 +240,7 @@ void AsyncCallTracker::didEnqueueEvent(EventTarget* eventTarget, Event* event)
{
ASSERT(eventTarget->executionContext());
ASSERT(m_debuggerAgent->trackingAsyncCalls());
- Optional<ScriptForbiddenScope::AllowUserAgentScript> allowScripting;
- if (isMainThread())
- allowScripting.emplace();
+ ScriptForbiddenScope::AllowUserAgentScript allowScripting;
int operationId = m_debuggerAgent->traceAsyncOperationStarting(event->type());
ExecutionContextData* data = createContextDataIfNeeded(eventTarget->executionContext());
data->m_eventCallChains.set(event, operationId);
@@ -310,9 +306,7 @@ void AsyncCallTracker::didEnqueueMutationRecord(ExecutionContext* context, Mutat
ExecutionContextData* data = createContextDataIfNeeded(context);
if (data->m_mutationObserverCallChains.contains(observer))
return;
- Optional<ScriptForbiddenScope::AllowUserAgentScript> allowScripting;
- if (isMainThread())
- allowScripting.emplace();
+ ScriptForbiddenScope::AllowUserAgentScript allowScripting;
int operationId = m_debuggerAgent->traceAsyncOperationStarting(enqueueMutationRecordName);
data->m_mutationObserverCallChains.set(observer, operationId);
}
« no previous file with comments | « no previous file | Source/core/inspector/InspectorDebuggerAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698