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

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

Issue 318673002: Use the ReloadBypassingCache policy (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Changed test name Created 6 years, 6 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 | « Source/core/loader/FrameFetchContext.cpp ('k') | Source/web/tests/WebFrameTest.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 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 FrameLoader::addHTTPOriginIfNeeded(request, securityOrigin->toAtomicStri ng()); 779 FrameLoader::addHTTPOriginIfNeeded(request, securityOrigin->toAtomicStri ng());
780 } 780 }
781 return request; 781 return request;
782 } 782 }
783 783
784 void FrameLoader::reload(ReloadPolicy reloadPolicy, const KURL& overrideURL, con st AtomicString& overrideEncoding) 784 void FrameLoader::reload(ReloadPolicy reloadPolicy, const KURL& overrideURL, con st AtomicString& overrideEncoding)
785 { 785 {
786 if (!m_currentItem) 786 if (!m_currentItem)
787 return; 787 return;
788 788
789 ResourceRequest request = requestFromHistoryItem(m_currentItem.get(), Reload IgnoringCacheData); 789 ResourceRequestCachePolicy cachePolicy = reloadPolicy == EndToEndReload ? Re loadBypassingCache : ReloadIgnoringCacheData;
790 ResourceRequest request = requestFromHistoryItem(m_currentItem.get(), cacheP olicy);
790 if (!overrideURL.isEmpty()) { 791 if (!overrideURL.isEmpty()) {
791 request.setURL(overrideURL); 792 request.setURL(overrideURL);
792 request.clearHTTPReferrer(); 793 request.clearHTTPReferrer();
793 } 794 }
794 795
795 FrameLoadType type = reloadPolicy == EndToEndReload ? FrameLoadTypeReloadFro mOrigin : FrameLoadTypeReload; 796 FrameLoadType type = reloadPolicy == EndToEndReload ? FrameLoadTypeReloadFro mOrigin : FrameLoadTypeReload;
796 loadWithNavigationAction(NavigationAction(request, type), type, nullptr, Sub stituteData(), NotClientRedirect, overrideEncoding); 797 loadWithNavigationAction(NavigationAction(request, type), type, nullptr, Sub stituteData(), NotClientRedirect, overrideEncoding);
797 } 798 }
798 799
799 void FrameLoader::stopAllLoaders() 800 void FrameLoader::stopAllLoaders()
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
1465 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1466 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1466 Frame* parentFrame = m_frame->tree().parent(); 1467 Frame* parentFrame = m_frame->tree().parent();
1467 if (parentFrame && parentFrame->isLocalFrame()) 1468 if (parentFrame && parentFrame->isLocalFrame())
1468 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1469 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1469 if (FrameOwner* frameOwner = m_frame->ownerElement()) 1470 if (FrameOwner* frameOwner = m_frame->ownerElement())
1470 flags |= frameOwner->sandboxFlags(); 1471 flags |= frameOwner->sandboxFlags();
1471 return flags; 1472 return flags;
1472 } 1473 }
1473 1474
1474 } // namespace WebCore 1475 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/FrameFetchContext.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698