merge mozilla-inbound to mozilla-central

accessible/src/atk/AccessibleWrap.cpp

@@ -25,7 +25,7 @@
 #include "States.h"
 #include "nsISimpleEnumerator.h"
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 #include "nsXPCOMStrings.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIPersistentProperties2.h"

accessible/src/base/nsAccessibilityService.cpp

@@ -63,9 +63,9 @@
 #include "nsTreeUtils.h"
 #include "nsXBLPrototypeBinding.h"
 #include "nsXBLBinding.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
-#include "mozilla/Util.h"
 #include "nsDeckFrame.h"
 
 #ifdef MOZ_XUL

accessible/src/generic/RootAccessible.cpp

@@ -5,7 +5,7 @@
 
 #include "RootAccessible.h"
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #define CreateEvent CreateEventA
 #include "nsIDOMDocument.h"

browser/components/shell/src/nsGNOMEShellService.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsGNOMEShellService.h"

caps/src/nsNullPrincipal.cpp

@@ -9,7 +9,7 @@
  * same-origin with anything but themselves.
  */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsNullPrincipal.h"
 #include "nsNullPrincipalURI.h"

caps/src/nsScriptSecurityManager.cpp

@@ -6,7 +6,7 @@
 
 #include "nsScriptSecurityManager.h"
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "js/OldDebugAPI.h"
 #include "xpcprivate.h"

content/base/src/EventSource.cpp

@@ -5,9 +5,9 @@
 
 #include "mozilla/dom/EventSource.h"
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/dom/EventSourceBinding.h"
-#include "mozilla/Util.h"
 
 #include "js/OldDebugAPI.h"
 #include "nsNetUtil.h"

content/base/src/FragmentOrElement.cpp

@@ -10,10 +10,10 @@
  * utility methods for subclasses, and so forth.
  */
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/StaticPtr.h"
-#include "mozilla/Util.h"
 
 #include "mozilla/dom/FragmentOrElement.h"
 

content/base/src/nsContentUtils.cpp

@@ -28,6 +28,7 @@
 // nsNPAPIPluginInstance must be included before nsIDocument.h, which is included in mozAutoDocUpdate.h.
 #include "nsNPAPIPluginInstance.h"
 #include "mozAutoDocUpdate.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/Base64.h"
@@ -45,7 +46,6 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/Selection.h"
 #include "mozilla/TextEvents.h"
-#include "mozilla/Util.h"
 #include "nsAString.h"
 #include "nsAttrName.h"
 #include "nsAttrValue.h"

content/base/src/nsDocument.cpp

@@ -10,10 +10,10 @@
 
 #include "nsDocument.h"
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Util.h"
 #include "mozilla/Likely.h"
 #include <algorithm>
 

content/base/src/nsGkAtoms.cpp

@@ -9,8 +9,6 @@
  * is loaded and they are destroyed when gklayout is unloaded.
  */
 
-#include "mozilla/Util.h"
-
 #include "nsGkAtoms.h"
 #include "nsStaticAtom.h"
 

content/base/src/nsINode.cpp

@@ -18,7 +18,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/MutationEvent.h"
 #include "mozilla/Telemetry.h"
-#include "mozilla/Util.h"
 #include "nsAsyncDOMEvent.h"
 #include "nsAttrValueOrString.h"
 #include "nsBindingManager.h"

content/base/src/nsNodeInfo.cpp

@@ -10,7 +10,7 @@
  * prefix, namespace, and localName.
  */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Likely.h"
 
 #include "nscore.h"

content/base/src/nsTreeSanitizer.cpp

@@ -4,7 +4,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsTreeSanitizer.h"
 #include "nsCSSParser.h"

content/base/src/nsXMLHttpRequest.cpp

@@ -6,9 +6,9 @@
 
 #include "nsXMLHttpRequest.h"
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/XMLHttpRequestUploadBinding.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Util.h"
 #include "nsDOMBlobBuilder.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMProgressEvent.h"

