Merge inbound to m-c.

accessible/src/windows/ia2/Makefile.in

@@ -9,7 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_ia2_s
 EXPORT_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max

accessible/src/windows/ia2/moz.build

@@ -32,3 +32,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'accessibility_toolkit_ia2_s'
+

accessible/src/windows/msaa/Makefile.in

@@ -9,7 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_msaa_s
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

accessible/src/windows/msaa/moz.build

@@ -44,3 +44,5 @@ if CONFIG['MOZ_XUL']:
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'accessibility_toolkit_msaa_s'
+

accessible/src/windows/sdn/Makefile.in

@@ -9,7 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_sdn_s
 EXPORT_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max

accessible/src/windows/sdn/moz.build

@@ -13,3 +13,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'accessibility_toolkit_sdn_s'
+

accessible/src/windows/uia/Makefile.in

@@ -9,7 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_uia_s
 EXPORT_LIBRARY = ..
 
 # The midl generated code include Windows headers which defines min and max

accessible/src/windows/uia/moz.build

@@ -12,3 +12,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'accessibility_toolkit_uia_s'
+

accessible/tests/mochitest/name/Makefile.in

@@ -22,8 +22,12 @@ MOCHITEST_A11Y_FILES =\
 		test_markup.html \
 		test_svg.html \
 		test_browserui.xul \
-		test_tree.xul \
 		markuprules.xml \
 		$(NULL)
 
+# Disabled on mac while bug 905909 is sorted out.
+ifneq ($(OS_ARCH), Darwin)
+MOCHITEST_A11Y_FILES += test_tree.xul
+endif
+
 include $(topsrcdir)/config/rules.mk

accessible/tests/mochitest/states/Makefile.in

@@ -31,7 +31,6 @@ MOCHITEST_A11Y_FILES =\
 		test_stale.html \
 		test_textbox.xul \
 		test_tabs.xul \
-		test_tree.xul \
 		test_visibility.html \
 		test_visibility.xul \
 		z_frames.html \
@@ -41,4 +40,9 @@ MOCHITEST_A11Y_FILES =\
 		z_frames_update.html \
 		$(NULL)
 
+# Disabled on mac while bug 905909 is sorted out.
+ifneq ($(OS_ARCH), Darwin)
+MOCHITEST_A11Y_FILES += test_tree.xul
+endif
+
 include $(topsrcdir)/config/rules.mk

chrome/src/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME    = chrome_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

chrome/src/moz.build

@@ -21,3 +21,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'chrome_s'
+

config/rules.mk

@@ -24,6 +24,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   GTEST_CSRCS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
+  LIBRARY_NAME \
   LIBXUL_LIBRARY \
   MODULE \
   MSVC_ENABLE_PGO \

content/base/src/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconbase_s
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \

content/base/src/moz.build

@@ -176,3 +176,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconbase_s'
+

content/base/src/nsXMLHttpRequest.h

@@ -90,7 +90,7 @@ public:
 
   JSObject* getArrayBuffer(JSContext* aCx);
 
-protected:  // njn?
+protected:
   static bool areOverlappingRegions(const uint8_t* aStart1, uint32_t aLength1,
                                     const uint8_t* aStart2, uint32_t aLength2);
 };

content/canvas/src/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconcvs_s
 ifdef MOZ_WEBGL
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \

content/canvas/src/moz.build

@@ -81,3 +81,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconcvs_s'
+

content/events/src/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconevents_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

content/events/src/moz.build

@@ -73,3 +73,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconevents_s'
+

content/html/content/src/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconhtmlcon_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

content/html/content/src/moz.build

@@ -160,3 +160,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconhtmlcon_s'
+

content/html/content/src/nsTextEditorState.cpp

@@ -50,6 +50,33 @@ static NS_DEFINE_CID(kTextEditorCID, NS_TEXTEDITOR_CID);
 static nsINativeKeyBindings *sNativeInputBindings = nullptr;
 static nsINativeKeyBindings *sNativeTextAreaBindings = nullptr;
 
