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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 type == FrameLoadTypeInitialHistoryLoad; | 115 type == FrameLoadTypeInitialHistoryLoad; |
116 } | 116 } |
117 | 117 |
118 bool isReloadLoadType(FrameLoadType type) { | 118 bool isReloadLoadType(FrameLoadType type) { |
119 return type == FrameLoadTypeReload || | 119 return type == FrameLoadTypeReload || |
120 type == FrameLoadTypeReloadMainResource || | 120 type == FrameLoadTypeReloadMainResource || |
121 type == FrameLoadTypeReloadBypassingCache; | 121 type == FrameLoadTypeReloadBypassingCache; |
122 } | 122 } |
123 | 123 |
124 static bool needsHistoryItemRestore(FrameLoadType type) { | 124 static bool needsHistoryItemRestore(FrameLoadType type) { |
125 // TODO(toyoshim): Shall we return true for FrameLoadTypeInitialHistoryLoad | 125 // FrameLoadtypeInitialHistoryLoad is intentionally excluded. |
126 // too? | |
127 return type == FrameLoadTypeBackForward || isReloadLoadType(type); | 126 return type == FrameLoadTypeBackForward || isReloadLoadType(type); |
128 } | 127 } |
129 | 128 |
130 // static | 129 // static |
131 ResourceRequest FrameLoader::resourceRequestFromHistoryItem( | 130 ResourceRequest FrameLoader::resourceRequestFromHistoryItem( |
132 HistoryItem* item, | 131 HistoryItem* item, |
133 WebCachePolicy cachePolicy) { | 132 WebCachePolicy cachePolicy) { |
134 RefPtr<EncodedFormData> formData = item->formData(); | 133 RefPtr<EncodedFormData> formData = item->formData(); |
135 ResourceRequest request(item->url()); | 134 ResourceRequest request(item->url()); |
136 request.setHTTPReferrer(item->referrer()); | 135 request.setHTTPReferrer(item->referrer()); |
(...skipping 1822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1959 m_documentLoader ? m_documentLoader->url() : String()); | 1958 m_documentLoader ? m_documentLoader->url() : String()); |
1960 return tracedValue; | 1959 return tracedValue; |
1961 } | 1960 } |
1962 | 1961 |
1963 inline void FrameLoader::takeObjectSnapshot() const { | 1962 inline void FrameLoader::takeObjectSnapshot() const { |
1964 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1963 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
1965 toTracedValue()); | 1964 toTracedValue()); |
1966 } | 1965 } |
1967 | 1966 |
1968 } // namespace blink | 1967 } // namespace blink |
OLD | NEW |