Bug 1021765 - Backport the fix from bug 988704 to JB-based devices as well. r=sotaro

dom/camera/GonkCameraHwMgr.cpp

@@ -178,7 +178,7 @@ GonkCameraHardware::Init()
   mNativeWindow = new GonkNativeWindow(GonkCameraHardware::MIN_UNDEQUEUED_BUFFERS);
   mCamera->setPreviewTarget(mNativeWindow->getBufferQueue());
 #elif ANDROID_VERSION >= 17
-  mNativeWindow = new GonkNativeWindow();
+  mNativeWindow = new GonkNativeWindow(GonkCameraHardware::MIN_UNDEQUEUED_BUFFERS);
   mCamera->setPreviewTexture(mNativeWindow->getBufferQueue());
 #else
   mNativeWindow = new GonkNativeWindow();

widget/gonk/nativewindow/GonkNativeWindowJB.cpp

@@ -36,10 +36,10 @@ using namespace mozilla::layers;
 
 namespace android {
 
-GonkNativeWindow::GonkNativeWindow() :
+GonkNativeWindow::GonkNativeWindow(int bufferCount) :
     GonkConsumerBase(new GonkBufferQueue(true) )
 {
-    mBufferQueue->setMaxAcquiredBufferCount(GonkBufferQueue::MIN_UNDEQUEUED_BUFFERS);
+    mBufferQueue->setMaxAcquiredBufferCount(bufferCount);
 }
 
 GonkNativeWindow::~GonkNativeWindow() {

widget/gonk/nativewindow/GonkNativeWindowJB.h

@@ -64,7 +64,7 @@ class GonkNativeWindow: public GonkConsumerBase
     // the consumer usage flags passed to the graphics allocator. The
     // bufferCount parameter specifies how many buffers can be locked for user
     // access at the same time.
-    GonkNativeWindow();
+    GonkNativeWindow(int bufferCount = GonkBufferQueue::MIN_UNDEQUEUED_BUFFERS);
 
     virtual ~GonkNativeWindow();