diff options
author | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 21:47:07 +0000 |
---|---|---|
committer | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 21:47:07 +0000 |
commit | 08dbb8be49a96fb2dc27e2a49488105d470c7bbe (patch) | |
tree | 651c2ac63081e1c6cc107908655886e47ae5fa9e /chrome/renderer | |
parent | 421fd14402ad720e3a248af741138436da982560 (diff) | |
download | chromium_src-08dbb8be49a96fb2dc27e2a49488105d470c7bbe.zip chromium_src-08dbb8be49a96fb2dc27e2a49488105d470c7bbe.tar.gz chromium_src-08dbb8be49a96fb2dc27e2a49488105d470c7bbe.tar.bz2 |
<webview>: Restore getProcessId()
It seems I broke getProcessId() in the refactorings. This CL
restores getProcessId().
BUG=166165
Test=WebViewTest.Shim_TestGetProcessId
Review URL: https://chromiumcodereview.appspot.com/18272002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/resources/extensions/web_view.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/renderer/resources/extensions/web_view.js b/chrome/renderer/resources/extensions/web_view.js index 91325a7..b0439eb 100644 --- a/chrome/renderer/resources/extensions/web_view.js +++ b/chrome/renderer/resources/extensions/web_view.js @@ -18,7 +18,6 @@ var WEB_VIEW_ATTRIBUTES = ['name', 'src', 'partition', 'autosize', 'minheight', // All exposed api methods for <webview>, these are forwarded to the browser // plugin. var WEB_VIEW_API_METHODS = [ - 'getProcessId', 'reload', 'stop', 'terminate' @@ -51,9 +50,10 @@ var WEB_VIEW_EXT_EVENTS = { fields: [] }, 'loadcommit': { - customHandler: function(WebView, event) { - WebView.currentEntryIndex_ = event.currentEntryIndex; - WebView.entryCount_ = event.entryCount; + customHandler: function(webview, event) { + webview.currentEntryIndex_ = event.currentEntryIndex; + webview.entryCount_ = event.entryCount; + webview.processId_ = event.processId; }, evt: loadCommitEvent, fields: ['url', 'isTopLevel'] @@ -90,6 +90,9 @@ WebView.prototype.entryCount_; /** @type {number} */ WebView.prototype.currentEntryIndex_; +/** @type {number} */ +WebView.prototype.processId_; + /** * @constructor */ @@ -187,6 +190,10 @@ WebView.prototype.setupWebviewNodeMethods_ = function() { webviewNode.go(1); }; + webviewNode['getProcessId'] = function() { + return self.processId_; + }; + webviewNode['go'] = function(relativeIndex) { var instanceId = browserPluginNode.getGuestInstanceId(); if (!instanceId) |