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 19 matching lines...) Expand all Loading... |
30 #include "bindings/v8/SerializedScriptValue.h" | 30 #include "bindings/v8/SerializedScriptValue.h" |
31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
32 #include "core/dom/ExceptionCode.h" | 32 #include "core/dom/ExceptionCode.h" |
33 #include "core/history/HistoryItem.h" | 33 #include "core/history/HistoryItem.h" |
34 #include "core/loader/DocumentLoader.h" | 34 #include "core/loader/DocumentLoader.h" |
35 #include "core/loader/FrameLoader.h" | 35 #include "core/loader/FrameLoader.h" |
36 #include "core/loader/FrameLoaderClient.h" | 36 #include "core/loader/FrameLoaderClient.h" |
37 #include "core/frame/Frame.h" | 37 #include "core/frame/Frame.h" |
38 #include "core/page/BackForwardClient.h" | 38 #include "core/page/BackForwardClient.h" |
39 #include "core/page/Page.h" | 39 #include "core/page/Page.h" |
40 #include "weborigin/KURL.h" | 40 #include "platform/weborigin/KURL.h" |
41 #include "weborigin/SecurityOrigin.h" | 41 #include "platform/weborigin/SecurityOrigin.h" |
42 #include "wtf/MainThread.h" | 42 #include "wtf/MainThread.h" |
43 | 43 |
44 namespace WebCore { | 44 namespace WebCore { |
45 | 45 |
46 History::History(Frame* frame) | 46 History::History(Frame* frame) |
47 : DOMWindowProperty(frame) | 47 : DOMWindowProperty(frame) |
48 , m_lastStateObjectRequested(0) | 48 , m_lastStateObjectRequested(0) |
49 { | 49 { |
50 ScriptWrappable::init(this); | 50 ScriptWrappable::init(this); |
51 } | 51 } |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 KURL fullURL = urlForState(urlString); | 150 KURL fullURL = urlForState(urlString); |
151 if (!fullURL.isValid() || !m_frame->document()->securityOrigin()->canRequest
(fullURL)) { | 151 if (!fullURL.isValid() || !m_frame->document()->securityOrigin()->canRequest
(fullURL)) { |
152 // 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. | 152 // 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. |
153 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() + "'."); | 153 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() + "'."); |
154 return; | 154 return; |
155 } | 155 } |
156 m_frame->loader().updateForSameDocumentNavigation(fullURL, sameDocumentNavig
ationSource, data, FrameLoader::DoNotUpdateBackForwardList); | 156 m_frame->loader().updateForSameDocumentNavigation(fullURL, sameDocumentNavig
ationSource, data, FrameLoader::DoNotUpdateBackForwardList); |
157 } | 157 } |
158 | 158 |
159 } // namespace WebCore | 159 } // namespace WebCore |
OLD | NEW |