diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 20:37:19 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 20:37:19 +0000 |
| commit | f3f44c03f4eb3abc0dfed7c70b54552b1174f0fe (patch) | |
| tree | b966d06b4c95c222a6215bd2ab29315b8bafa2ca /remoting | |
| parent | 58f8a1f6fcaea24eaca16131dc43da9d8179ba47 (diff) | |
| download | chromium_src-f3f44c03f4eb3abc0dfed7c70b54552b1174f0fe.zip chromium_src-f3f44c03f4eb3abc0dfed7c70b54552b1174f0fe.tar.gz chromium_src-f3f44c03f4eb3abc0dfed7c70b54552b1174f0fe.tar.bz2 | |
Use unprefixed Page Visibility API in tests, etc.
We support the unprefixed API now. Use those instead of or in addition to the
prefixed version, as appropriate.
BUG=318942
TEST=no behavior change
Review URL: https://codereview.chromium.org/61473004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/webapp/client_screen.js | 3 | ||||
| -rw-r--r-- | remoting/webapp/jscompiler_hacks.js | 3 | ||||
| -rw-r--r-- | remoting/webapp/ui_mode.js | 11 |
3 files changed, 14 insertions, 3 deletions
diff --git a/remoting/webapp/client_screen.js b/remoting/webapp/client_screen.js index f56643c..17c1188 100644 --- a/remoting/webapp/client_screen.js +++ b/remoting/webapp/client_screen.js @@ -57,7 +57,8 @@ remoting.onResize = function() { */ remoting.onVisibilityChanged = function() { if (remoting.clientSession) { - remoting.clientSession.pauseVideo(document.webkitHidden); + remoting.clientSession.pauseVideo( + ('hidden' in document) ? document.hidden : document.webkitHidden); } } diff --git a/remoting/webapp/jscompiler_hacks.js b/remoting/webapp/jscompiler_hacks.js index 94c3ba1..53b46be 100644 --- a/remoting/webapp/jscompiler_hacks.js +++ b/remoting/webapp/jscompiler_hacks.js @@ -12,6 +12,9 @@ Document.prototype.activeElement; /** @type {Array.<HTMLElement>} */ Document.prototype.all; +/** @type {boolean} */ +Document.prototype.hidden; + /** @type {function(string): void} */ Document.prototype.execCommand = function(command) {}; diff --git a/remoting/webapp/ui_mode.js b/remoting/webapp/ui_mode.js index 8567493..2f3d178 100644 --- a/remoting/webapp/ui_mode.js +++ b/remoting/webapp/ui_mode.js @@ -122,11 +122,18 @@ remoting.setMode = function(mode) { if (mode == remoting.AppMode.IN_SESSION) { document.removeEventListener('keydown', remoting.ConnectionStats.onKeydown, false); - document.addEventListener('webkitvisibilitychange', - remoting.onVisibilityChanged, false); + if ('hidden' in document) { + document.addEventListener('visibilitychange', + remoting.onVisibilityChanged, false); + } else { + document.addEventListener('webkitvisibilitychange', + remoting.onVisibilityChanged, false); + } } else { document.addEventListener('keydown', remoting.ConnectionStats.onKeydown, false); + document.removeEventListener('visibilitychange', + remoting.onVisibilityChanged, false); document.removeEventListener('webkitvisibilitychange', remoting.onVisibilityChanged, false); // TODO(jamiewalch): crbug.com/252796: Remove this once crbug.com/240772 |