import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1175600. Add getRelativePath/setRelativePath to nsIFile. r=froydnj (93515cbda)
- bug 1171124 - Swap some XP_MACOSX for XP_DARWIN in nsLocalFileUnix. r=froydnj (1928918ac)
- Bug 1192230 - clean up reference-counting in xpcom/; r=erahm (11528cd9f)
- missing bit of Bug 1138293 - Use malloc/free/realloc/calloc (365fb9991)
- Bug 1175601. Make nsIFile.getRelativeDescriptor work with paths with aths with arbitrary numbers of segments, not just 32. r=froydnj (a4b5ea11d)
- Bug 1175600 followup. Add getRelativePath to ye othere nsIFile implementatione so as to de-bust ye olde CLOSED TREE (b23dfee9e)
- Bug 1159604 - Use fallible allocations in nsLinebreakConverter.cpp (as the code expects). r=smaug (498f30023)
- Bug 1139547 - Fix unsequenced variable modmification/access error. r=botond,bsmedberg (a8460ecff)
- Bug 1167380 - Mark (Read/Write)SegmentsState::m(Source/Sink) as MOZ_NON_OWNING_REF and mark as MOZ_STACK_CLASS. r=froydnj (a1f2dc2ae)
- Bug 1137464 - add missing include for nsICloneableInputStream.h to nsStreamUtils.cpp; r=bkelly (dddd1831c)
- Bug 1026761 - CID 749761: nsAStreamCopier::Process can use sourceCondition, sinkCondition uninitialized. r=froydnj (a728f2b3e)
- Bug 1189423 - part 1 - Add MOZ_COUNT_CTOR/DTOR for nsXPTCStubBase. r=froydnj (208b578bb)
- Bug 1189423 - part 2 - Remove superfluous |new| result check. r=froydnj (b58d8b1fd)
- Bug 1151506 - Null-check the count parameter in GetConstantCount. r=froydnj (6e89f6635)
- Bug 1171603 - Better size check in nsTSubstring::ReplacePrep. r=ehsan (f17bb9c07)
- Bug 603201 - Enable primitive receivers in [[Get]]. r=jorendorff (24e6b04e2)
- revert/align malloc functions to bug 1156317 21 April 2015 (89de8cbad)
- Bug 1081260 - Update the malloc counters if we successfully recover from OOM; r=jonco (c3a03f041)
- Bug 1196210 - Fix an incomplete assertion in the nursery; r=jonco (84140599a)
- Bug 1198826 - Increment (plain) gcNumber on all GCs, r=terrence (a45b9d65c)
- Bug 1184578 - Fix the nursery profiling print statement; r=sfink (f03accbe4)
- Bug 1188878 - Ensure RematerializedFrames are cleared from Debugger instances on Ion bailout failure. (r=jandem) (0cad2e549)
- pointer style (96793b3b3)
- some leftover (7685205e9)
- pointer style (5dc480bd4)
- Bug 1145781 - Unlazify functions when getting their debug scopes. (r=jimb) (f86c2a1b6)
- Bug 1148388 - Handle lost accesses in missing Debugger scopes for block objects. (r=jimb) (9c1734834)
- Bug 1118865 - Relax assertion in DebugScopeProxy::isMagicMissingArgumentsValue. (r=nbp) (7b46b3929)
- Bug 1193046 - Clear prevUpToDate on younger frames when toggling frame debuggeeness off->on. (r=jimb) (f93459582)
- Bug 1188334 - Fix this one weird case with creating debug block scopes of 0-variable block scopes that come from deprecated let exprs inside generators. (r=jimb) (69cc9afe9)
- code style (dc626020e)
- Bug 1135703 - Ensure that lastProfilingFrame gets set appropriately on ALL JitActivations when profiling is turned on or off. r=shu (64665fe96)
- missing init, taken from TFF (dc9544999)
- pointer style (84478dba2)
- cleanup (6e2dd6ae3)
- reposition due to misspatch (738769d65)
- Bug 1191758 - Rework JS::FormatStackDump() to fix OOM handling r=terrence (680e5f8d2)
- Bug 1195545 - Add instruction reordering pass to IonMonkey, r=sunfish. (ba1441975)

xpcom/io/nsLocalFileCommon.cpp

@@ -171,18 +171,17 @@ static const char16_t kPathSeparatorChar       = '/';
 #error Need to define file path separator for your platform
 #endif
 