content/canvas/test/webgl/non-conf-tests/driver-info.js

@@ -18,9 +18,15 @@ DriverInfo = (function() {
   // ---------------------------------------------------------------------------
   // OS and driver identification
   //   Stolen from content/canvas/test/webgl/test_webgl_conformance_test_suite.html
-  const Cc = SpecialPowers.Cc;
-  const Ci = SpecialPowers.Ci;
   function detectDriverInfo() {
+    try {
+      var cc = SpecialPowers.Cc;
+    } catch (e) {
+      throw 'No SpecialPowers!';
+    }
+
+    const Cc = SpecialPowers.Cc;
+    const Ci = SpecialPowers.Ci;
     var doc = Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(Ci.nsIDOMParser).parseFromString("<html/>", "text/html");
 
     var canvas = doc.createElement("canvas");
@@ -46,6 +52,51 @@ DriverInfo = (function() {
     return [webglVendor, webglRenderer];
   }
 
+  function detectOSInfo() {
+    try {
+      var cc = SpecialPowers.Cc;
+    } catch (e) {
+      throw 'No SpecialPowers!';
+    }
+
+    const Cc = SpecialPowers.Cc;
+    const Ci = SpecialPowers.Ci;
+
+    // From reftest.js:
+    var runtime = Cc['@mozilla.org/xre/app-info;1'].getService(Ci.nsIXULRuntime);
+
+    var os = null;
+    var version = null;
+    if (navigator.platform.indexOf('Win') == 0) {
+      os = OS.WINDOWS;
+
+      // code borrowed from browser/modules/test/browser_taskbar_preview.js
+      version = SpecialPowers.Services.sysinfo.getProperty('version');
+      version = parseFloat(version);
+      // Version 6.0 is Vista, 6.1 is 7.
+
+    } else if (navigator.platform.indexOf('Mac') == 0) {
+      os = OS.MAC;
+
+      var versionMatch = /Mac OS X (\d+.\d+)/.exec(navigator.userAgent);
+      version = versionMatch ? parseFloat(versionMatch[1]) : null;
+
+    } else if (runtime.widgetToolkit == 'gonk') {
+      os = OS.B2G;
+
+    } else if (navigator.appVersion.indexOf('Android') != -1) {
+      os = OS.ANDROID;
+      // From layout/tools/reftest/reftest.js:
+      version = SpecialPowers.Services.sysinfo.getProperty('version');
+
+    } else if (navigator.platform.indexOf('Linux') == 0) {
+      // Must be checked after android, as android also has a 'Linux' platform string.
+      os = OS.LINUX;
+    }
+
+    return [os, version];
+  }
+
   var OS = {
     WINDOWS: 'windows',
     MAC: 'mac',
@@ -65,34 +116,10 @@ DriverInfo = (function() {
   var kOSVersion = null;
   var kDriver = null;
 
-  // From reftest.js:
-  var runtime = Cc['@mozilla.org/xre/app-info;1'].getService(Ci.nsIXULRuntime);
-
-  if (navigator.platform.indexOf('Win') == 0) {
-    kOS = OS.WINDOWS;
-
-    // code borrowed from browser/modules/test/browser_taskbar_preview.js
-    var version = SpecialPowers.Services.sysinfo.getProperty('version');
-    kOSVersion = parseFloat(version);
-    // Version 6.0 is Vista, 6.1 is 7.
-
-  } else if (navigator.platform.indexOf('Mac') == 0) {
-    kOS = OS.MAC;
-
-    var versionMatch = /Mac OS X (\d+.\d+)/.exec(navigator.userAgent);
-    kOSVersion = versionMatch ? parseFloat(versionMatch[1]) : null;
-
-  } else if (runtime.widgetToolkit == 'gonk') {
-    kOS = OS.B2G;
-
-  } else if (navigator.appVersion.indexOf('Android') != -1) {
-    kOS = OS.ANDROID;
-    // From layout/tools/reftest/reftest.js:
-    kOSVersion = SpecialPowers.Services.sysinfo.getProperty('version');
-
-  } else if (navigator.platform.indexOf('Linux') == 0) {
-    // Must be checked after android, as android also has a 'Linux' platform string.
-    kOS = OS.LINUX;
+  try {
+    [kOS, kOSVersion] = detectOSInfo();
+  } catch (e) {
+    // Generally just fails when we don't have SpecialPowers.
   }
 
   try {

content/canvas/test/webgl/non-conf-tests/mochi-to-testcase.py

@@ -0,0 +1,86 @@
+import sys
+import os.path
+import re
+
+assert len(sys.argv) == 2
+mochiPath = sys.argv[1]
+
+extDotPos = mochiPath.find('.html')
+assert extDotPos != -1, 'mochitest target must be an html doc.'
+
+testPath = mochiPath[:extDotPos] + '.solo.html'
+    
+def ReadLocalFile(include):
+    incPath = os.path.dirname(mochiPath)
+    filePath = os.path.join(incPath, include)
+
+    data = None
+    try:
+        f = open(filePath, 'r')
+        data = f.read()
+    except:
+        pass
+
+    try:
+        f.close()
+    except:
+        pass
+
+    return data
+
+kSimpleTestReplacement = '''\n
+<script>
+// SimpleTest.js replacement
+function ok(val, text) {
+  var elem = document.getElementById('mochi-to-testcase-output');
+  var status = val ? 'Test <font color=\\'green\\'>passed</font>: '
+                   : 'Test <font color=\\'red\\'  >FAILED</font>: ';
+  elem.innerHTML += '\\n<br/>\\n' + status + text;
+}
+
+function todo(val, text) {
+  ok(!val, 'Todo: ' + text);
+}
+</script>
+<div id='mochi-to-testcase-output'></div>
+\n'''
+
+fin = open(mochiPath, 'r')
+fout = open(testPath, 'w')
+includePattern = re.compile('<script\\s*src=[\'"](.*)\\.js[\'"]>\\s*</script>')
+cssPattern = re.compile('<link\\s*rel=[\'"]stylesheet[\'"]\\s*href=[\'"]([^=>]*)[\'"]>')
+for line in fin:
+    skipLine = False
+    for css in cssPattern.findall(line):
+        skipLine = True
+        print('Ignoring stylesheet: ' + css)
+    
+    for inc in includePattern.findall(line):
+        skipLine = True
+        if inc == '/MochiKit/MochiKit':
+            continue
+
+        if inc == '/tests/SimpleTest/SimpleTest':
+            print('Injecting SimpleTest replacement')
+            fout.write(kSimpleTestReplacement);
+            continue
+            
+        incData = ReadLocalFile(inc + '.js')
+        if not incData:
+            print('Warning: Unknown JS file ignored: ' + inc + '.js')
+            continue
+
+        print('Injecting include: ' + inc + '.js')
+        fout.write('\n<script>\n// Imported from: ' + inc + '.js\n');
+        fout.write(incData);
+        fout.write('\n</script>\n');
+        continue
+
+    if skipLine:
+        continue
+    
+    fout.write(line)
+    continue
+
+fin.close()
+fout.close()

content/events/src/nsDOMDataTransfer.cpp

@@ -4,8 +4,8 @@
  * 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/. */
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/BasicEvents.h"
-#include "mozilla/Util.h"
 
 #include "nsDOMDataTransfer.h"
 

content/events/src/nsDOMUIEvent.cpp

@@ -14,7 +14,7 @@
 #include "nsContentUtils.h"
 #include "nsEventStateManager.h"
 #include "nsIFrame.h"
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/ContentEvents.h"
 #include "mozilla/TextEvents.h"

content/html/content/src/HTMLBRElement.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/HTMLBRElement.h"
 #include "mozilla/dom/HTMLBRElementBinding.h"
-#include "mozilla/Util.h"
 
 #include "nsAttrValueInlines.h"
 #include "nsStyleConsts.h"

content/html/content/src/HTMLBodyElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "HTMLBodyElement.h"
 #include "mozilla/dom/HTMLBodyElementBinding.h"
 #include "nsAttrValueInlines.h"

content/html/content/src/HTMLDivElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "HTMLDivElement.h"
 #include "nsGenericHTMLElement.h"
 #include "nsStyleConsts.h"

content/html/content/src/HTMLFontElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "HTMLFontElement.h"
 #include "mozilla/dom/HTMLFontElementBinding.h"
 #include "nsAttrValueInlines.h"

content/html/content/src/HTMLFrameElement.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/HTMLFrameElement.h"
 #include "mozilla/dom/HTMLFrameElementBinding.h"
-#include "mozilla/Util.h"
 
 class nsIDOMDocument;
 

content/html/content/src/HTMLHeadingElement.cpp

@@ -6,7 +6,6 @@
 #include "mozilla/dom/HTMLHeadingElement.h"
 #include "mozilla/dom/HTMLHeadingElementBinding.h"
 
-#include "mozilla/Util.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsMappedAttributes.h"

content/html/content/src/HTMLIFrameElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/HTMLIFrameElement.h"
 #include "mozilla/dom/HTMLIFrameElementBinding.h"
 #include "nsMappedAttributes.h"

content/html/content/src/HTMLImageElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/HTMLImageElement.h"
 #include "mozilla/dom/HTMLImageElementBinding.h"
 #include "nsGkAtoms.h"

content/html/content/src/HTMLInputElement.cpp

@@ -5,6 +5,7 @@
 
 #include "mozilla/dom/HTMLInputElement.h"
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/dom/Date.h"
 #include "nsAsyncDOMEvent.h"
@@ -94,7 +95,6 @@
 #include "nsTextEditorState.h"
 
 #include "mozilla/LookAndFeel.h"
-#include "mozilla/Util.h" // DebugOnly
 #include "mozilla/Preferences.h"
 #include "mozilla/MathAlgorithms.h"
 

content/html/content/src/HTMLLIElement.h

@@ -7,7 +7,7 @@
 #define mozilla_dom_HTMLLIElement_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/Util.h"
+
 #include "nsIDOMHTMLLIElement.h"
 #include "nsGenericHTMLElement.h"
 

content/html/content/src/HTMLMediaElement.cpp

@@ -7,8 +7,8 @@
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/HTMLMediaElementBinding.h"
 #include "mozilla/dom/ElementInlines.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/MathAlgorithms.h"
-#include "mozilla/Util.h"
 
 #include "base/basictypes.h"
 #include "nsIDOMHTMLMediaElement.h"

content/html/content/src/HTMLObjectElement.cpp

@@ -5,8 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/HTMLObjectElement.h"
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/HTMLObjectElementBinding.h"
 #include "mozilla/dom/ElementInlines.h"
 #include "nsAutoPtr.h"

content/html/content/src/HTMLOptionsCollection.cpp

@@ -12,7 +12,6 @@
 #include "mozilla/dom/HTMLOptionElement.h"
 #include "mozilla/dom/HTMLOptionsCollectionBinding.h"
 #include "mozilla/dom/HTMLSelectElement.h"
-#include "mozilla/Util.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsError.h"
 #include "nsEventDispatcher.h"

content/html/content/src/HTMLParagraphElement.h

@@ -7,7 +7,6 @@
 #define mozilla_dom_HTMLParagraphElement_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/Util.h"
 
 #include "nsIDOMHTMLParagraphElement.h"
 #include "nsGenericHTMLElement.h"

content/html/content/src/HTMLPreElement.h

@@ -7,7 +7,6 @@
 #define mozilla_dom_HTMLPreElement_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/Util.h"
 
 #include "nsIDOMHTMLPreElement.h"
 #include "nsGenericHTMLElement.h"

content/html/content/src/HTMLSelectElement.cpp

@@ -11,7 +11,6 @@
 #include "mozilla/dom/HTMLOptGroupElement.h"
 #include "mozilla/dom/HTMLOptionElement.h"
 #include "mozilla/dom/HTMLSelectElementBinding.h"
-#include "mozilla/Util.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsContentList.h"
 #include "nsError.h"

content/html/content/src/HTMLSharedListElement.h

@@ -5,8 +5,8 @@
 
 #ifndef mozilla_dom_HTMLSharedListElement_h
 #define mozilla_dom_HTMLSharedListElement_h
+
 #include "mozilla/Attributes.h"
-#include "mozilla/Util.h"
 
 #include "nsIDOMHTMLOListElement.h"
 #include "nsIDOMHTMLUListElement.h"

content/html/content/src/HTMLSharedObjectElement.cpp

@@ -8,7 +8,6 @@
 #include "mozilla/dom/HTMLEmbedElementBinding.h"
 #include "mozilla/dom/HTMLAppletElementBinding.h"
 #include "mozilla/dom/ElementInlines.h"
-#include "mozilla/Util.h"
 
 #include "nsIDocument.h"
 #include "nsIPluginDocument.h"

content/html/content/src/HTMLTableCaptionElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/HTMLTableCaptionElement.h"
 #include "nsAttrValueInlines.h"
 #include "nsMappedAttributes.h"

content/html/content/src/HTMLTableCellElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/HTMLTableCellElement.h"
 #include "mozilla/dom/HTMLTableElement.h"
 #include "mozilla/dom/HTMLTableRowElement.h"

content/html/content/src/HTMLTableColElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/HTMLTableColElement.h"
 #include "nsMappedAttributes.h"
 #include "nsAttrValueInlines.h"

content/html/content/src/HTMLTableElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/HTMLTableElement.h"
 #include "nsAttrValueInlines.h"
 #include "nsRuleData.h"

content/html/content/src/HTMLTableRowElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/HTMLTableRowElement.h"
 #include "mozilla/dom/HTMLTableElement.h"
 #include "nsMappedAttributes.h"

content/html/content/src/HTMLTableSectionElement.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/HTMLTableSectionElement.h"
 #include "nsMappedAttributes.h"
 #include "nsAttrValueInlines.h"

content/html/content/src/HTMLTextAreaElement.cpp

@@ -10,7 +10,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/HTMLTextAreaElementBinding.h"
 #include "mozilla/MouseEvents.h"
-#include "mozilla/Util.h"
 #include "nsAttrValueInlines.h"
 #include "nsContentCID.h"
 #include "nsContentCreatorFunctions.h"

content/html/content/src/HTMLVideoElement.cpp

@@ -4,8 +4,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "nsIDOMHTMLVideoElement.h"
 #include "nsIDOMHTMLSourceElement.h"
 #include "mozilla/dom/HTMLVideoElement.h"

content/html/content/src/nsFormSubmission.cpp

@@ -4,8 +4,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "nsFormSubmission.h"
 
 #include "nsCOMPtr.h"

content/html/content/src/nsGenericHTMLElement.cpp

@@ -4,8 +4,8 @@
  * 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/. */
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/MouseEvents.h"
-#include "mozilla/Util.h"
 #include "mozilla/Likely.h"
 
 #include "nscore.h"

content/html/document/src/nsHTMLContentSink.cpp

@@ -10,7 +10,7 @@
  * Don't bother adding new stuff in this file.
  */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsContentSink.h"
 #include "nsCOMPtr.h"

content/mathml/content/src/nsMathMLElement.cpp

@@ -6,7 +6,7 @@
 
 #include "nsMathMLElement.h"
 #include "base/compiler_specific.h"
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 #include "nsGkAtoms.h"
 #include "nsCRT.h"
 #include "nsRuleData.h"

content/media/wave/WaveReader.cpp

@@ -13,7 +13,7 @@
 #include "nsISeekableStream.h"
 
 #include <stdint.h>
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/Endian.h"
 #include <algorithm>

content/media/webaudio/blink/IRC_Composite_C_R0195-incl.cpp

@@ -18,7 +18,7 @@
  * the listener.
  */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 using mozilla::ArrayLength;
 

content/media/webrtc/LoadMonitor.cpp

@@ -19,7 +19,6 @@
 #include "nsIServiceManager.h"
 
 #include "mozilla/TimeStamp.h"
-#include "mozilla/Util.h"
 #include "mozilla/Services.h"
 
 #if defined(ANDROID) || defined(LINUX) || defined(XP_MACOSX)

content/svg/content/src/DOMSVGPathSeg.cpp

@@ -3,8 +3,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "DOMSVGPathSeg.h"
 #include "DOMSVGPathSegList.h"
 #include "SVGAnimatedPathSegList.h"

content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "mozilla/dom/SVGAnimatedPreserveAspectRatioBinding.h"

content/svg/content/src/SVGClipPathElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "mozilla/dom/SVGClipPathElement.h"
 #include "mozilla/dom/SVGClipPathElementBinding.h"

content/svg/content/src/SVGFilterElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsGkAtoms.h"
 #include "nsCOMPtr.h"

content/svg/content/src/SVGForeignObjectElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
 #include "mozilla/dom/SVGForeignObjectElement.h"

content/svg/content/src/SVGGradientElement.cpp

@@ -5,10 +5,10 @@
 
 #include "mozilla/dom/SVGGradientElement.h"
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/SVGAnimatedTransformList.h"
 #include "mozilla/dom/SVGRadialGradientElementBinding.h"
 #include "mozilla/dom/SVGLinearGradientElementBinding.h"
-#include "mozilla/Util.h"
 #include "nsCOMPtr.h"
 #include "nsGkAtoms.h"
 #include "nsSVGElement.h"

content/svg/content/src/SVGImageElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "mozilla/dom/SVGImageElement.h"
 #include "mozilla/gfx/2D.h"

content/svg/content/src/SVGLength.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "SVGLength.h"
 #include "nsSVGElement.h"

content/svg/content/src/SVGMPathElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "mozilla/dom/SVGMPathElement.h"
 #include "nsDebug.h"

content/svg/content/src/SVGMarkerElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsGkAtoms.h"
 #include "nsCOMPtr.h"

content/svg/content/src/SVGMaskElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsGkAtoms.h"

content/svg/content/src/SVGNumberList.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "SVGNumberList.h"
 #include "nsCharSeparatedTokenizer.h"

content/svg/content/src/SVGPathSegUtils.cpp

@@ -3,10 +3,11 @@
  * 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/. */
 
+#include "mozilla/ArrayUtils.h" // MOZ_ARRAY_LENGTH
+
 #include "SVGPathSegUtils.h"
 
 #include "gfx2DGlue.h"
-#include "mozilla/Util.h" // MOZ_ARRAY_LENGTH
 #include "nsSVGPathDataParser.h"
 #include "nsTextFormatter.h"
 

content/svg/content/src/SVGPatternElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsGkAtoms.h"

content/svg/content/src/SVGPointList.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "SVGPointList.h"
 #include "nsCharSeparatedTokenizer.h"

content/svg/content/src/SVGSVGElement.cpp

@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <stdint.h>
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/BasicEvents.h"
-#include "mozilla/Util.h"
 #include "mozilla/Likely.h"
 
 #include "nsGkAtoms.h"

content/svg/content/src/SVGTextPositioningElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "mozilla/dom/SVGTextPositioningElement.h"
 #include "SVGAnimatedLengthList.h"

content/svg/content/src/SVGTransformListParser.cpp

@@ -4,7 +4,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "SVGTransformListParser.h"
 #include "SVGContentUtils.h"

content/svg/content/src/SVGUseElement.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "mozilla/dom/SVGUseElement.h"
 #include "mozilla/dom/SVGUseElementBinding.h"

content/svg/content/src/nsSVGAngle.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsSVGAngle.h"
 #include "mozilla/dom/SVGMarkerElement.h"

content/svg/content/src/nsSVGElement.cpp

@@ -3,8 +3,8 @@
  * 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/. */
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/Util.h"
 
 #include "nsSVGElement.h"
 

content/svg/content/src/nsSVGFilters.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsSVGElement.h"
 #include "nsGkAtoms.h"

content/svg/content/src/nsSVGLength2.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsSVGLength2.h"
 #include "mozilla/dom/SVGAnimatedLength.h"

content/svg/content/test/test_transformParsing.html

@@ -65,23 +65,23 @@ function checkParseOk(spec, expected) {
 function checkTransform(transform, expected, spec, index) {
   var typeMapping = {
     "unknown": SVGTransform.SVG_TRANSFORM_UNKNOWN,
-    "matrix": SVGTransform.SVG_TRANSFORM_UNKNOWN,
-    "translate": SVGTransform.SVG_TRANSFORM_UNKNOWN,
-    "scale": SVGTransform.SVG_TRANSFORM_UNKNOWN,
-    "rotate": SVGTransform.SVG_TRANSFORM_UNKNOWN,
-    "skewx": SVGTransform.SVG_TRANSFORM_UNKNOWN,
-    "skewy": SVGTransform.SVG_TRANSFORM_UNKNOWN
+    "matrix": SVGTransform.SVG_TRANSFORM_MATRIX,
+    "translate": SVGTransform.SVG_TRANSFORM_TRANSLATE,
+    "scale": SVGTransform.SVG_TRANSFORM_SCALE,
+    "rotate": SVGTransform.SVG_TRANSFORM_ROTATE,
+    "skewx": SVGTransform.SVG_TRANSFORM_SKEWX,
+    "skewy": SVGTransform.SVG_TRANSFORM_SKEWY
   };
   var name = "Item " + index + " of '" + spec + "'";
 
   // Compare type
-  if (typeof spec.type != "undefined") {
-    ise(transform.type, typeMapping[spec.type], name + " - transform type");
+  if (typeof expected.type != "undefined") {
+    ise(transform.type, typeMapping[expected.type], name + " - transform type");
   }
 
   // Compare angle
-  if (typeof spec.angle != "undefined") {
-    ise(transform.angle, spec.angle, name + " - angle");
+  if (typeof expected.angle != "undefined") {
+    ise(transform.angle, expected.angle, name + " - angle");
   }
 
   // Compare matrix values (roughly)

content/xbl/src/nsXBLContentSink.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsXBLContentSink.h"
 #include "nsIDocument.h"

content/xbl/src/nsXBLPrototypeBinding.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsIAtom.h"

content/xbl/src/nsXBLPrototypeHandler.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsXBLPrototypeHandler.h"

content/xbl/src/nsXBLService.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsNetUtil.h"

content/xslt/src/xpath/txCoreFunctionCall.cpp

@@ -3,8 +3,8 @@
  * 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/. */
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/FloatingPoint.h"
-#include "mozilla/Util.h"
 
 #include "txExpr.h"
 #include "nsAutoPtr.h"

content/xslt/src/xslt/txEXSLTFunctions.cpp

@@ -3,8 +3,8 @@
  * 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/. */
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/FloatingPoint.h"
-#include "mozilla/Util.h"
 
 #include "nsIAtom.h"
 #include "nsGkAtoms.h"

content/xslt/src/xslt/txStylesheetCompileHandlers.cpp

@@ -3,8 +3,8 @@
  * 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/. */
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/FloatingPoint.h"
-#include "mozilla/Util.h"
 
 #include "txStylesheetCompiler.h"
 #include "txStylesheetCompileHandlers.h"

content/xslt/src/xslt/txStylesheetCompiler.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "txStylesheetCompiler.h"
 #include "txStylesheetCompileHandlers.h"

content/xul/document/src/XULDocument.cpp

@@ -21,7 +21,7 @@
 
 */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 // Note the ALPHABETICAL ORDERING
 #include "XULDocument.h"

content/xul/templates/src/nsRuleNetwork.cpp

@@ -16,8 +16,6 @@
 
  */
 
-#include "mozilla/Util.h"
-
 #include "nscore.h"
 #include "nsCOMPtr.h"
 #include "plhash.h"

content/xul/templates/src/nsXULContentBuilder.cpp

@@ -3,7 +3,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsContentCID.h"
 #include "nsIDocument.h"

content/xul/templates/src/nsXULContentUtils.cpp

@@ -25,7 +25,7 @@
 
  */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsIContent.h"

docshell/base/nsDocShell.cpp

@@ -8,6 +8,7 @@
 
 #include <algorithm>
 
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/Casting.h"
@@ -19,7 +20,6 @@
 #include "mozilla/StartupTimeline.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/unused.h"
-#include "mozilla/Util.h"
 #include "mozilla/VisualEventTracer.h"
 
 #ifdef MOZ_LOGGING

dom/audiochannel/AudioChannelService.cpp

@@ -12,7 +12,6 @@
 #include "mozilla/Services.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/unused.h"
-#include "mozilla/Util.h"
 
 #include "mozilla/dom/ContentParent.h"
 

dom/audiochannel/AudioChannelServiceChild.cpp

@@ -11,7 +11,6 @@
 #include "mozilla/Services.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/unused.h"
-#include "mozilla/Util.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
 #include "nsIObserverService.h"

dom/base/DOMException.cpp

@@ -7,8 +7,8 @@
 
 #include "jsprf.h"
 #include "js/OldDebugAPI.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/HoldDropJSObjects.h"
-#include "mozilla/Util.h"
 #include "mozilla/dom/Exceptions.h"
 #include "nsContentUtils.h"
 #include "nsCOMPtr.h"

dom/base/nsDOMClassInfo.cpp

@@ -4,7 +4,7 @@
  * 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/. */
 
-#include "mozilla/Util.h"
+#include "mozilla/ArrayUtils.h"
 // On top because they include basictypes.h:
 #include "mozilla/dom/SmsFilter.h"
 

dom/base/nsGlobalWindow.cpp

@@ -9,7 +9,6 @@
 #include <algorithm>
 
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Util.h"
 
 // Local Includes
 #include "Navigator.h"

dom/base/nsGlobalWindowCommands.cpp

@@ -11,8 +11,8 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsCRT.h"
 #include "nsString.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/Util.h"
 
 #include "nsIControllerCommandTable.h"
 #include "nsICommandParams.h"

dom/bindings/BindingUtils.h

@@ -9,6 +9,7 @@
 
 #include "jsfriendapi.h"
 #include "jswrapper.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Alignment.h"
 #include "mozilla/Array.h"
 #include "mozilla/dom/BindingDeclarations.h"
@@ -24,7 +25,6 @@
 #include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Util.h"
 #include "nsCycleCollector.h"
 #include "nsIXPConnect.h"
 #include "MainThreadUtils.h"

dom/bindings/CallbackObject.h

@@ -24,7 +24,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/HoldDropJSObjects.h"
-#include "mozilla/Util.h"
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsWrapperCache.h"

dom/bindings/DOMJSProxyHandler.cpp

@@ -4,8 +4,6 @@
  * 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/. */
 
-#include "mozilla/Util.h"
-
 #include "mozilla/dom/DOMJSProxyHandler.h"
 #include "xpcpublic.h"
 #include "xpcprivate.h"

dom/bindings/TypedArray.h

@@ -13,7 +13,6 @@
 #include "js/Tracer.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/Util.h" // for Maybe
 #include "nsWrapperCache.h"
 
 namespace mozilla {

dom/bluetooth/BluetoothAdapter.cpp

@@ -19,7 +19,6 @@
 #include "mozilla/dom/BluetoothAdapterBinding.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/LazyIdleThread.h"
-#include "mozilla/Util.h"
 
 #include "BluetoothAdapter.h"
 #include "BluetoothDevice.h"