| Index: Source/core/frame/History.cpp
|
| diff --git a/Source/core/frame/History.cpp b/Source/core/frame/History.cpp
|
| index b566a28ec695ef734a83ad1db9f7e4ddc548d1d5..3f393ed70cf09fcff231b0ccec3b4aca8f97bd56 100644
|
| --- a/Source/core/frame/History.cpp
|
| +++ b/Source/core/frame/History.cpp
|
| @@ -142,7 +142,7 @@ KURL History::urlForState(const String& urlString)
|
| return KURL(document->baseURL(), urlString);
|
| }
|
|
|
| -void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data, const String& /* title */, const String& urlString, SameDocumentNavigationSource sameDocumentNavigationSource, ExceptionState& es)
|
| +void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data, const String& /* title */, const String& urlString, SameDocumentNavigationSource sameDocumentNavigationSource, ExceptionState& exceptionState)
|
| {
|
| if (!m_frame || !m_frame->page())
|
| return;
|
| @@ -150,7 +150,7 @@ void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data, const Str
|
| KURL fullURL = urlForState(urlString);
|
| if (!fullURL.isValid() || !m_frame->document()->securityOrigin()->canRequest(fullURL)) {
|
| // We can safely expose the URL to JavaScript, as a) no redirection takes place: JavaScript already had this URL, b) JavaScript can only access a same-origin History object.
|
| - es.throwSecurityError("A history state object with URL '" + fullURL.elidedString() + "' cannot be created in a document with origin '" + m_frame->document()->securityOrigin()->toString() + "'.");
|
| + exceptionState.throwSecurityError("A history state object with URL '" + fullURL.elidedString() + "' cannot be created in a document with origin '" + m_frame->document()->securityOrigin()->toString() + "'.");
|
| return;
|
| }
|
| m_frame->loader().updateForSameDocumentNavigation(fullURL, sameDocumentNavigationSource, data, FrameLoader::DoNotUpdateBackForwardList);
|
|
|