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

Side by Side Diff: Source/web/WebFrameImpl.cpp

Issue 123133006: Expose a cachePolicy parameter to loadHistoryItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 const ResourceRequest& resourceRequest = request.toResourceRequest(); 932 const ResourceRequest& resourceRequest = request.toResourceRequest();
933 933
934 if (resourceRequest.url().protocolIs("javascript")) { 934 if (resourceRequest.url().protocolIs("javascript")) {
935 loadJavaScriptURL(resourceRequest.url()); 935 loadJavaScriptURL(resourceRequest.url());
936 return; 936 return;
937 } 937 }
938 938
939 frame()->loader().load(FrameLoadRequest(0, resourceRequest)); 939 frame()->loader().load(FrameLoadRequest(0, resourceRequest));
940 } 940 }
941 941
942 void WebFrameImpl::loadHistoryItem(const WebHistoryItem& item) 942 void WebFrameImpl::loadHistoryItem(const WebHistoryItem& item, WebURLRequest::Ca chePolicy cachePolicy)
943 { 943 {
944 ASSERT(frame()); 944 ASSERT(frame());
945 RefPtr<HistoryItem> historyItem = PassRefPtr<HistoryItem>(item); 945 RefPtr<HistoryItem> historyItem = PassRefPtr<HistoryItem>(item);
946 ASSERT(historyItem); 946 ASSERT(historyItem);
947 frame()->page()->historyController().goToItem(historyItem.get()); 947 frame()->page()->historyController().goToItem(historyItem.get(), static_cast <ResourceRequestCachePolicy>(cachePolicy));
948 } 948 }
949 949
950 void WebFrameImpl::loadData(const WebData& data, const WebString& mimeType, cons t WebString& textEncoding, const WebURL& baseURL, const WebURL& unreachableURL, bool replace) 950 void WebFrameImpl::loadData(const WebData& data, const WebString& mimeType, cons t WebString& textEncoding, const WebURL& baseURL, const WebURL& unreachableURL, bool replace)
951 { 951 {
952 ASSERT(frame()); 952 ASSERT(frame());
953 953
954 // If we are loading substitute data to replace an existing load, then 954 // If we are loading substitute data to replace an existing load, then
955 // inherit all of the properties of that original request. This way, 955 // inherit all of the properties of that original request. This way,
956 // reload will re-attempt the original request. It is essential that 956 // reload will re-attempt the original request. It is essential that
957 // we only do this when there is an unreachableURL since a non-empty 957 // we only do this when there is an unreachableURL since a non-empty
(...skipping 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after
2490 2490
2491 // There is a possibility that the frame being detached was the only 2491 // There is a possibility that the frame being detached was the only
2492 // pending one. We need to make sure final replies can be sent. 2492 // pending one. We need to make sure final replies can be sent.
2493 flushCurrentScopingEffort(m_findRequestIdentifier); 2493 flushCurrentScopingEffort(m_findRequestIdentifier);
2494 2494
2495 cancelPendingScopingEffort(); 2495 cancelPendingScopingEffort();
2496 } 2496 }
2497 } 2497 }
2498 2498
2499 } // namespace blink 2499 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698