diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 05bb8f62c46..114bb3eab6b 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 55d3af08cf6..c47e8750740 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 05bb8f62c46..114bb3eab6b 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 3d76c69add1..dcc29a5f157 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
{
- "revision": "823616f0af83eca32bceb0367a7a221f8b187110",
+ "revision": "b2b0a8234336f7004812bf27e4053957cecad492",
"repo_path": "/integration/gaia-central"
}
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index a866ec1cbb6..6f1300d5543 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 675adcc1826..1c9222ca1c6 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 c3b3b6a7e59..394055deaee 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 4a58ae79acb..dc0161f2b94 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 c6f0e9ad99d..d753bf04b45 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 eae6eb8332e..c1e64b3efa5 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp
index 6cde49a2f59..ef521134adc 100644
--- a/dom/camera/DOMCameraControl.cpp
+++ b/dom/camera/DOMCameraControl.cpp
@@ -952,12 +952,6 @@ nsDOMCameraControl::Shutdown()
mCameraControl->Shutdown();
}
-nsRefPtr
-nsDOMCameraControl::GetNativeCameraControl()
-{
- return mCameraControl;
-}
-
nsresult
nsDOMCameraControl::NotifyRecordingStatusChange(const nsString& aMsg)
{
@@ -1139,21 +1133,31 @@ void
nsDOMCameraControl::OnAutoFocusComplete(bool aAutoFocusSucceeded)
{
MOZ_ASSERT(NS_IsMainThread());
- ErrorResult ignored;
nsCOMPtr cb = mAutoFocusOnSuccessCb.forget();
mAutoFocusOnErrorCb = nullptr;
- cb->Call(aAutoFocusSucceeded, ignored);
+ if (cb) {
+ ErrorResult ignored;
+ cb->Call(aAutoFocusSucceeded, ignored);
+ }
}
void
nsDOMCameraControl::OnTakePictureComplete(nsIDOMBlob* aPicture)
{
MOZ_ASSERT(NS_IsMainThread());
- ErrorResult ignored;
nsCOMPtr cb = mTakePictureOnSuccessCb.forget();
mTakePictureOnErrorCb = nullptr;
+ if (!cb) {
+ // Warn because it shouldn't be possible to get here without
+ // having passed a success callback into takePicture(), even
+ // though we guard against a nullptr dereference.
+ NS_WARNING("DOM Null success callback in OnTakePictureComplete()");
+ return;
+ }
+
+ ErrorResult ignored;
cb->Call(aPicture, ignored);
}
diff --git a/dom/camera/DOMCameraControl.h b/dom/camera/DOMCameraControl.h
index 30cb14de83b..7651552cba8 100644
--- a/dom/camera/DOMCameraControl.h
+++ b/dom/camera/DOMCameraControl.h
@@ -45,7 +45,6 @@ public:
dom::GetCameraCallback* aOnSuccess,
dom::CameraErrorCallback* aOnError,
nsPIDOMWindow* aWindow);
- nsRefPtr GetNativeCameraControl();
void Shutdown();