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

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

Issue 527703002: [ServiceWorker] Introduce skipServiceWorker flag to blink::WebURLRequest and blink::ResourceRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | Source/platform/exported/WebURLRequest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 // current document. If this reload is a client redirect (e.g., location.rel oad()), 828 // current document. If this reload is a client redirect (e.g., location.rel oad()),
829 // it was initiated by something in the current document and should 829 // it was initiated by something in the current document and should
830 // therefore show the current document's url as the referrer. 830 // therefore show the current document's url as the referrer.
831 if (clientRedirectPolicy == ClientRedirect) 831 if (clientRedirectPolicy == ClientRedirect)
832 request.setHTTPReferrer(Referrer(m_frame->document()->outgoingReferrer() , m_frame->document()->referrerPolicy())); 832 request.setHTTPReferrer(Referrer(m_frame->document()->outgoingReferrer() , m_frame->document()->referrerPolicy()));
833 833
834 if (!overrideURL.isEmpty()) { 834 if (!overrideURL.isEmpty()) {
835 request.setURL(overrideURL); 835 request.setURL(overrideURL);
836 request.clearHTTPReferrer(); 836 request.clearHTTPReferrer();
837 } 837 }
838 request.setSkipServiceWorker(reloadPolicy == EndToEndReload);
838 839
839 FrameLoadType type = reloadPolicy == EndToEndReload ? FrameLoadTypeReloadFro mOrigin : FrameLoadTypeReload; 840 FrameLoadType type = reloadPolicy == EndToEndReload ? FrameLoadTypeReloadFro mOrigin : FrameLoadTypeReload;
840 loadWithNavigationAction(NavigationAction(request, type), type, nullptr, Sub stituteData(), CheckContentSecurityPolicy, clientRedirectPolicy, overrideEncodin g); 841 loadWithNavigationAction(NavigationAction(request, type), type, nullptr, Sub stituteData(), CheckContentSecurityPolicy, clientRedirectPolicy, overrideEncodin g);
841 } 842 }
842 843
843 void FrameLoader::stopAllLoaders() 844 void FrameLoader::stopAllLoaders()
844 { 845 {
845 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal) 846 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal)
846 return; 847 return;
847 848
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1494 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1494 Frame* parentFrame = m_frame->tree().parent(); 1495 Frame* parentFrame = m_frame->tree().parent();
1495 if (parentFrame && parentFrame->isLocalFrame()) 1496 if (parentFrame && parentFrame->isLocalFrame())
1496 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1497 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1497 if (FrameOwner* frameOwner = m_frame->owner()) 1498 if (FrameOwner* frameOwner = m_frame->owner())
1498 flags |= frameOwner->sandboxFlags(); 1499 flags |= frameOwner->sandboxFlags();
1499 return flags; 1500 return flags;
1500 } 1501 }
1501 1502
1502 } // namespace blink 1503 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/platform/exported/WebURLRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698