summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 22:22:52 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 22:22:52 +0000
commit5ecfbdd7b3f61d372536bd68cc9a372beeec9dfb (patch)
tree0206724f7a837d1295bf8ce867606ab1ae842551 /remoting
parent259676acb89a03c81cab8bbd29325ff2e1fe2973 (diff)
downloadchromium_src-5ecfbdd7b3f61d372536bd68cc9a372beeec9dfb.zip
chromium_src-5ecfbdd7b3f61d372536bd68cc9a372beeec9dfb.tar.gz
chromium_src-5ecfbdd7b3f61d372536bd68cc9a372beeec9dfb.tar.bz2
Fix up flicker, and parsing by Xcode.
The javascript as written had trouble being parsed by the Xcode IDE due to the // in the regexp. By turning off the height:100% in the css, we don't redraw the entire screen every time we update the bandwidth stats. BUG=none TEST=Make a connection and turn on Quartz Debug on Mac. Turn on Flash screen updates. The entire screen should not flash once per second. Review URL: http://codereview.chromium.org/7008020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/me2mom/main.css1
-rw-r--r--remoting/webapp/me2mom/remoting_session.js3
2 files changed, 2 insertions, 2 deletions
diff --git a/remoting/webapp/me2mom/main.css b/remoting/webapp/me2mom/main.css
index d86f3ef..ffee767 100644
--- a/remoting/webapp/me2mom/main.css
+++ b/remoting/webapp/me2mom/main.css
@@ -90,7 +90,6 @@ h1 {
-webkit-user-select: none;
overflow: auto;
width: 100%;
- height: 100%;
}
.gaia_font {
diff --git a/remoting/webapp/me2mom/remoting_session.js b/remoting/webapp/me2mom/remoting_session.js
index 23e8ea7..1177ca5 100644
--- a/remoting/webapp/me2mom/remoting_session.js
+++ b/remoting/webapp/me2mom/remoting_session.js
@@ -118,7 +118,8 @@ function init() {
remoting.plugin = plugin;
// Only allow https connections to the httpXmppProxy.
- if (remoting.httpXmppProxy.search(/^ *https:\/\//) == -1) {
+ var regExp = /^ *https:\/\//;
+ if (remoting.httpXmppProxy.search(regExp) == -1) {
addToDebugLog('Aborting. httpXmppProxy does not specify https protocol: ' +
remoting.httpXmppProxy);
return;