+class MOZ_STACK_CLASS ValueSetter
+{
+public:
+  ValueSetter(nsIEditor* aEditor)
+    : mEditor(aEditor)
+  {
+    MOZ_ASSERT(aEditor);
+  
+    // To protect against a reentrant call to SetValue, we check whether
+    // another SetValue is already happening for this editor.  If it is,
+    // we must wait until we unwind to re-enable oninput events.
+    mEditor->GetSuppressDispatchingInputEvent(&mOuterTransaction);
+  }
+  ~ValueSetter()
+  {
+    mEditor->SetSuppressDispatchingInputEvent(mOuterTransaction);
+  }
+  void Init()
+  {
+    mEditor->SetSuppressDispatchingInputEvent(true);
+  }
+
+private:
+  nsCOMPtr<nsIEditor> mEditor;
+  bool mOuterTransaction;
+};
+
 class RestoreSelectionState : public nsRunnable {
 public:
   RestoreSelectionState(nsTextEditorState *aState, nsTextControlFrame *aFrame)
@@ -1808,7 +1835,7 @@ nsTextEditorState::SetValue(const nsAString& aValue, bool aUserInput,
     // this is necessary to avoid infinite recursion
     if (!currentValue.Equals(aValue))
     {
-      nsTextControlFrame::ValueSetter valueSetter(mEditor);
+      ValueSetter valueSetter(mEditor);
 
       // \r is an illegal character in the dom, but people use them,
       // so convert windows and mac platform linebreaks to \n:
@@ -1902,7 +1929,6 @@ nsTextEditorState::SetValue(const nsAString& aValue, bool aUserInput,
           if (!mBoundFrame) {
             SetValue(newValue, false, aSetValueChanged);
           }
-          valueSetter.Cancel();
           return;
         }
 

content/mathml/content/src/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkcontentmathml_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

content/mathml/content/src/moz.build

@@ -15,3 +15,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkcontentmathml_s'
+

content/media/Makefile.in

@@ -9,7 +9,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = gkconmedia_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

content/media/StreamBuffer.h

@@ -164,13 +164,7 @@ public:
     void ForgetUpTo(TrackTicks aTime)
     {
       mSegment->ForgetUpTo(aTime);
-#ifdef DEBUG
-      mForgottenUpTo = std::max<TrackTicks>(mForgottenUpTo, aTime);
-#endif
     }
-#ifdef DEBUG
-    TrackTicks GetForgottenUpTo() { return mForgottenUpTo; }
-#endif
 
   protected:
     friend class StreamBuffer;
@@ -185,7 +179,6 @@ public:
     TrackID mID;
     // True when the track ends with the data in mSegment
     bool mEnded;
-    DebugOnly<TrackTicks> mForgottenUpTo;
   };
 
   class CompareTracksByID {

content/media/TextTrackCue.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/HTMLTrackElement.h"
 #include "mozilla/dom/TextTrackCue.h"
-#include "mozilla/dom/TextTrackCueBinding.h"
 #include "mozilla/dom/ProcessingInstruction.h"
 #include "nsIFrame.h"
 #include "nsTextNode.h"
@@ -213,7 +212,7 @@ TextTrackCue::ConvertLeafNodeToContent(const webvtt_node* aWebVTTNode)
 JSObject*
 TextTrackCue::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return TextTrackCueBinding::Wrap(aCx, aScope, this);
+  return VTTCueBinding::Wrap(aCx, aScope, this);
 }
 
 void

content/media/TextTrackCue.h

@@ -9,7 +9,7 @@
 
 #include "mozilla/dom/DocumentFragment.h"
 #include "mozilla/dom/TextTrack.h"
-#include "mozilla/dom/TextTrackCueBinding.h"
+#include "mozilla/dom/VTTCueBinding.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDOMEventTargetHelper.h"
 #include "nsIDocument.h"

content/media/directshow/DirectShowReader.cpp

@@ -167,6 +167,7 @@ DirectShowReader::ReadMetadata(VideoInfo* aInfo,
   mInfo.mHasVideo = false;
 
   *aInfo = mInfo;
+  // Note: The SourceFilter strips ID3v2 tags out of the stream.
   *aTags = nullptr;
 
   // Begin decoding!

content/media/directshow/Makefile.in

@@ -9,7 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkcondirectshow_s
 LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/
 
 ifeq ($(OS_ARCH),WINNT)

content/media/directshow/SourceFilter.cpp

@@ -8,6 +8,7 @@
 #include "MediaResource.h"
 #include "mozilla/RefPtr.h"
 #include "DirectShowUtils.h"
+#include "prlog.h"
 
 using namespace mozilla::media;
 
@@ -59,6 +60,45 @@ public:
   uint32_t mCount;
 };
 
+// A wrapper around media resource that presents only a partition of the
+// underlying resource to the caller to use. The partition returned is from
+// an offset to the end of stream, and this object deals with ensuring
+// the offsets and lengths etc are translated from the reduced partition
+// exposed to the caller, to the absolute offsets of the underlying stream.
+class MediaResourcePartition {
+public:
+  MediaResourcePartition(MediaResource* aResource,
+                         int64_t aDataStart)
+    : mResource(aResource),
+      mDataOffset(aDataStart)
+  {}
+
+  int64_t GetLength() {
+    int64_t len = mResource->GetLength();
+    if (len == -1) {
+      return len;
+    }
+    return std::max<int64_t>(0, len - mDataOffset);
+  }
+  nsresult ReadAt(int64_t aOffset, char* aBuffer,
+                  uint32_t aCount, uint32_t* aBytes)
+  {
+    return mResource->ReadAt(aOffset + mDataOffset,
+                             aBuffer,
+                             aCount,
+                             aBytes);
+  }
+  int64_t GetCachedDataEnd() {
+    int64_t tell = mResource->Tell();
+    int64_t dataEnd = mResource->GetCachedDataEnd(tell) - mDataOffset;
+    return dataEnd;
+  }
+private:
+  // MediaResource from which we read data.
+  RefPtr<MediaResource> mResource;
+  int64_t mDataOffset;
+};
+
 
 // Output pin for SourceFilter, which implements IAsyncReader, to
 // allow downstream filters to pull/read data from it. Downstream pins
@@ -67,6 +107,10 @@ public:
 // using SyncRead(). This class is a delegate (tear off) of
 // SourceFilter.
 //
+// We can expose only a segment of the MediaResource to the filter graph.
+// This is used to strip off the ID3v2 tags from the stream, as DirectShow
+// has trouble parsing some headers.
+//
 // Implements:
 //  * IAsyncReader
 //  * IPin
@@ -81,7 +125,8 @@ public:
 
   OutputPin(MediaResource* aMediaResource,
             SourceFilter* aParent,
-            CriticalSection& aFilterLock);
+            CriticalSection& aFilterLock,
+            int64_t aMP3DataStart);
   virtual ~OutputPin();
 
   // IUnknown
@@ -154,8 +199,7 @@ private:
   // The filter that owns us. Weak reference, as we're a delegate (tear off).
   SourceFilter* mParentSource;
 
-  // MediaResource from which we read data.
-  RefPtr<MediaResource> mResource;
+  MediaResourcePartition mResource;
 
   // Counter, inc'd in BeginFlush(), dec'd in EndFlush(). Calls to this can
   // come from multiple threads and can interleave, hence the counter.
@@ -178,7 +222,8 @@ private:
 
 OutputPin::OutputPin(MediaResource* aResource,
                      SourceFilter* aParent,
-                     CriticalSection& aFilterLock)
+                     CriticalSection& aFilterLock,
+                     int64_t aMP3DataStart)
   : BasePin(static_cast<BaseFilter*>(aParent),
             &aFilterLock,
             L"MozillaOutputPin",
@@ -186,14 +231,13 @@ OutputPin::OutputPin(MediaResource* aResource,
     mPinLock(aFilterLock),
     mSignal(&mPinLock),
     mParentSource(aParent),
-    mResource(aResource),
+    mResource(aResource, aMP3DataStart),
     mFlushCount(0),
     mBytesConsumed(0),
     mQueriedForAsyncReader(false)
 {
   MOZ_COUNT_CTOR(OutputPin);
   LOG("OutputPin::OutputPin()");
-  mResource->Seek(nsISeekableStream::NS_SEEK_SET, 0);
 }
 
 OutputPin::~OutputPin()
@@ -466,7 +510,7 @@ OutputPin::SyncReadAligned(IMediaSample* aSample)
 
   // If the range extends off the end of stream, truncate to the end of stream
   // as per IAsyncReader specificiation.
-  int64_t streamLength = mResource->GetLength();
+  int64_t streamLength = mResource.GetLength();
   if (streamLength != -1) {
     // We know the exact length of the stream, fail if the requested offset
     // is beyond it.
@@ -512,10 +556,10 @@ OutputPin::SyncRead(LONGLONG aPosition,
     BYTE* readBuffer = aBuffer + totalBytesRead;
     uint32_t bytesRead = 0;
     LONG length = aLength - totalBytesRead;
-    nsresult rv = mResource->ReadAt(aPosition + totalBytesRead,
-                                    reinterpret_cast<char*>(readBuffer),
-                                    length,
-                                    &bytesRead);
+    nsresult rv = mResource.ReadAt(aPosition + totalBytesRead,
+                                   reinterpret_cast<char*>(readBuffer),
+                                   length,
+                                   &bytesRead);
     if (NS_FAILED(rv)) {
       return E_FAIL;
     }
@@ -535,7 +579,7 @@ STDMETHODIMP
 OutputPin::Length(LONGLONG* aTotal, LONGLONG* aAvailable)
 {
   HRESULT hr = S_OK;
-  int64_t length = mResource->GetLength();
+  int64_t length = mResource.GetLength();
   if (length == -1) {
     hr = VFW_S_ESTIMATED;
     // Don't have a length. Just lie, it seems to work...
@@ -544,7 +588,7 @@ OutputPin::Length(LONGLONG* aTotal, LONGLONG* aAvailable)
     *aTotal = length;
   }
   if (aAvailable) {
-    *aAvailable = mResource->GetCachedDataEnd(mResource->Tell());
+    *aAvailable = mResource.GetCachedDataEnd();
   }
 
   LOG("OutputPin::Length() len=%lld avail=%lld", *aTotal, *aAvailable);
@@ -615,14 +659,82 @@ SourceFilter::GetMediaType() const
   return &mMediaType;
 }
 
+// Gets the length of the ID3v2 tag which starts at aStartOffset.
+static nsresult
+GetID3TagLength(MediaResource* aResource,
+                int64_t aStartOffset,
+                int32_t* aLength)
+{
+  MOZ_ASSERT(aLength);
+  char header[10];
+  uint32_t totalBytesRead = 0;
+  while (totalBytesRead < 10) {
+    uint32_t bytesRead = 0;
+    nsresult rv = aResource->ReadAt(aStartOffset + totalBytesRead,
+                                    header+totalBytesRead,
+                                    10-totalBytesRead,
+                                    &bytesRead);
+    NS_ENSURE_SUCCESS(rv, rv);
+    if (bytesRead == 0) {
+      // Reached end of file?
+      return NS_ERROR_FAILURE;
+    }
+    totalBytesRead += bytesRead;
+  }
+  if (strncmp("ID3", header, 3)) {
+    // No ID3v2 header
+    *aLength = 0;
+    return NS_OK;
+  }
+
+  int32_t id3Length =
+    10 +
+    (int32_t(0x7f & header[6]) << 21) +
+    (int32_t(0x7f & header[7]) << 14) +
+    (int32_t(0x7f & header[8]) << 7) +
+     int32_t(0x7f & header[9]);
+
+  *aLength = id3Length;
+  return NS_OK;
+}
+
+// Parses the ID3v2 headers in the resource and returns the offset of the
+// MP3 data after the ID3v2 headers. This is used to trim off the ID3v2 headers,
+// as DirectShow can't handle some ID3v2 tags (possibly ones that are large).
+static nsresult
+GetMP3DataOffset(MediaResource* aResource, int64_t* aOutOffset)
+{
+  nsresult rv;
+  int64_t id3TagsEndOffset = 0;
+  int32_t length = 0;
+  do {
+    rv = GetID3TagLength(aResource, id3TagsEndOffset, &length);
+    NS_ENSURE_SUCCESS(rv, rv);
+    if (length > 0) {
+      id3TagsEndOffset += length;
+    }
+  } while (length > 0);
+  *aOutOffset = id3TagsEndOffset;
+  return NS_OK;
+}
+
 nsresult
 SourceFilter::Init(MediaResource* aResource)
 {
   LOG("SourceFilter::Init()");
 
+  // Get the offset of MP3 data in the stream, and pass that into
+  // the output pin so that the stream that we present to DirectShow
+  // does not contain ID3v2 tags. DirectShow can't properly parse some
+  // streams' ID3v2 tags.
+  int64_t mp3DataOffset = 0;
+  nsresult rv = GetMP3DataOffset(aResource, &mp3DataOffset);
+  NS_ENSURE_SUCCESS(rv, rv);
+
   mOutputPin = new OutputPin(aResource,
                              this,
-                             mLock);
+                             mLock,
+                             mp3DataOffset);
   NS_ENSURE_TRUE(mOutputPin != nullptr, NS_ERROR_FAILURE);
 
   return NS_OK;

content/media/directshow/moz.build

@@ -38,3 +38,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkcondirectshow_s'
+

content/media/mediasource/Makefile.in

@@ -8,5 +8,4 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconmediasource_s
 include $(topsrcdir)/config/rules.mk

content/media/mediasource/moz.build

@@ -30,3 +30,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconmediasource_s'
+

content/media/moz.build

@@ -141,3 +141,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconmedia_s'
+

content/media/omx/Makefile.in

@@ -9,7 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconomx_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

content/media/omx/mediaresourcemanager/Makefile.in

@@ -9,8 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= mediaresourcemanager
-
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk

content/media/omx/mediaresourcemanager/moz.build

@@ -14,3 +14,5 @@ CPP_SOURCES += [
     'MediaResourceManagerService.cpp',
 ]
 
+LIBRARY_NAME = 'mediaresourcemanager'
+

content/media/omx/moz.build

@@ -21,3 +21,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconomx_s'
+

content/media/test/Makefile.in

@@ -245,6 +245,7 @@ MOCHITEST_FILES += \
 		multiple-bos.ogg \
 		no-cues.webm \
 		owl.mp3 \
+		owl-funny-id3.mp3 \
 		split.webm \
 		seek.ogv \
 		seek.webm \

content/media/test/manifest.js

@@ -182,6 +182,9 @@ var gPlayTests = [
   { name:"small-shot.m4a", type:"audio/mp4", duration:0.29 },
   { name:"small-shot.mp3", type:"audio/mpeg", duration:0.27 },
   { name:"owl.mp3", type:"audio/mpeg", duration:3.29 },
+  // owl.mp3 as above, but with something funny going on in the ID3v2 tag
+  // that causes DirectShow to fail.
+  { name:"owl-funny-id3.mp3", type:"audio/mpeg", duration:3.29 },
 
   // Invalid file
   { name:"bogus.duh", type:"bogus/duh", duration:Number.NaN }

content/media/test/test_bug895305.html

@@ -25,8 +25,8 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
     window.ttl = audio.textTracks;
     ttl.addEventListener("click", function(){}, false);
 
-    // Check leaking on TextTrackCue objects.
-    window.ttc = new TextTrackCue(3, 4, "Test.");
+    // Check leaking on VTTCue objects.
+    window.ttc = new VTTCue(3, 4, "Test.");
     ttc.addEventListener("click", function() {}, false);
 
     // Check leaking on TextTrack objects.

content/media/test/test_texttrackcue.html

@@ -39,6 +39,10 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
       var cueList = trackElement.track.cues;
       todo_is(cueList.length, 4, "Cue list length should be 4.");
 
+      // Check that the typedef of TextTrackCue works in Gecko.
+      is(window.TextTrackCue, undefined, "TextTrackCue should be undefined.");
+      isnot(window.VTTCue, undefined, "VTTCue should be defined.");
+
       // Check if first cue was parsed correctly.
       // FIXME: disabled by bug 887463.
       if (false) {
@@ -70,12 +74,12 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
       cue.pauseOnExit = true;
       is(cue.pauseOnExit, true, "Cue's pause on exit flag should be true.");
 
-      // Check that we can create and add new TextTrackCues
-      var textTrackCue = new TextTrackCue(3.999, 4, "foo");
-      trackElement.track.addCue(textTrackCue);
+      // Check that we can create and add new VTTCues
+      var vttCue = new VTTCue(3.999, 4, "foo");
+      trackElement.track.addCue(vttCue);
       is(cueList.length, 5, "Cue list length should now be 5.");
 
-      // Check that new TestTrackCue was added correctly
+      // Check that new VTTCue was added correctly
       cue = cueList[4];
       is(cue.startTime, 3.999, "Cue's start time should be 3.999.");
       is(cue.endTime, 4, "Cue's end time should be 4.");
@@ -84,7 +88,7 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
       // Adding the same cue again should not increase the cue count.
       // TODO: https://bugzilla.mozilla.org/show_bug.cgi?id=867823
       //       http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#dom-texttrack-addcue
-      trackElement.track.addCue(textTrackCue);
+      trackElement.track.addCue(vttCue);
       todo_is(cueList.length, 5, "Cue list length should be 5.");
 
       // Check that we are able to remove cues.
@@ -99,7 +103,7 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
       var exceptionHappened = false;
       try {
         // We should not be able to remove a cue that is not in the list.
-        cue = new TextTrackCue(1, 2, "foo");
+        cue = new VTTCue(1, 2, "foo");
         trackElement.removeCue(cue);
       } catch (e) {
         // "NotFoundError" should be thrown when trying to remove a cue that is

content/media/test/test_webvtt_disabled.html

@@ -24,7 +24,7 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", false]]},
     is(video.addTextTrack, undefined, "HTMLMediaElement::AddTextTrack() function should be unavailable.");
     is(typeof TextTrackList, "undefined", "TextTrackList should not be available.");
     is(typeof TextTrack, "undefined", "TextTrack should not be available.");
-    is(typeof TextTrackCue, "undefined", "TextTrackCue should not be available.");
+    is(typeof VTTCue, "undefined", "VTTCue should not be available.");
     is(typeof TextTrackCueList, "undefined", "TextTrackCueList should not be available.");
     SimpleTest.finish();
   }

content/media/webaudio/Makefile.in

@@ -9,6 +9,5 @@ VPATH            := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   := gkconwebaudio_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

content/media/webaudio/blink/Makefile.in

@@ -9,7 +9,6 @@ VPATH            := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   := gkconwebaudio_blink_s
 LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio
 
 include $(topsrcdir)/config/rules.mk

content/media/webaudio/blink/moz.build

@@ -27,3 +27,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebaudio_blink_s'
+

content/media/webaudio/moz.build

@@ -88,3 +88,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebaudio_s'
+

content/media/webrtc/Makefile.in

@@ -9,7 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = gkconwebrtc_s
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif

content/media/webrtc/moz.build

@@ -25,3 +25,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebrtc_s'
+

content/media/webspeech/recognition/Makefile.in

@@ -14,7 +14,6 @@ VPATH += \
   $(srcdir)/test \
   $(NULL)
 
-LIBRARY_NAME   := gkconwebspeechrecognition_s
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 include $(topsrcdir)/config/rules.mk

content/media/webspeech/recognition/SpeechRecognition.cpp

@@ -10,12 +10,16 @@
 #include "nsCycleCollectionParticipant.h"
 
 #include "mozilla/dom/SpeechRecognitionBinding.h"
+#include "mozilla/MediaManager.h"
+#include "mozilla/Services.h"
 
 #include "AudioSegment.h"
 #include "endpointer.h"
 
 #include "GeneratedEvents.h"
 #include "nsIDOMSpeechRecognitionEvent.h"
+#include "nsIObserverService.h"
+#include "nsServiceManagerUtils.h"
 
 #include <algorithm>
 
@@ -624,8 +628,7 @@ SpeechRecognition::GetGrammars(ErrorResult& aRv) const
 }
 
 void
-SpeechRecognition::SetGrammars(mozilla::dom::SpeechGrammarList& aArg,
-                               ErrorResult& aRv)
+SpeechRecognition::SetGrammars(SpeechGrammarList& aArg, ErrorResult& aRv)
 {
   aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
   return;

content/media/webspeech/recognition/SpeechRecognition.h

@@ -13,7 +13,8 @@
 #include "nsWrapperCache.h"
 #include "nsTArray.h"
 
-#include "MediaManager.h"
+#include "nsIDOMNavigatorUserMedia.h"
+#include "nsITimer.h"
 #include "MediaEngine.h"
 #include "MediaStreamGraph.h"
 #include "AudioSegment.h"

content/media/webspeech/recognition/moz.build

@@ -42,3 +42,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebspeechrecognition_s'
+

content/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp

@@ -12,6 +12,8 @@
 #include "SpeechRecognitionAlternative.h"
 #include "SpeechRecognitionResult.h"
 #include "SpeechRecognitionResultList.h"
+#include "nsIObserverService.h"
+#include "mozilla/Services.h"
 
 namespace mozilla {
 

content/media/webspeech/synth/Makefile.in

@@ -13,7 +13,6 @@ VPATH += \
   $(srcdir)/ipc \
   $(NULL)
 
-LIBRARY_NAME   := gkconwebspeechsynth_s
 EXPORT_LIBRARY  = 1
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 

content/media/webspeech/synth/moz.build

@@ -47,3 +47,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebspeechsynth_s'
+

content/media/wmf/WMFReader.cpp

@@ -598,7 +598,7 @@ WMFReader::ReadMetadata(VideoInfo* aInfo,
       }
     }
     if (FAILED(hr)) {
-      LOG("Failed to set DXVA2 D3D Device manager on decoder");
+      LOG("Failed to set DXVA2 D3D Device manager on decoder hr=0x%x", hr);
       mUseHwAccel = false;
       // Re-run the configuration process, so that the output video format
       // is set correctly to reflect that hardware acceleration is disabled.

content/smil/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconsmil_s
 LOCAL_INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \

content/smil/moz.build

@@ -65,3 +65,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconsmil_s'
+

content/svg/content/src/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkcontentsvg_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

content/svg/content/src/moz.build

@@ -248,3 +248,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkcontentsvg_s'
+

content/xbl/src/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconxbl_s
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \

content/xbl/src/moz.build

@@ -42,3 +42,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconxbl_s'
+

content/xbl/src/nsXBLProtoImpl.cpp

@@ -18,6 +18,7 @@
 #include "nsXBLPrototypeBinding.h"
 #include "nsXBLProtoImplProperty.h"
 #include "nsIURI.h"
+#include "mozilla/dom/XULElementBinding.h"
 #include "xpcpublic.h"
 
 using namespace mozilla;
@@ -156,6 +157,15 @@ nsXBLProtoImpl::InitTargetObjects(nsXBLPrototypeBinding* aBinding,
   JS::Rooted<JSObject*> global(cx, sgo->GetGlobalJSObject());
   nsCOMPtr<nsIXPConnectJSObjectHolder> wrapper;
   JS::Rooted<JS::Value> v(cx);
+
+  {
+    JSAutoCompartment ac(cx, global);
+    // Make sure the interface object is created before the prototype object
+    // so that XULElement is hidden from content. See bug 909340.
+    bool defineOnGlobal = dom::XULElementBinding::ConstructorEnabled(cx, global);
+    dom::XULElementBinding::GetConstructorObject(cx, global, defineOnGlobal);
+  }
+
   rv = nsContentUtils::WrapNative(cx, global, aBoundElement, v.address(),
                                   getter_AddRefs(wrapper));
   NS_ENSURE_SUCCESS(rv, rv);

docshell/base/Makefile.in

@@ -10,7 +10,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = basedocshell_s
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif

docshell/base/moz.build

@@ -68,3 +68,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'basedocshell_s'
+

dom/activities/src/Makefile.in

@@ -9,7 +9,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = dom_activities_s
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk

dom/activities/src/moz.build

@@ -32,3 +32,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'dom_activities_s'
+

dom/alarm/Makefile.in

@@ -9,7 +9,6 @@ VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME        = domalarm_s
 include $(topsrcdir)/dom/dom-config.mk
 
 

dom/alarm/moz.build

@@ -37,3 +37,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'domalarm_s'
+

dom/audiochannel/Makefile.in

@@ -19,7 +19,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = domaudiochannel_s
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/audiochannel/moz.build

@@ -31,3 +31,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'domaudiochannel_s'
+

dom/base/Makefile.in

@@ -9,7 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= jsdombase_s
 include $(topsrcdir)/dom/dom-config.mk
 
 ifdef MOZ_JSDEBUGGER

dom/base/moz.build

@@ -118,3 +118,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'jsdombase_s'
+

dom/base/nsGlobalWindow.cpp

@@ -31,6 +31,7 @@
 #include "nsDOMWindowList.h"
 #include "nsIDOMWakeLock.h"
 #include "nsIDocShellTreeOwner.h"
+#include "nsIPermissionManager.h"
 #include "nsIScriptContext.h"
 #include "nsIScriptTimeoutHandler.h"
 #include "nsDOMWindowResizeEventDetail.h"

dom/base/nsJSEnvironment.cpp

@@ -1836,8 +1836,10 @@ nsJSContext::InitClasses(JS::Handle<JSObject*> aGlobalObj)
   ::JS_DefineProfilingFunctions(cx, aGlobalObj);
 
 #ifdef NS_TRACE_MALLOC
-  // Attempt to initialize TraceMalloc functions
-  ::JS_DefineFunctions(cx, aGlobalObj, TraceMallocFunctions);
+  if (nsContentUtils::IsCallerChrome()) {
+    // Attempt to initialize TraceMalloc functions
+    ::JS_DefineFunctions(cx, aGlobalObj, TraceMallocFunctions);
+  }
 #endif
 
 #ifdef MOZ_DMD

dom/battery/Makefile.in

@@ -9,7 +9,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = dom_battery_s
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \

dom/battery/moz.build

@@ -19,3 +19,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'dom_battery_s'
+

dom/bindings/Bindings.conf

@@ -1241,6 +1241,10 @@ DOMInterfaces = {
     'concrete': False,
 }],
 
+'VTTCue': {
+   'nativeType': 'mozilla::dom::TextTrackCue'
+},
+
 'WebGLActiveInfo': {
    'nativeType': 'mozilla::WebGLActiveInfo',
    'headerFile': 'WebGLActiveInfo.h',

dom/bindings/Makefile.in

@@ -9,7 +9,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = dombindings_s
 EXPORT_LIBRARY   = 1
 
 # Need this to find all our DOM source files.

dom/bindings/crashtests/crashtests.list

@@ -1,4 +1,4 @@
-asserts-if(cocoaWidget,0-1) load 769464.html
+skip-if(1) load 769464.html # bug 823822 - assert often leaks into other tests
 load 822340-1.html
 load 822340-2.html
 load 832899.html

dom/bindings/moz.build

@@ -35,3 +35,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'dombindings_s'
+

dom/bindings/test/Makefile.in

@@ -8,7 +8,6 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 
-LIBRARY_NAME     = dombindings_test_s
 # Do NOT export this library.  We don't actually want our test code
 # being added to libxul or anything.
 

dom/bindings/test/moz.build

@@ -14,3 +14,5 @@ LIBXUL_LIBRARY = True
 # Do NOT export this library.  We don't actually want our test code
 # being added to libxul or anything.
 
+LIBRARY_NAME = 'dombindings_test_s'
+

dom/bluetooth/Makefile.in

@@ -23,7 +23,6 @@ VPATH += $(srcdir)/ipc
 
 ifneq (,$(MOZ_B2G_BT))
 
-LIBRARY_NAME     = dombluetooth_s
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 VPATH += \

dom/bluetooth/moz.build

@@ -17,6 +17,7 @@
 if CONFIG['MOZ_B2G_BT']:
     LIBXUL_LIBRARY = True
     MODULE = 'dom'
+    LIBRARY_NAME = 'dombluetooth_s'
     XPIDL_MODULE = 'dom_bluetooth'
     XPIDL_SOURCES += [
         'nsIDOMBluetoothDevice.idl',

dom/browser-element/Makefile.in

@@ -9,7 +9,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = dom_browserelement_s
 include $(topsrcdir)/dom/dom-config.mk
 
 

dom/browser-element/moz.build

@@ -32,3 +32,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'dom_browserelement_s'
+

dom/camera/Makefile.in

@@ -9,7 +9,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = domcamera_s
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/camera/moz.build

@@ -49,3 +49,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'domcamera_s'
+

dom/cellbroadcast/src/Makefile.in

@@ -9,7 +9,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = dom_cellbroadcast_s
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk

dom/cellbroadcast/src/moz.build

@@ -18,3 +18,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'dom_cellbroadcast_s'
+

dom/devicestorage/Makefile.in

@@ -9,7 +9,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = domdevicestorage_s
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \

dom/devicestorage/moz.build

@@ -34,3 +34,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'domdevicestorage_s'
+

dom/encoding/Makefile.in

@@ -8,7 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= domencoding_s
 LOCAL_INCLUDES = \
 	-I$(topsrcdir)/intl/locale/src \
 	$(NULL)

dom/encoding/moz.build

@@ -24,3 +24,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'domencoding_s'
+

dom/file/Makefile.in

@@ -9,7 +9,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = domfile_s
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk