OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 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 |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 return KURL(baseURL, urlString); | 139 return KURL(baseURL, urlString); |
140 } | 140 } |
141 | 141 |
142 void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data, const Str
ing& title, const String& urlString, SameDocumentNavigationSource sameDocumentNa
vigationSource, ExceptionState& es) | 142 void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data, const Str
ing& title, const String& urlString, SameDocumentNavigationSource sameDocumentNa
vigationSource, ExceptionState& es) |
143 { | 143 { |
144 if (!m_frame || !m_frame->page()) | 144 if (!m_frame || !m_frame->page()) |
145 return; | 145 return; |
146 | 146 |
147 KURL fullURL = urlForState(urlString); | 147 KURL fullURL = urlForState(urlString); |
148 if (!fullURL.isValid() || !m_frame->document()->securityOrigin()->canRequest
(fullURL)) { | 148 if (!fullURL.isValid() || !m_frame->document()->securityOrigin()->canRequest
(fullURL)) { |
149 es.throwDOMException(SecurityError, "A history state object with URL '"
+ fullURL.elidedString() + "' cannot be created in a document with origin '" + m
_frame->document()->securityOrigin()->toString() + "'."); | 149 // We can safely expose the URL to JavaScript, as a) no redirection take
s place: JavaScript already had this URL, b) JavaScript can only access a same-o
rigin History object. |
| 150 es.throwSecurityError("A history state object with URL '" + fullURL.elid
edString() + "' cannot be created in a document with origin '" + m_frame->docume
nt()->securityOrigin()->toString() + "'."); |
150 return; | 151 return; |
151 } | 152 } |
152 m_frame->loader()->updateForSameDocumentNavigation(fullURL, sameDocumentNavi
gationSource, data, title); | 153 m_frame->loader()->updateForSameDocumentNavigation(fullURL, sameDocumentNavi
gationSource, data, title); |
153 } | 154 } |
154 | 155 |
155 } // namespace WebCore | 156 } // namespace WebCore |
OLD | NEW |