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

Side by Side Diff: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

Issue 2714423002: Rename SkipServiceWorker to ServiceWorkerMode (Closed)
Patch Set: typos-- Created 3 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org> 3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org>
4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org> 4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org>
5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved.
6 * Copyright (C) 2012 Intel Corporation 6 * Copyright (C) 2012 Intel Corporation
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 m_uploadEventsAllowed = 977 m_uploadEventsAllowed =
978 m_sameOriginRequest || uploadEvents || 978 m_sameOriginRequest || uploadEvents ||
979 !FetchUtils::isSimpleRequest(m_method, m_requestHeaders); 979 !FetchUtils::isSimpleRequest(m_method, m_requestHeaders);
980 980
981 ResourceRequest request(m_url); 981 ResourceRequest request(m_url);
982 request.setHTTPMethod(m_method); 982 request.setHTTPMethod(m_method);
983 request.setRequestContext(WebURLRequest::RequestContextXMLHttpRequest); 983 request.setRequestContext(WebURLRequest::RequestContextXMLHttpRequest);
984 request.setFetchCredentialsMode( 984 request.setFetchCredentialsMode(
985 includeCredentials ? WebURLRequest::FetchCredentialsModeInclude 985 includeCredentials ? WebURLRequest::FetchCredentialsModeInclude
986 : WebURLRequest::FetchCredentialsModeSameOrigin); 986 : WebURLRequest::FetchCredentialsModeSameOrigin);
987 request.setSkipServiceWorker(m_isIsolatedWorld 987 request.setServiceWorkerMode(m_isIsolatedWorld
988 ? WebURLRequest::SkipServiceWorker::All 988 ? WebURLRequest::ServiceWorkerMode::None
989 : WebURLRequest::SkipServiceWorker::None); 989 : WebURLRequest::ServiceWorkerMode::All);
990 request.setExternalRequestStateFromRequestorAddressSpace( 990 request.setExternalRequestStateFromRequestorAddressSpace(
991 executionContext.securityContext().addressSpace()); 991 executionContext.securityContext().addressSpace());
992 992
993 InspectorInstrumentation::willLoadXHR( 993 InspectorInstrumentation::willLoadXHR(
994 &executionContext, this, this, m_method, m_url, m_async, 994 &executionContext, this, this, m_method, m_url, m_async,
995 httpBody ? httpBody->deepCopy() : nullptr, m_requestHeaders, 995 httpBody ? httpBody->deepCopy() : nullptr, m_requestHeaders,
996 includeCredentials); 996 includeCredentials);
997 997
998 if (httpBody) { 998 if (httpBody) {
999 DCHECK_NE(m_method, HTTPNames::GET); 999 DCHECK_NE(m_method, HTTPNames::GET);
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after
1859 visitor->traceWrappers(m_responseDocument); 1859 visitor->traceWrappers(m_responseDocument);
1860 visitor->traceWrappers(m_responseArrayBuffer); 1860 visitor->traceWrappers(m_responseArrayBuffer);
1861 XMLHttpRequestEventTarget::traceWrappers(visitor); 1861 XMLHttpRequestEventTarget::traceWrappers(visitor);
1862 } 1862 }
1863 1863
1864 std::ostream& operator<<(std::ostream& ostream, const XMLHttpRequest* xhr) { 1864 std::ostream& operator<<(std::ostream& ostream, const XMLHttpRequest* xhr) {
1865 return ostream << "XMLHttpRequest " << static_cast<const void*>(xhr); 1865 return ostream << "XMLHttpRequest " << static_cast<const void*>(xhr);
1866 } 1866 }
1867 1867
1868 } // namespace blink 1868 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoader.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698