| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 6 * (http://www.torchmobile.com/) | 6 * (http://www.torchmobile.com/) |
| 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 10 * Copyright (C) 2011 Google Inc. All rights reserved. | 10 * Copyright (C) 2011 Google Inc. All rights reserved. |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 type == FrameLoadTypeInitialHistoryLoad; | 114 type == FrameLoadTypeInitialHistoryLoad; |
| 115 } | 115 } |
| 116 | 116 |
| 117 bool isReloadLoadType(FrameLoadType type) { | 117 bool isReloadLoadType(FrameLoadType type) { |
| 118 return type == FrameLoadTypeReload || | 118 return type == FrameLoadTypeReload || |
| 119 type == FrameLoadTypeReloadMainResource || | 119 type == FrameLoadTypeReloadMainResource || |
| 120 type == FrameLoadTypeReloadBypassingCache; | 120 type == FrameLoadTypeReloadBypassingCache; |
| 121 } | 121 } |
| 122 | 122 |
| 123 static bool needsHistoryItemRestore(FrameLoadType type) { | 123 static bool needsHistoryItemRestore(FrameLoadType type) { |
| 124 if (!RuntimeEnabledFeatures:: | |
| 125 reloadwithoutSubResourceCacheRevalidationEnabled() && | |
| 126 type == FrameLoadTypeReloadMainResource) | |
| 127 return false; | |
| 128 // TODO(toyoshim): Shall we return true for FrameLoadTypeInitialHistoryLoad | 124 // TODO(toyoshim): Shall we return true for FrameLoadTypeInitialHistoryLoad |
| 129 // too? | 125 // too? |
| 130 return type == FrameLoadTypeBackForward || isReloadLoadType(type); | 126 return type == FrameLoadTypeBackForward || isReloadLoadType(type); |
| 131 } | 127 } |
| 132 | 128 |
| 133 // static | 129 // static |
| 134 ResourceRequest FrameLoader::resourceRequestFromHistoryItem( | 130 ResourceRequest FrameLoader::resourceRequestFromHistoryItem( |
| 135 HistoryItem* item, | 131 HistoryItem* item, |
| 136 WebCachePolicy cachePolicy) { | 132 WebCachePolicy cachePolicy) { |
| 137 RefPtr<EncodedFormData> formData = item->formData(); | 133 RefPtr<EncodedFormData> formData = item->formData(); |
| (...skipping 1819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1957 m_documentLoader ? m_documentLoader->url() : String()); | 1953 m_documentLoader ? m_documentLoader->url() : String()); |
| 1958 return tracedValue; | 1954 return tracedValue; |
| 1959 } | 1955 } |
| 1960 | 1956 |
| 1961 inline void FrameLoader::takeObjectSnapshot() const { | 1957 inline void FrameLoader::takeObjectSnapshot() const { |
| 1962 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1958 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1963 toTracedValue()); | 1959 toTracedValue()); |
| 1964 } | 1960 } |
| 1965 | 1961 |
| 1966 } // namespace blink | 1962 } // namespace blink |
| OLD | NEW |