diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-29 01:37:43 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-29 01:37:43 +0000 |
commit | 6d4fa5f6a1fd264999f23294d02acf637a06bb94 (patch) | |
tree | caac86b5c232c52643e9468c7e796a8943e3fce8 /remoting/webapp | |
parent | da67d5d7cf16c47a2778519be4db2c72d2838de0 (diff) | |
download | chromium_src-6d4fa5f6a1fd264999f23294d02acf637a06bb94.zip chromium_src-6d4fa5f6a1fd264999f23294d02acf637a06bb94.tar.gz chromium_src-6d4fa5f6a1fd264999f23294d02acf637a06bb94.tar.bz2 |
Fix click-to-play support in chromoting client
Click-to-play was broken when the plugin resizing code was
changed to update plugin style instead of width/height fields
directly. Problem is that
remoting.ClientPlugin.showPluginForClickToPlay() was still using
trying to set width/height which are overridden by the CSS size.
NOTRY=true
Review URL: https://codereview.chromium.org/217353002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
-rw-r--r-- | remoting/webapp/client_plugin.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/webapp/client_plugin.js b/remoting/webapp/client_plugin.js index 65db925..4252b40 100644 --- a/remoting/webapp/client_plugin.js +++ b/remoting/webapp/client_plugin.js @@ -169,8 +169,8 @@ remoting.ClientPlugin.prototype.handleMessageMethod_ = function(message) { if (message.method == 'hello') { // Reset the size in case we had to enlarge it to support click-to-play. - this.plugin.width = 0; - this.plugin.height = 0; + this.plugin.style.width = '0px'; + this.plugin.style.height = '0px'; this.pluginApiVersion_ = getNumberAttr(message.data, 'apiVersion'); this.pluginApiMinVersion_ = getNumberAttr(message.data, 'apiMinVersion'); @@ -660,8 +660,8 @@ remoting.ClientPlugin.prototype.showPluginForClickToPlay_ = function() { if (!this.helloReceived_) { var width = 200; var height = 200; - this.plugin.width = width; - this.plugin.height = height; + this.plugin.style.width = width + 'px'; + this.plugin.style.height = height + 'px'; // Center the plugin just underneath the "Connnecting..." dialog. var parentNode = this.plugin.parentNode; var dialog = document.getElementById('client-dialog'); |