OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2005, 2006, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 2008, 2011 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "core/loader/HistoryItem.h" | 26 #include "core/loader/HistoryItem.h" |
27 | 27 |
28 #include "core/dom/Document.h" | |
29 #include "core/html/forms/FormController.h" | 28 #include "core/html/forms/FormController.h" |
30 #include "platform/loader/fetch/ResourceRequest.h" | 29 #include "platform/loader/fetch/ResourceRequest.h" |
31 #include "platform/weborigin/SecurityPolicy.h" | 30 #include "platform/weborigin/SecurityPolicy.h" |
32 #include "wtf/Assertions.h" | 31 #include "wtf/Assertions.h" |
33 #include "wtf/CurrentTime.h" | 32 #include "wtf/CurrentTime.h" |
34 #include "wtf/text/CString.h" | 33 #include "wtf/text/CString.h" |
35 | 34 |
36 namespace blink { | 35 namespace blink { |
37 | 36 |
38 static long long generateSequenceNumber() { | 37 static long long generateSequenceNumber() { |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 } | 154 } |
156 | 155 |
157 void HistoryItem::setFormContentType(const AtomicString& formContentType) { | 156 void HistoryItem::setFormContentType(const AtomicString& formContentType) { |
158 m_formContentType = formContentType; | 157 m_formContentType = formContentType; |
159 } | 158 } |
160 | 159 |
161 EncodedFormData* HistoryItem::formData() { | 160 EncodedFormData* HistoryItem::formData() { |
162 return m_formData.get(); | 161 return m_formData.get(); |
163 } | 162 } |
164 | 163 |
165 bool HistoryItem::isCurrentDocument(Document* doc) const { | 164 ResourceRequest HistoryItem::generateResourceRequest( |
166 // FIXME: We should find a better way to check if this is the current | 165 WebCachePolicy cachePolicy) { |
167 // document. | 166 ResourceRequest request(m_urlString); |
168 return equalIgnoringFragmentIdentifier(url(), doc->url()); | 167 request.setHTTPReferrer(m_referrer); |
| 168 request.setCachePolicy(cachePolicy); |
| 169 if (m_formData) { |
| 170 request.setHTTPMethod(HTTPNames::POST); |
| 171 request.setHTTPBody(m_formData); |
| 172 request.setHTTPContentType(m_formContentType); |
| 173 request.addHTTPOriginIfNeeded(m_referrer.referrer); |
| 174 } |
| 175 return request; |
169 } | 176 } |
170 | 177 |
171 DEFINE_TRACE(HistoryItem) { | 178 DEFINE_TRACE(HistoryItem) { |
172 visitor->trace(m_documentState); | 179 visitor->trace(m_documentState); |
173 } | 180 } |
174 | 181 |
175 } // namespace blink | 182 } // namespace blink |
OLD | NEW |