Bug 1068011 - Update TPS to use latest Mozmill 2.0.8. r=hskupin a=bustage, testonly DONTBUILD

services/sync/tps/extensions/mozmill/chrome.manifest

@@ -1,2 +1,2 @@
-resource mozmill resource/
+resource    mozmill                 resource/
 

services/sync/tps/extensions/mozmill/install.rdf

@@ -1,15 +1,11 @@
 <?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
    <Description about="urn:mozilla:install-manifest">
      <em:id>mozmill@mozilla.com</em:id>
      <em:name>Mozmill</em:name>
-     <em:version>2.0.6</em:version>
+     <em:version>2.0.8</em:version>
      <em:description>UI Automation tool for Mozilla applications</em:description>
      <em:unpack>true</em:unpack>
 
@@ -21,7 +17,7 @@
        <Description>
          <em:id>toolkit@mozilla.org</em:id>
          <em:minVersion>10.0</em:minVersion>
-         <em:maxVersion>31.*</em:maxVersion>
+         <em:maxVersion>38.*</em:maxVersion>
        </Description>
      </em:targetApplication>
    </Description>

services/sync/tps/extensions/mozmill/resource/driver/mozelement.js

@@ -540,7 +540,7 @@ MozMillElement.prototype.rightClick = function (aOffsetX, aOffsetY, aExpectedEve
  * @param {Touch[]} [aEvent.touches]
  *        A TouchList of all the Touch objects representing all current points
  *        of contact with the surface, regardless of target or changed status
- * @param {Number} [aEvent.type=*|touchstart|touchend|touchmove|touchcancel]
+ * @param {Number} [aEvent.type=*|touchstart|touchend|touchmove|touchenter|touchleave|touchcancel]
  *        The type of touch event that occurred
  * @param {Element} [aEvent.target]
  *        The target of the touches associated with this event. This target

services/sync/tps/extensions/mozmill/resource/modules/frame.js

@@ -33,6 +33,7 @@ var httpd = null;
 var persisted = {};
 
 var assert = new assertions.Assert();
+var expect = new assertions.Expect();
 
 var mozmill = undefined;
 var mozelement = undefined;
@@ -521,7 +522,7 @@ Collector.prototype.loadFile = function (path, collector) {
 
   var systemPrincipal = Services.scriptSecurityManager.getSystemPrincipal();
   var module = new Components.utils.Sandbox(systemPrincipal);
-  module.assert = new assertions.Assert();
+  module.assert = assert;
   module.Cc = Cc;
   module.Ci = Ci;
   module.Cr = Components.results;
@@ -530,7 +531,7 @@ Collector.prototype.loadFile = function (path, collector) {
   module.driver = moduleLoader.require("driver");
   module.elementslib = mozelement;
   module.errors = errors;
-  module.expect = new assertions.Expect();
+  module.expect = expect;
   module.findElement = mozelement;
   module.log = log;
   module.mozmill = mozmill;
@@ -541,7 +542,9 @@ Collector.prototype.loadFile = function (path, collector) {
       rootPaths: [Services.io.newFileURI(file.parent).spec,
                   "resource://mozmill/modules/"],
       defaultPrincipal: "system",
-      globals : { mozmill: mozmill,
+      globals : { assert: assert,
+                  expect: expect,
+                  mozmill: mozmill,
                   elementslib: mozelement,      // This a quick hack to maintain backwards compatibility with 1.5.x
                   findElement: mozelement,
                   persisted: persisted,

services/sync/tps/extensions/mozmill/resource/stdlib/EventUtils.js

@@ -317,9 +317,8 @@ function synthesizeTouchAtCenter(aTarget, aEvent, aWindow)
  *
  * aEvent is an object which may contain the properties:
  *   shiftKey, ctrlKey, altKey, metaKey, accessKey, deltaX, deltaY, deltaZ,
- *   deltaMode, lineOrPageDeltaX, lineOrPageDeltaY, isMomentum,
- *   isNoLineOrPageDelta, isCustomizedByPrefs, expectedOverflowDeltaX,
- *   expectedOverflowDeltaY
+ *   deltaMode, lineOrPageDeltaX, lineOrPageDeltaY, isMomentum, isPixelOnlyDevice,
+ *   isCustomizedByPrefs, expectedOverflowDeltaX, expectedOverflowDeltaY
  *
  * deltaMode must be defined, others are ok even if undefined.
  *
@@ -337,8 +336,9 @@ function synthesizeWheel(aTarget, aOffsetX, aOffsetY, aEvent, aWindow)
 
   var modifiers = _parseModifiers(aEvent);
   var options = 0;
-  if (aEvent.isNoLineOrPageDelta) {
-    options |= utils.WHEEL_EVENT_CAUSED_BY_NO_LINE_OR_PAGE_DELTA_DEVICE;
+  if (aEvent.isPixelOnlyDevice &&
+      (aEvent.deltaMode == WheelEvent.DOM_DELTA_PIXEL)) {
+    options |= utils.WHEEL_EVENT_CAUSED_BY_PIXEL_ONLY_DEVICE;
   }
   if (aEvent.isMomentum) {
     options |= utils.WHEEL_EVENT_CAUSED_BY_MOMENTUM;
@@ -364,7 +364,8 @@ function synthesizeWheel(aTarget, aOffsetX, aOffsetY, aEvent, aWindow)
       options |= utils.WHEEL_EVENT_EXPECTED_OVERFLOW_DELTA_Y_NEGATIVE;
     }
   }
-  var isNoLineOrPageDelta = aEvent.isNoLineOrPageDelta;
+  var isPixelOnlyDevice =
+    aEvent.isPixelOnlyDevice && aEvent.deltaMode == WheelEvent.DOM_DELTA_PIXEL;
 
   // Avoid the JS warnings "reference to undefined property"
   if (!aEvent.deltaX) {

services/sync/tps/extensions/mozmill/resource/stdlib/httpd.js

@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this