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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2105503002: Skip foreign fetch when the skipServiceWorker flag is set on a request. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rephrase SkipServiceWorker comments. Created 4 years, 5 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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 // therefore show the current document's url as the referrer. 153 // therefore show the current document's url as the referrer.
154 if (clientRedirectPolicy == ClientRedirectPolicy::ClientRedirect) { 154 if (clientRedirectPolicy == ClientRedirectPolicy::ClientRedirect) {
155 request.setHTTPReferrer(Referrer(m_frame->document()->outgoingReferrer() , 155 request.setHTTPReferrer(Referrer(m_frame->document()->outgoingReferrer() ,
156 m_frame->document()->getReferrerPolicy())); 156 m_frame->document()->getReferrerPolicy()));
157 } 157 }
158 158
159 if (!overrideURL.isEmpty()) { 159 if (!overrideURL.isEmpty()) {
160 request.setURL(overrideURL); 160 request.setURL(overrideURL);
161 request.clearHTTPReferrer(); 161 request.clearHTTPReferrer();
162 } 162 }
163 request.setSkipServiceWorker(frameLoadType == FrameLoadTypeReloadBypassingCa che); 163 request.setSkipServiceWorker(frameLoadType == FrameLoadTypeReloadBypassingCa che ? WebURLRequest::SkipServiceWorker::All : WebURLRequest::SkipServiceWorker:: None);
164 return request; 164 return request;
165 } 165 }
166 166
167 FrameLoader::FrameLoader(LocalFrame* frame) 167 FrameLoader::FrameLoader(LocalFrame* frame)
168 : m_frame(frame) 168 : m_frame(frame)
169 , m_progressTracker(ProgressTracker::create(frame)) 169 , m_progressTracker(ProgressTracker::create(frame))
170 , m_loadType(FrameLoadTypeStandard) 170 , m_loadType(FrameLoadTypeStandard)
171 , m_inStopAllLoaders(false) 171 , m_inStopAllLoaders(false)
172 , m_checkTimer(this, &FrameLoader::checkTimerFired) 172 , m_checkTimer(this, &FrameLoader::checkTimerFired)
173 , m_didAccessInitialDocument(false) 173 , m_didAccessInitialDocument(false)
(...skipping 1444 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String()); 1618 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String());
1619 return tracedValue; 1619 return tracedValue;
1620 } 1620 }
1621 1621
1622 inline void FrameLoader::takeObjectSnapshot() const 1622 inline void FrameLoader::takeObjectSnapshot() const
1623 { 1623 {
1624 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value()); 1624 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value());
1625 } 1625 }
1626 1626
1627 } // namespace blink 1627 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698