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

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

Issue 587213003: [ServiceWorker] Plumbing the request mode from the renderer to the ServiceWorker. [1/2 blink] (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
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 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 // current document. If this reload is a client redirect (e.g., location.rel oad()), 818 // current document. If this reload is a client redirect (e.g., location.rel oad()),
819 // it was initiated by something in the current document and should 819 // it was initiated by something in the current document and should
820 // therefore show the current document's url as the referrer. 820 // therefore show the current document's url as the referrer.
821 if (clientRedirectPolicy == ClientRedirect) 821 if (clientRedirectPolicy == ClientRedirect)
822 request.setHTTPReferrer(Referrer(m_frame->document()->outgoingReferrer() , m_frame->document()->referrerPolicy())); 822 request.setHTTPReferrer(Referrer(m_frame->document()->outgoingReferrer() , m_frame->document()->referrerPolicy()));
823 823
824 if (!overrideURL.isEmpty()) { 824 if (!overrideURL.isEmpty()) {
825 request.setURL(overrideURL); 825 request.setURL(overrideURL);
826 request.clearHTTPReferrer(); 826 request.clearHTTPReferrer();
827 } 827 }
828 request.setSkipServiceWorker(reloadPolicy == EndToEndReload); 828 if (reloadPolicy == EndToEndReload)
829 request.setServiceWorkerRequestMode(WebURLRequest::ServiceWorkerRequestM odeSkip);
829 830
830 FrameLoadType type = reloadPolicy == EndToEndReload ? FrameLoadTypeReloadFro mOrigin : FrameLoadTypeReload; 831 FrameLoadType type = reloadPolicy == EndToEndReload ? FrameLoadTypeReloadFro mOrigin : FrameLoadTypeReload;
831 loadWithNavigationAction(NavigationAction(request, type), type, nullptr, Sub stituteData(), CheckContentSecurityPolicy, clientRedirectPolicy, overrideEncodin g); 832 loadWithNavigationAction(NavigationAction(request, type), type, nullptr, Sub stituteData(), CheckContentSecurityPolicy, clientRedirectPolicy, overrideEncodin g);
832 } 833 }
833 834
834 void FrameLoader::stopAllLoaders() 835 void FrameLoader::stopAllLoaders()
835 { 836 {
836 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal) 837 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal)
837 return; 838 return;
838 839
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1480 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1481 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1481 Frame* parentFrame = m_frame->tree().parent(); 1482 Frame* parentFrame = m_frame->tree().parent();
1482 if (parentFrame && parentFrame->isLocalFrame()) 1483 if (parentFrame && parentFrame->isLocalFrame())
1483 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1484 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1484 if (FrameOwner* frameOwner = m_frame->owner()) 1485 if (FrameOwner* frameOwner = m_frame->owner())
1485 flags |= frameOwner->sandboxFlags(); 1486 flags |= frameOwner->sandboxFlags();
1486 return flags; 1487 return flags;
1487 } 1488 }
1488 1489
1489 } // namespace blink 1490 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/modules/serviceworkers/FetchRequestData.cpp » ('j') | public/platform/WebURLRequest.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698