chromium/src
0
Fork 0
Code Activity

Keep original pushState() method for use in JS overwrite

Browse Source 
Keep original pushState() method for use in JS overwrite of
window.history.pushState. Previously, the original replaceState was
used because back/forward navigation was performed wholly by the native
history stack. Using the original pushState keeps WKWebView's
back forward list in sync with the native stack.

BUG=564633

Review URL: https://codereview.chromium.org/1541023002

Cr-Commit-Position: refs/heads/master@{#367378}
This commit is contained in:
jyquinn
2016-01-04 13:43:28 -08:00
committed by Commit bot
parent 2bf608a167
commit 66238f7e78
1 changed files with 8 additions and 5 deletions

13
ios/web/web_state/js/resources/core.js

@ -375,9 +375,10 @@ goog.require('__crWeb.message');
}, 0);
};
// Keep the original replaceState() method. It's needed to update UIWebView's
// URL and window.history.state property during history navigations that don't
// cause a page load.
// Keep the original pushState() and replaceState() methods. It's needed to
// update the web view's URL and window.history.state property during history
// navigations that don't cause a page load.
var originalWindowHistoryPushState = window.history.pushState;
var originalWindowHistoryReplaceState = window.history.replaceState;
__gCrWeb['replaceWebViewURL'] = function(url, stateObject) {
originalWindowHistoryReplaceState.call(history, stateObject, '', url);
@ -401,7 +402,8 @@ goog.require('__crWeb.message');
typeof(stateObject) == 'undefined' ? '' :
__gCrWeb.common.JSONStringify(stateObject);
pageUrl = pageUrl || window.location.href;
originalWindowHistoryReplaceState.call(history, stateObject, '', pageUrl);
originalWindowHistoryPushState.call(history, stateObject,
pageTitle, pageUrl);
invokeOnHost_({'command': 'window.history.didPushState',
'stateObject': serializedState,
'baseUrl': document.baseURI,
@ -416,7 +418,8 @@ goog.require('__crWeb.message');
typeof(stateObject) == 'undefined' ? '' :
__gCrWeb.common.JSONStringify(stateObject);
pageUrl = pageUrl || window.location.href;
originalWindowHistoryReplaceState.call(history, stateObject, '', pageUrl);
originalWindowHistoryReplaceState.call(history, stateObject,
pageTitle, pageUrl);
invokeOnHost_({'command': 'window.history.didReplaceState',
'stateObject': serializedState,
'baseUrl': document.baseURI,