Index: Source/core/xml/XMLHttpRequest.cpp |
diff --git a/Source/core/xml/XMLHttpRequest.cpp b/Source/core/xml/XMLHttpRequest.cpp |
index c043707688049ee47e6c2b286431a0b8c03a6bc4..08a1f557656a848252ddfd6d8823704789b20ffd 100644 |
--- a/Source/core/xml/XMLHttpRequest.cpp |
+++ b/Source/core/xml/XMLHttpRequest.cpp |
@@ -792,11 +792,14 @@ void XMLHttpRequest::createRequest(ExceptionState& exceptionState) |
// added after the request is started. |
m_uploadEventsAllowed = m_sameOriginRequest || uploadEvents || !isSimpleCrossOriginAccessRequest(m_method, m_requestHeaders); |
+ ExecutionContext* executionContext = this->executionContext(); |
+ ASSERT(executionContext); |
adamk
2014/04/02 17:16:42
Same here.
|
+ |
ResourceRequest request(m_url); |
request.setHTTPMethod(m_method); |
request.setTargetType(ResourceRequest::TargetIsXHR); |
- InspectorInstrumentation::willLoadXHR(executionContext(), this, this, m_method, m_url, m_async, m_requestEntityBody ? m_requestEntityBody->deepCopy() : nullptr, m_requestHeaders, m_includeCredentials); |
+ InspectorInstrumentation::willLoadXHR(executionContext, this, this, m_method, m_url, m_async, m_requestEntityBody ? m_requestEntityBody->deepCopy() : nullptr, m_requestHeaders, m_includeCredentials); |
if (m_requestEntityBody) { |
ASSERT(m_method != "GET"); |
@@ -815,7 +818,7 @@ void XMLHttpRequest::createRequest(ExceptionState& exceptionState) |
options.crossOriginRequestPolicy = UseAccessControl; |
options.securityOrigin = securityOrigin(); |
options.initiator = FetchInitiatorTypeNames::xmlhttprequest; |
- options.contentSecurityPolicyEnforcement = ContentSecurityPolicy::shouldBypassMainWorld(executionContext()) ? DoNotEnforceContentSecurityPolicy : EnforceConnectSrcDirective; |
+ options.contentSecurityPolicyEnforcement = ContentSecurityPolicy::shouldBypassMainWorld(executionContext) ? DoNotEnforceContentSecurityPolicy : EnforceConnectSrcDirective; |
// TODO(tsepez): Specify TreatAsActiveContent per http://crbug.com/305303. |
options.mixedContentBlockingTreatment = TreatAsPassiveContent; |
options.timeoutMilliseconds = m_timeoutMilliseconds; |
@@ -832,7 +835,7 @@ void XMLHttpRequest::createRequest(ExceptionState& exceptionState) |
// FIXME: Maybe we need to be able to send XMLHttpRequests from onunload, <http://bugs.webkit.org/show_bug.cgi?id=10904>. |
// FIXME: Maybe create() can return null for other reasons too? |
ASSERT(!m_loader); |
- m_loader = ThreadableLoader::create(executionContext(), this, request, options); |
+ m_loader = ThreadableLoader::create(*executionContext, this, request, options); |
if (m_loader) { |
// Neither this object nor the JavaScript wrapper should be deleted while |
// a request is in progress because we need to keep the listeners alive, |
@@ -840,7 +843,7 @@ void XMLHttpRequest::createRequest(ExceptionState& exceptionState) |
setPendingActivity(this); |
} |
} else { |
- ThreadableLoader::loadResourceSynchronously(executionContext(), request, *this, options); |
+ ThreadableLoader::loadResourceSynchronously(*executionContext, request, *this, options); |
} |
if (!m_exceptionCode && m_error) |