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

Side by Side Diff: third_party/WebKit/Source/modules/fetch/FetchManager.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/fetch/FetchManager.h" 5 #include "modules/fetch/FetchManager.h"
6 6
7 #include "bindings/core/v8/ExceptionState.h" 7 #include "bindings/core/v8/ExceptionState.h"
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "bindings/core/v8/ScriptState.h" 9 #include "bindings/core/v8/ScriptState.h"
10 #include "bindings/core/v8/V8ThrowException.h" 10 #include "bindings/core/v8/V8ThrowException.h"
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 ? m_executionContext->getReferrerPolicy() 757 ? m_executionContext->getReferrerPolicy()
758 : m_request->getReferrerPolicy(); 758 : m_request->getReferrerPolicy();
759 const String referrerString = 759 const String referrerString =
760 m_request->referrerString() == FetchRequestData::clientReferrerString() 760 m_request->referrerString() == FetchRequestData::clientReferrerString()
761 ? m_executionContext->outgoingReferrer() 761 ? m_executionContext->outgoingReferrer()
762 : m_request->referrerString(); 762 : m_request->referrerString();
763 // Note that generateReferrer generates |no-referrer| from |no-referrer| 763 // Note that generateReferrer generates |no-referrer| from |no-referrer|
764 // referrer string (i.e. String()). 764 // referrer string (i.e. String()).
765 request.setHTTPReferrer(SecurityPolicy::generateReferrer( 765 request.setHTTPReferrer(SecurityPolicy::generateReferrer(
766 referrerPolicy, m_request->url(), referrerString)); 766 referrerPolicy, m_request->url(), referrerString));
767 request.setSkipServiceWorker(m_isIsolatedWorld 767 request.setServiceWorkerMode(m_isIsolatedWorld
768 ? WebURLRequest::SkipServiceWorker::All 768 ? WebURLRequest::ServiceWorkerMode::None
769 : WebURLRequest::SkipServiceWorker::None); 769 : WebURLRequest::ServiceWorkerMode::All);
770 770
771 // "3. Append `Host`, ..." 771 // "3. Append `Host`, ..."
772 // FIXME: Implement this when the spec is fixed. 772 // FIXME: Implement this when the spec is fixed.
773 773
774 // "4.If |HTTPRequest|'s force Origin header flag is set, append `Origin`/ 774 // "4.If |HTTPRequest|'s force Origin header flag is set, append `Origin`/
775 // |HTTPRequest|'s origin, serialized and utf-8 encoded, to |HTTPRequest|'s 775 // |HTTPRequest|'s origin, serialized and utf-8 encoded, to |HTTPRequest|'s
776 // header list." 776 // header list."
777 // We set Origin header in updateRequestForAccessControl() called from 777 // We set Origin header in updateRequestForAccessControl() called from
778 // DocumentThreadableLoader::makeCrossOriginAccessRequest 778 // DocumentThreadableLoader::makeCrossOriginAccessRequest
779 779
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 m_loaders.erase(loader); 933 m_loaders.erase(loader);
934 loader->dispose(); 934 loader->dispose();
935 } 935 }
936 936
937 DEFINE_TRACE(FetchManager) { 937 DEFINE_TRACE(FetchManager) {
938 visitor->trace(m_loaders); 938 visitor->trace(m_loaders);
939 ContextLifecycleObserver::trace(visitor); 939 ContextLifecycleObserver::trace(visitor);
940 } 940 }
941 941
942 } // namespace blink 942 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698