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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 if (clientRedirectPolicy == ClientRedirectPolicy::ClientRedirect) { 166 if (clientRedirectPolicy == ClientRedirectPolicy::ClientRedirect) {
167 request.setHTTPReferrer(SecurityPolicy::generateReferrer( 167 request.setHTTPReferrer(SecurityPolicy::generateReferrer(
168 m_frame->document()->getReferrerPolicy(), m_frame->document()->url(), 168 m_frame->document()->getReferrerPolicy(), m_frame->document()->url(),
169 m_frame->document()->outgoingReferrer())); 169 m_frame->document()->outgoingReferrer()));
170 } 170 }
171 171
172 if (!overrideURL.isEmpty()) { 172 if (!overrideURL.isEmpty()) {
173 request.setURL(overrideURL); 173 request.setURL(overrideURL);
174 request.clearHTTPReferrer(); 174 request.clearHTTPReferrer();
175 } 175 }
176 request.setSkipServiceWorker(frameLoadType == 176 request.setServiceWorkerMode(frameLoadType ==
177 FrameLoadTypeReloadBypassingCache 177 FrameLoadTypeReloadBypassingCache
178 ? WebURLRequest::SkipServiceWorker::All 178 ? WebURLRequest::ServiceWorkerMode::None
179 : WebURLRequest::SkipServiceWorker::None); 179 : WebURLRequest::ServiceWorkerMode::All);
180 return request; 180 return request;
181 } 181 }
182 182
183 FrameLoader::FrameLoader(LocalFrame* frame) 183 FrameLoader::FrameLoader(LocalFrame* frame)
184 : m_frame(frame), 184 : m_frame(frame),
185 m_progressTracker(ProgressTracker::create(frame)), 185 m_progressTracker(ProgressTracker::create(frame)),
186 m_inStopAllLoaders(false), 186 m_inStopAllLoaders(false),
187 m_checkTimer(TaskRunnerHelper::get(TaskType::Networking, frame), 187 m_checkTimer(TaskRunnerHelper::get(TaskType::Networking, frame),
188 this, 188 this,
189 &FrameLoader::checkTimerFired), 189 &FrameLoader::checkTimerFired),
(...skipping 1846 matching lines...) Expand 10 before | Expand all | Expand 10 after
2036 m_isNavigationHandledByClient = true; 2036 m_isNavigationHandledByClient = true;
2037 InspectorInstrumentation::frameScheduledClientNavigation(m_frame); 2037 InspectorInstrumentation::frameScheduledClientNavigation(m_frame);
2038 } 2038 }
2039 2039
2040 void FrameLoader::clearNavigationHandledByClient() { 2040 void FrameLoader::clearNavigationHandledByClient() {
2041 m_isNavigationHandledByClient = false; 2041 m_isNavigationHandledByClient = false;
2042 InspectorInstrumentation::frameClearedScheduledClientNavigation(m_frame); 2042 InspectorInstrumentation::frameClearedScheduledClientNavigation(m_frame);
2043 } 2043 }
2044 2044
2045 } // namespace blink 2045 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698