Bug 1113655 - Fix bustage when camera is enabled and webtrc is not enabled. r=sotaro
authorKai-Zhen Li <kli@mozilla.com>
Wed, 24 Dec 2014 14:04:07 +0800
changeset 248459 8ddc750a29244c71fc3b1297b003fe67e1cd0cdb
parent 248458 0eab08995eeed36021081dc3e7d61d8406338d87
child 248460 cef0ad1f6b6288d7a02bd25deda70686b04b86e2
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssotaro
bugs1113655
milestone37.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
Bug 1113655 - Fix bustage when camera is enabled and webtrc is not enabled. r=sotaro
gfx/layers/ImageContainer.cpp
--- a/gfx/layers/ImageContainer.cpp
+++ b/gfx/layers/ImageContainer.cpp
@@ -15,17 +15,17 @@
 #include "mozilla/layers/CompositorTypes.h"
 #include "mozilla/layers/ImageBridgeChild.h"  // for ImageBridgeChild
 #include "mozilla/layers/ImageClient.h"  // for ImageClient
 #include "nsISupportsUtils.h"           // for NS_IF_ADDREF
 #include "YCbCrUtils.h"                 // for YCbCr conversions
 #ifdef MOZ_WIDGET_GONK
 #include "GrallocImages.h"
 #endif
-#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_CAMERA)
+#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_CAMERA) && defined(MOZ_WEBRTC)
 #include "GonkCameraImage.h"
 #endif
 #include "gfx2DGlue.h"
 #include "mozilla/gfx/2D.h"
 
 #ifdef XP_MACOSX
 #include "mozilla/gfx/QuartzSupport.h"
 #include "MacIOSurfaceImage.h"
@@ -59,17 +59,17 @@ ImageFactory::CreateImage(ImageFormat aF
     img = new GrallocImage();
     return img.forget();
   }
   if (aFormat == ImageFormat::OVERLAY_IMAGE) {
     img = new OverlayImage();
     return img.forget();
   }
 #endif
-#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_CAMERA)
+#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_CAMERA) && defined(MOZ_WEBRTC)
   if (aFormat == ImageFormat::GONK_CAMERA_IMAGE) {
     img = new GonkCameraImage();
     return img.forget();
   }
 #endif
   if (aFormat == ImageFormat::PLANAR_YCBCR) {
     img = new PlanarYCbCrImage(aRecycleBin);
     return img.forget();