Merge m-i to m-c
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 30 Jun 2013 08:36:29 -0700
changeset 136951 e24391ffbe7e56ac975d7564aa8d3126c62e9529
parent 136935 2858a7580535c6f76972d5f04b57cc74c4740efe (current diff)
parent 136950 d8abc39f2820e523c66c5164f6488e6527f04913 (diff)
child 136952 7965d384123c42ca0e4e4b18bc3ad73b26369f16
child 136953 ac17d84c8b7ce832ab2f1d97e951f7f3ad794000
child 136968 fe2f77d51bf19b62b9a2944cf711652b01a7574c
child 136990 a8ce130d013efef5021b29d4004a5f3c08c62455
push id24900
push userphilringnalda@gmail.com
push dateSun, 30 Jun 2013 15:36:46 +0000
treeherdermozilla-central@e24391ffbe7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone25.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
Merge m-i to m-c
--- a/content/media/webaudio/AudioBuffer.cpp
+++ b/content/media/webaudio/AudioBuffer.cpp
@@ -148,18 +148,17 @@ StealJSArrayDataIntoThreadSharedFloatArr
     JS::RootedObject arrayBuffer(aJSContext, JS_GetArrayBufferViewBuffer(aJSArrays[i]));
     void* dataToFree = nullptr;
     uint8_t* stolenData = nullptr;
     if (arrayBuffer &&
         JS_StealArrayBufferContents(aJSContext, arrayBuffer, &dataToFree,
                                     &stolenData)) {
       result->SetData(i, dataToFree, reinterpret_cast<float*>(stolenData));
     } else {
-      result->Clear();
-      return result.forget();
+      return nullptr;
     }
   }
   return result.forget();
 }
 
 ThreadSharedFloatArrayBufferList*
 AudioBuffer::GetThreadSharedChannelsForRate(JSContext* aJSContext)
 {
--- a/dom/indexedDB/Client.cpp
+++ b/dom/indexedDB/Client.cpp
@@ -79,16 +79,22 @@ Client::InitOrigin(const nsACString& aOr
     nsString leafName;
     rv = file->GetLeafName(leafName);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (StringEndsWith(leafName, NS_LITERAL_STRING(".sqlite-journal"))) {
       continue;
     }
 
+#ifdef XP_MACOSX
+    if (leafName.EqualsLiteral(DSSTORE_FILE_NAME)) {
+      continue;
+    }
+#endif
+
     bool isDirectory;
     rv = file->IsDirectory(&isDirectory);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (isDirectory) {
       if (!validSubdirs.GetEntry(leafName)) {
         subdirsToProcess.AppendElement(leafName);
       }
--- a/dom/quota/QuotaCommon.h
+++ b/dom/quota/QuotaCommon.h
@@ -15,16 +15,18 @@
 
 #define BEGIN_QUOTA_NAMESPACE \
   namespace mozilla { namespace dom { namespace quota {
 #define END_QUOTA_NAMESPACE \
   } /* namespace quota */ } /* namespace dom */ } /* namespace mozilla */
 #define USING_QUOTA_NAMESPACE \
   using namespace mozilla::dom::quota;
 
+#define DSSTORE_FILE_NAME ".DS_Store"
+
 BEGIN_QUOTA_NAMESPACE
 
 #ifdef DEBUG
 void
 AssertIsOnIOThread();
 #else
 inline void
 AssertIsOnIOThread()
--- a/dom/quota/QuotaManager.cpp
+++ b/dom/quota/QuotaManager.cpp
@@ -902,16 +902,22 @@ QuotaManager::EnsureOriginIsInitialized(
     nsString leafName;
     rv = file->GetLeafName(leafName);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (leafName.EqualsLiteral(METADATA_FILE_NAME)) {
       continue;
     }
 
+#ifdef XP_MACOSX
+    if (leafName.EqualsLiteral(DSSTORE_FILE_NAME)) {
+      continue;
+    }
+#endif
+
     bool isDirectory;
     rv = file->IsDirectory(&isDirectory);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (!isDirectory) {
       NS_WARNING("Unknown file found!");
       return NS_ERROR_UNEXPECTED;
     }
@@ -2058,16 +2064,22 @@ AsyncUsageRunnable::RunInternal()
           nsString leafName;
           rv = file->GetLeafName(leafName);
           NS_ENSURE_SUCCESS(rv, rv);
 
           if (leafName.EqualsLiteral(METADATA_FILE_NAME)) {
             continue;
           }
 
+#ifdef XP_MACOSX
+          if (leafName.EqualsLiteral(DSSTORE_FILE_NAME)) {
+            continue;
+          }
+#endif
+
           if (!initialized) {
             bool isDirectory;
             rv = file->IsDirectory(&isDirectory);
             NS_ENSURE_SUCCESS(rv, rv);
 
             if (!isDirectory) {
               NS_WARNING("Unknown file found!");
               return NS_ERROR_UNEXPECTED;
--- a/toolkit/mozapps/installer/packager.py
+++ b/toolkit/mozapps/installer/packager.py
@@ -5,16 +5,17 @@
 from mozpack.packager.formats import (
     FlatFormatter,
     JarFormatter,
     OmniJarFormatter,
 )
 from mozpack.packager import (
     preprocess_manifest,
     preprocess,
+    Component,
     SimpleManifestSink,
 )
 from mozpack.files import (
     GeneratedFile,
     FileFinder,
     File,
 )
 from mozpack.copier import (
@@ -310,17 +311,17 @@ def main():
             sinkformatter = NoPkgFilesRemover(formatter,
                                               args.manifest is not None)
         else:
             sinkformatter = formatter
         sink = SimpleManifestSink(finder, sinkformatter)
         if args.manifest:
             preprocess_manifest(sink, args.manifest, defines)
         else:
-            sink.add('', 'bin/*')
+            sink.add(Component(''), 'bin/*')
         sink.close(args.manifest is not None)
 
         if args.removals:
             lines = [l.lstrip() for l in open(args.removals).readlines()]
             removals_in = StringIO(''.join(lines))
             removals_in.name = args.removals
             removals = RemovedFiles(copier)
             preprocess(removals_in, removals, defines)