diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 67ac3e19088a..9f89b4574051 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 3e52bbe5eb3e..48c3494a597a 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 67ac3e19088a..9f89b4574051 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 8426fbb1432b..8b1a888e0085 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
{
- "revision": "1adfbae4582a2cebf4b35c822044299aa8dd1026",
+ "revision": "8d15cd3ac0d07cde9ff36ce611ae47e6ef30d9b0",
"repo_path": "/integration/gaia-central"
}
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index b0b9308c8625..e23c51fd8549 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index cdee45f731ce..fb5df089ead5 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml
index 08599d12b159..e29cafb03970 100644
--- a/b2g/config/inari/sources.xml
+++ b/b2g/config/inari/sources.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml
index 8605ef239ed6..eecebdf6777e 100644
--- a/b2g/config/leo/sources.xml
+++ b/b2g/config/leo/sources.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml
index 1a53811158c1..d62639c8da4b 100644
--- a/b2g/config/mako/sources.xml
+++ b/b2g/config/mako/sources.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index e069cc91cb77..ac814e185830 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/config/config.mk b/config/config.mk
index a1cbfc49b5e5..e407f845e538 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -420,8 +420,7 @@ ifdef _MSC_VER
OS_LDFLAGS += $(DELAYLOAD_LDFLAGS)
endif # _MSC_VER
-# Does the makefile specifies the internal XPCOM API linkage?
-ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY))
+ifneq (,$(LIBXUL_LIBRARY))
DEFINES += -DMOZILLA_INTERNAL_API
endif
diff --git a/configure.in b/configure.in
index 59cb2e5c396b..bbc7b400328b 100644
--- a/configure.in
+++ b/configure.in
@@ -8618,6 +8618,11 @@ AC_SUBST(MOZ_FOLD_LIBS)
AC_SUBST(MOZ_ENABLE_SZIP)
AC_SUBST(MOZ_SZIP_FLAGS)
+if test "$MOZ_DEBUG"; then
+ MOZ_EM_DEBUG=1
+fi
+AC_SUBST(MOZ_EM_DEBUG)
+
if test -n "$COMPILE_ENVIRONMENT"; then
AC_MSG_CHECKING([for posix_fallocate])
AC_TRY_LINK([#define _XOPEN_SOURCE 600
diff --git a/content/media/webaudio/test/test_oscillatorNodeStart.html b/content/media/webaudio/test/test_oscillatorNodeStart.html
index 7acd6b41309b..d368a3f8b345 100644
--- a/content/media/webaudio/test/test_oscillatorNodeStart.html
+++ b/content/media/webaudio/test/test_oscillatorNodeStart.html
@@ -31,8 +31,23 @@ addLoadEvent(function() {
ok(isSilent, "OscillatorNode should be silent before calling start.");
SimpleTest.finish();
}
+
+ // Debug Logging for bug 966322
+
+ ok(true, "Load event ran");
+
+ var bs = context.createBufferSource();
+ bs.buffer = context.createBuffer(1, 1, context.sampleRate);
+ bs.start();
+ bs.onended = function() {
+ ok(true, "Graph is running");
+ }
+
});
+// Debug Logging for bug 966322
+ok(true, "script ran");
+