Merge latest green inbound changeset and mozilla-central; a=merge
authorEd Morley <emorley@mozilla.com>
Fri, 06 Jun 2014 16:55:11 +0100
changeset 194444 7146e89a7b8333c76267d4d8fb40cc6cae552567
parent 194443 31c707eb3a4b5e747521aadd1eade1284bb9a8e9 (current diff)
parent 194324 c8288d0c7a1544a590a0cac9c39397ac10c8a45b (diff)
child 194520 c155a7dd2d70a6f4aed21ad621b8c0ba49e29304
child 194549 8dc8a55ea0592ea994414665ff67c15a9674d2f5
child 194608 078b39cfcf44bb6513d3ffbd2f38ecd00c4bce94
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-esr52@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone32.0a1
Merge latest green inbound changeset and mozilla-central; a=merge
--- a/b2g/chrome/content/devtools.js
+++ b/b2g/chrome/content/devtools.js
@@ -267,24 +267,17 @@ Target.prototype = {
    * widgets.
    */
   destroy: function target_destroy() {
     delete this.metrics;
     this._send({});
   },
 
   _send: function target_send(data) {
-    let frame = this.frame;
-
-    let systemapp = document.querySelector('#systemapp');
-    if (this.frame === systemapp) {
-      frame = getContentWindow();
-    }
-
-    shell.sendEvent(frame, 'developer-hud-update', Cu.cloneInto(data, target));
+    shell.sendEvent(this.frame, 'developer-hud-update', Cu.cloneInto(data, this.frame));
   }
 
 };
 
 
 /**
  * The Console Watcher tracks the following metrics in apps: reflows, warnings,
  * and errors, with security errors reported separately.
--- a/testing/tps/create_venv.py
+++ b/testing/tps/create_venv.py
@@ -33,19 +33,21 @@ See runtps --help for all options
 
 ***********************************************************************
 """
 virtualenv_url = 'https://raw.github.com/pypa/virtualenv/1.9.1/virtualenv.py'
 
 if sys.platform == 'win32':
     bin_name = os.path.join('Scripts', 'activate.bat')
     activate_env = os.path.join('Scripts', 'activate_this.py')
+    python_env = os.path.join('Scripts', 'python.exe')
 else:
     bin_name = os.path.join('bin', 'activate')
     activate_env = os.path.join('bin', 'activate_this.py')
+    python_env = os.path.join('bin', 'python')
 
 def main():
     parser = optparse.OptionParser('Usage: %prog [options] path_to_venv')
     parser.add_option('-p', '--python',
                       type='string',
                       dest='python',
                       metavar='PYTHON_BIN',
                       default=None,
@@ -60,23 +62,22 @@ def main():
     # Create a virtual environment
     urllib.urlretrieve(virtualenv_url, 'virtualenv.py')
     cmd_args = [sys.executable, 'virtualenv.py', target]
     if options.python:
         cmd_args.extend(['-p', options.python])
     subprocess.check_call(cmd_args)
 
     # Activate tps environment
-
     tps_env = os.path.join(target, activate_env)
     execfile(tps_env, dict(__file__=tps_env))
 
     # Install TPS in environment
-    subprocess.check_call(['python', os.path.join(here, 'setup.py'),
-                           'install'])
+    subprocess.check_call([os.path.join(target, python_env),
+                           os.path.join(here, 'setup.py'), 'install'])
 
     # Get the path to tests and extensions directory by checking check where
     # the tests and extensions directories are located
     sync_dir = os.path.abspath(os.path.join(here, '..', '..', 'services',
                                             'sync'))
     if os.path.exists(sync_dir):
         testdir = os.path.join(sync_dir, 'tests', 'tps')
         extdir = os.path.join(sync_dir, 'tps', 'extensions')