| Index: third_party/WebKit/Source/core/fetch/Resource.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
|
| index 44b796f177b03c83f4d636175169ae649d575155..166ddccd0bba6f8d71a07ba49330403a21d4415f 100644
|
| --- a/third_party/WebKit/Source/core/fetch/Resource.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
|
| @@ -42,7 +42,6 @@
|
| #include "platform/tracing/TraceEvent.h"
|
| #include "platform/weborigin/KURL.h"
|
| #include "public/platform/Platform.h"
|
| -#include "public/platform/WebCachePolicy.h"
|
| #include "public/platform/WebScheduler.h"
|
| #include "public/platform/WebSecurityOrigin.h"
|
| #include "wtf/CurrentTime.h"
|
| @@ -410,7 +409,8 @@ void Resource::setDataBufferingPolicy(DataBufferingPolicy dataBufferingPolicy) {
|
| setEncodedSize(0);
|
| }
|
|
|
| -void Resource::error(const ResourceError& error) {
|
| +void Resource::error(const ResourceError& error,
|
| + ResourceFetcher* fetcherForReload) {
|
| DCHECK(!error.isNull());
|
| m_error = error;
|
| m_isRevalidating = false;
|
| @@ -426,7 +426,8 @@ void Resource::error(const ResourceError& error) {
|
| checkNotify();
|
| }
|
|
|
| -void Resource::finish(double loadFinishTime) {
|
| +void Resource::finish(double loadFinishTime,
|
| + ResourceFetcher* fetcherForReload) {
|
| DCHECK(!m_isRevalidating);
|
| m_loadFinishTime = loadFinishTime;
|
| if (!errorOccurred())
|
| @@ -927,18 +928,6 @@ String Resource::getMemoryDumpName() const {
|
| resourceTypeToString(getType(), options().initiatorInfo), m_identifier);
|
| }
|
|
|
| -void Resource::setCachePolicyBypassingCache() {
|
| - m_resourceRequest.setCachePolicy(WebCachePolicy::BypassingCache);
|
| -}
|
| -
|
| -void Resource::setLoFiStateOff() {
|
| - m_resourceRequest.setLoFiState(WebURLRequest::LoFiOff);
|
| -}
|
| -
|
| -void Resource::clearRangeRequestHeader() {
|
| - m_resourceRequest.clearHTTPHeaderField("range");
|
| -}
|
| -
|
| void Resource::revalidationSucceeded(
|
| const ResourceResponse& validatingResponse) {
|
| SECURITY_CHECK(m_redirectChain.isEmpty());
|
|
|