merge
authorBenjamin Stover <bstover@mozilla.com>
Wed, 15 Sep 2010 17:00:33 -0700
changeset 2008 d1675582c24c5706fcaa73181e5881f5591d48d6
parent 2007 0d57f96b37f64c4d07a5832f2b4fe9218ac1ece1 (current diff)
parent 1949 6c686e29333c5c908cc73a7471b19f2d317005ea (diff)
child 2009 ea70f3df70372d1061af62362c0461b18b3ec1ba
push id1714
push userdougt@mozilla.com
push dateThu, 16 Sep 2010 02:04:21 +0000
merge
app/mobile.js
chrome/content/bindings.xml
--- a/app/mobile.js
+++ b/app/mobile.js
@@ -350,18 +350,17 @@ pref("content.sink.pending_event_mode", 
 pref("content.sink.event_probe_rate", 5);
 pref("content.sink.interactive_deflect_count", 1000);
 pref("content.sink.perf_deflect_count", 10);
 pref("content.sink.interactive_parse_time",5000);
 pref("content.sink.perf_parse_time", 5000);
 pref("content.sink.interactive_time", 0);
 pref("content.sink.initial_perf_time", 0);
 
-pref("javascript.options.jit.content", true);
-pref("javascript.options.jit.chrome", true);
+pref("javascript.options.methodjit.chrome",  true);
 pref("javascript.options.mem.gc_frequency", 300);
 
 pref("dom.max_chrome_script_run_time", 30);
 pref("dom.max_script_run_time", 20);
 
 // JS error console
 pref("browser.console.showInPanel", false);
 
--- a/chrome/content/bindings.xml
+++ b/chrome/content/bindings.xml
@@ -1459,14 +1459,14 @@
           ]]>
         </setter>
       </property>
     </implementation>
   </binding>
 
   <binding id="select-button" extends="xul:box">
     <content>
-      <svg:svg width="11px" version="1.1" xmlns="http://www.w3.org/2000/svg" style="position: absolute; top: -moz-calc(50% - 2px); margin-left: 4px;">
+      <svg:svg width="11px" version="1.1" xmlns="http://www.w3.org/2000/svg" style="position: absolute; top: -moz-calc(50% - 2px); left: 4px;">
         <svg:polyline points="1 1 5 6 9 1" stroke="#414141" stroke-width="2" stroke-linecap="round" fill="transparent" stroke-linejoin="round"/>
       </svg:svg>
     </content>
   </binding>
 </bindings>