-static int32_t
-SplitPath(char16_t* aPath, char16_t** aNodeArray, int32_t aArrayLen)
+static void
+SplitPath(char16_t* aPath, nsTArray<char16_t*>& aNodeArray)
 {
   if (*aPath == 0) {
-    return 0;
+    return;
   }
 
-  char16_t** nodePtr = aNodeArray;
   if (*aPath == kPathSeparatorChar) {
     aPath++;
   }
-  *nodePtr++ = aPath;
+  aNodeArray.AppendElement(aPath);
 
   for (char16_t* cp = aPath; *cp != 0; ++cp) {
     if (*cp == kPathSeparatorChar) {
@@ -190,13 +189,9 @@ SplitPath(char16_t* aPath, char16_t** aNodeArray, int32_t aArrayLen)
       if (*cp == 0) {
         break;
       }
-      if (nodePtr - aNodeArray >= aArrayLen) {
-        return -1;
-      }
-      *nodePtr++ = cp;
+      aNodeArray.AppendElement(cp);
     }
   }
-  return nodePtr - aNodeArray;
 }
 
 
@@ -206,7 +201,6 @@ nsLocalFile::GetRelativeDescriptor(nsIFile* aFromFile, nsACString& aResult)
   if (NS_WARN_IF(!aFromFile)) {
     return NS_ERROR_INVALID_ARG;
   }
-  const int32_t kMaxNodesInPath = 32;
 
   //
   // aResult will be UTF-8 encoded
@@ -216,9 +210,8 @@ nsLocalFile::GetRelativeDescriptor(nsIFile* aFromFile, nsACString& aResult)
   aResult.Truncate(0);
 
   nsAutoString thisPath, fromPath;
-  char16_t* thisNodes[kMaxNodesInPath];
-  char16_t* fromNodes[kMaxNodesInPath];
-  int32_t thisNodeCnt, fromNodeCnt, nodeIndex;
+  nsAutoTArray<char16_t*, 32> thisNodes;
+  nsAutoTArray<char16_t*, 32> fromNodes;
 
   rv = GetPath(thisPath);
   if (NS_FAILED(rv)) {
@@ -235,14 +228,13 @@ nsLocalFile::GetRelativeDescriptor(nsIFile* aFromFile, nsACString& aResult)
   char16_t* fromPathPtr;
   fromPath.BeginWriting(fromPathPtr);
 
-  thisNodeCnt = SplitPath(thisPathPtr, thisNodes, kMaxNodesInPath);
-  fromNodeCnt = SplitPath(fromPathPtr, fromNodes, kMaxNodesInPath);
-  if (thisNodeCnt < 0 || fromNodeCnt < 0) {
-    return NS_ERROR_FAILURE;
-  }
+  SplitPath(thisPathPtr, thisNodes);
+  SplitPath(fromPathPtr, fromNodes);
 
-  for (nodeIndex = 0; nodeIndex < thisNodeCnt &&
-       nodeIndex < fromNodeCnt; ++nodeIndex) {
+  size_t nodeIndex;
+  for (nodeIndex = 0;
+       nodeIndex < thisNodes.Length() && nodeIndex < fromNodes.Length();
+       ++nodeIndex) {
 #ifdef XP_WIN
     if (_wcsicmp(char16ptr_t(thisNodes[nodeIndex]),
                  char16ptr_t(fromNodes[nodeIndex]))) {
@@ -255,14 +247,14 @@ nsLocalFile::GetRelativeDescriptor(nsIFile* aFromFile, nsACString& aResult)
 #endif
   }
 
-  int32_t branchIndex = nodeIndex;
-  for (nodeIndex = branchIndex; nodeIndex < fromNodeCnt; ++nodeIndex) {
+  size_t branchIndex = nodeIndex;
+  for (nodeIndex = branchIndex; nodeIndex < fromNodes.Length(); ++nodeIndex) {
     aResult.AppendLiteral("../");
   }
-  for (nodeIndex = branchIndex; nodeIndex < thisNodeCnt; nodeIndex++) {
+  for (nodeIndex = branchIndex; nodeIndex < thisNodes.Length(); ++nodeIndex) {
     NS_ConvertUTF16toUTF8 nodeStr(thisNodes[nodeIndex]);
     aResult.Append(nodeStr);
-    if (nodeIndex + 1 < thisNodeCnt) {
+    if (nodeIndex + 1 < thisNodes.Length()) {
       aResult.Append('/');
     }
   }
@@ -321,3 +313,16 @@ nsLocalFile::SetRelativeDescriptor(nsIFile* aFromFile,
 
   return InitWithFile(targetFile);
 }
+
+NS_IMETHODIMP
+nsLocalFile::GetRelativePath(nsIFile* aFromFile, nsACString& aResult)
+{
+  return GetRelativeDescriptor(aFromFile, aResult);
+}
+
+NS_IMETHODIMP
+nsLocalFile::SetRelativePath(nsIFile* aFromFile,
+                             const nsACString& aRelativePath)
+{
+  return SetRelativeDescriptor(aFromFile, aRelativePath);
+}