| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 if (!NavigationDisablerForBeforeUnload::isNavigationAllowed()) | 163 if (!NavigationDisablerForBeforeUnload::isNavigationAllowed()) |
| 164 return; | 164 return; |
| 165 | 165 |
| 166 // We intentionally call reload() for the current frame if delta is zero. | 166 // We intentionally call reload() for the current frame if delta is zero. |
| 167 // Otherwise, navigation happens on the root frame. | 167 // Otherwise, navigation happens on the root frame. |
| 168 // This behavior is designed in the following spec. | 168 // This behavior is designed in the following spec. |
| 169 // https://html.spec.whatwg.org/multipage/browsers.html#dom-history-go | 169 // https://html.spec.whatwg.org/multipage/browsers.html#dom-history-go |
| 170 if (delta) | 170 if (delta) |
| 171 m_frame->loader().client()->navigateBackForward(delta); | 171 m_frame->loader().client()->navigateBackForward(delta); |
| 172 else | 172 else |
| 173 m_frame->reload(FrameLoadTypeReload, ClientRedirect); | 173 m_frame->reload(FrameLoadTypeReload, ClientRedirectPolicy::ClientRedirec
t); |
| 174 } | 174 } |
| 175 | 175 |
| 176 KURL History::urlForState(const String& urlString) | 176 KURL History::urlForState(const String& urlString) |
| 177 { | 177 { |
| 178 Document* document = m_frame->document(); | 178 Document* document = m_frame->document(); |
| 179 | 179 |
| 180 if (urlString.isNull()) | 180 if (urlString.isNull()) |
| 181 return document->url(); | 181 return document->url(); |
| 182 if (urlString.isEmpty()) | 182 if (urlString.isEmpty()) |
| 183 return document->baseURL(); | 183 return document->baseURL(); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 if (!canChangeToUrl(fullURL, m_frame->document()->getSecurityOrigin(), m_fra
me->document()->url())) { | 218 if (!canChangeToUrl(fullURL, m_frame->document()->getSecurityOrigin(), m_fra
me->document()->url())) { |
| 219 // 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. | 219 // 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. |
| 220 exceptionState.throwSecurityError("A history state object with URL '" +
fullURL.elidedString() + "' cannot be created in a document with origin '" + m_f
rame->document()->getSecurityOrigin()->toString() + "' and URL '" + m_frame->doc
ument()->url().elidedString() + "'."); | 220 exceptionState.throwSecurityError("A history state object with URL '" +
fullURL.elidedString() + "' cannot be created in a document with origin '" + m_f
rame->document()->getSecurityOrigin()->toString() + "' and URL '" + m_frame->doc
ument()->url().elidedString() + "'."); |
| 221 return; | 221 return; |
| 222 } | 222 } |
| 223 | 223 |
| 224 m_frame->loader().updateForSameDocumentNavigation(fullURL, SameDocumentNavig
ationHistoryApi, data, restorationType, type); | 224 m_frame->loader().updateForSameDocumentNavigation(fullURL, SameDocumentNavig
ationHistoryApi, data, restorationType, type); |
| 225 } | 225 } |
| 226 | 226 |
| 227 } // namespace blink | 227 } // namespace blink |
| OLD | NEW |