summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 22:50:00 +0000
committerjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 22:50:00 +0000
commita9140f5b771cadc19fe800db056f829603d934f7 (patch)
treeae5e961bee48303fee622e03843928ad9762a9d9 /remoting
parentf6fd2a3d348bd8bd06c6999426d0295d363eb9c9 (diff)
downloadchromium_src-a9140f5b771cadc19fe800db056f829603d934f7.zip
chromium_src-a9140f5b771cadc19fe800db056f829603d934f7.tar.gz
chromium_src-a9140f5b771cadc19fe800db056f829603d934f7.tar.bz2
Fix bump-scroll on Windows.
BUG=132104 TEST=Manual Review URL: https://chromiumcodereview.appspot.com/10537113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/client_session.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/webapp/client_session.js b/remoting/webapp/client_session.js
index 98a5652..fbd38d3 100644
--- a/remoting/webapp/client_session.js
+++ b/remoting/webapp/client_session.js
@@ -639,7 +639,10 @@ remoting.ClientSession.prototype.toggleFullScreen_ = function() {
this.enableBumpScroll_(false);
} else {
document.body.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
- this.enableBumpScroll_(true);
+ // Don't enable bump scrolling immediately because it can result in
+ // onMouseMove firing before the webkitIsFullScreen property can be
+ // read safely (crbug.com/132180).
+ window.setTimeout(this.enableBumpScroll_.bind(this, true), 0);
}
};