Bug 722812 - Don't send fake touch events on Gonk r=mwu
authorVivien Nicolas <21@vingtetun.org>
Wed, 08 Feb 2012 13:37:00 +0100
changeset 86424 4ef9464b39055ea0de176d55abe34f5a1b75d0a7
parent 86423 df7835caf208da8513eb28547e3723ee7e6f198a
child 86425 e1b987f0c07bc0cf2f5ced493a4538fd3f6060a0
push id5840
push uservnicolas@mozilla.com
push dateWed, 08 Feb 2012 13:36:10 +0000
treeherdermozilla-inbound@e1b987f0c07b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu
bugs722812
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 722812 - Don't send fake touch events on Gonk r=mwu
b2g/chrome/content/shell.xul
b2g/chrome/jar.mn
--- a/b2g/chrome/content/shell.xul
+++ b/b2g/chrome/content/shell.xul
@@ -12,17 +12,19 @@
         sizemode="fullscreen"
 #endif
         style="background: black; overflow: hidden;"
         onload="shell.start();"
         onunload="shell.stop();">
 
   <script type="application/javascript" src="chrome://browser/content/commandUtil.js"/>
   <script type="application/javascript" src="chrome://browser/content/shell.js"/>
+#ifndef MOZ_TOUCH
   <script type="application/javascript" src="chrome://browser/content/touch.js"/>
+#endif
 
   <commandset id="mainCommandSet">
     <command id="cmd_close" oncommand="CommandUpdater.doCommand(this.id);"/>
   </commandset>
 
   <browser id="homescreen" type="content-primary" flex="1" style="overflow: hidden;"/>
 </window>
 
--- a/b2g/chrome/jar.mn
+++ b/b2g/chrome/jar.mn
@@ -1,16 +1,18 @@
 #filter substitution
 
 chrome.jar:
 % content branding %content/branding/
 % content browser %content/
 
 * content/shell.xul                     (content/shell.xul)
   content/shell.js                      (content/shell.js)
+#ifndef MOZ_TOUCH
   content/touch.js                      (content/touch.js)
+#endif
   content/commandUtil.js                (content/commandUtil.js)
   content/httpd.js                      (content/httpd.js)
   content/webapi.js                     (content/webapi.js)
   content/content.css                   (content/content.css)
 
 % override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml
   content/netError.xhtml                (content/netError.xhtml)