Bug 1077515 - Followup to fix non-unified build bustage. r=me
authorJonathan Kew <jkew@mozilla.com>
Sat, 22 Nov 2014 15:33:36 +0000
changeset 241321 f2d3a639784f82ebeb064176c84110465b037e2a
parent 241320 203d3b5da245f9d2b89373114b61e86e35e62b99
child 241322 05b7e79b688e936428dbca959537a2afc517d22e
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1077515
milestone36.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 1077515 - Followup to fix non-unified build bustage. r=me
editor/libeditor/nsEditorCommands.cpp
--- a/editor/libeditor/nsEditorCommands.cpp
+++ b/editor/libeditor/nsEditorCommands.cpp
@@ -1,15 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 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/. */
 
 
 #include "mozFlushType.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
 #include "nsDebug.h"
 #include "nsEditorCommands.h"
 #include "nsError.h"
 #include "nsIClipboard.h"
 #include "nsICommandParams.h"
@@ -764,41 +765,41 @@ nsSelectionMoveCommands::DoCommand(const
   }
 
   nsCOMPtr<nsISelectionController> selCont;
   nsresult rv = editor->GetSelectionController(getter_AddRefs(selCont)); 
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_TRUE(selCont, NS_ERROR_FAILURE);
 
   // scroll commands
-  for (size_t i = 0; i < ArrayLength(scrollCommands); i++) {
+  for (size_t i = 0; i < mozilla::ArrayLength(scrollCommands); i++) {
     const ScrollCommand& cmd = scrollCommands[i];
     if (!nsCRT::strcmp(aCommandName, cmd.reverseScroll)) {
       return (selCont->*(cmd.scroll))(false);
     } else if (!nsCRT::strcmp(aCommandName, cmd.forwardScroll)) {
       return (selCont->*(cmd.scroll))(true);
     }
   }
 
   // caret movement/selection commands
-  for (size_t i = 0; i < ArrayLength(moveCommands); i++) {
+  for (size_t i = 0; i < mozilla::ArrayLength(moveCommands); i++) {
     const MoveCommand& cmd = moveCommands[i];
     if (!nsCRT::strcmp(aCommandName, cmd.reverseMove)) {
       return (selCont->*(cmd.move))(false, false);
     } else if (!nsCRT::strcmp(aCommandName, cmd.forwardMove)) {
       return (selCont->*(cmd.move))(true, false);
     } else if (!nsCRT::strcmp(aCommandName, cmd.reverseSelect)) {
       return (selCont->*(cmd.move))(false, true);
     } else if (!nsCRT::strcmp(aCommandName, cmd.forwardSelect)) {
       return (selCont->*(cmd.move))(true, true);
     }
   }
 
   // physical-direction movement/selection
-  for (size_t i = 0; i < ArrayLength(physicalCommands); i++) {
+  for (size_t i = 0; i < mozilla::ArrayLength(physicalCommands); i++) {
     const PhysicalCommand& cmd = physicalCommands[i];
     if (!nsCRT::strcmp(aCommandName, cmd.move)) {
       return selCont->PhysicalMove(cmd.direction, cmd.amount, false);
     } else if (!nsCRT::strcmp(aCommandName, cmd.select)) {
       return selCont->PhysicalMove(cmd.direction, cmd.amount, true);
     }
   }