Bug 798448 - Stop GonkNativeWindow::perform returning an error when the transform is set r=kanru a=blocking-basecamp
authorEdwin Flores <eflores@mozilla.com>
Fri, 09 Nov 2012 14:43:53 +1300
changeset 116765 9c7deae180b8d25b3a5db19d2a6524c9e1ab4ce3
parent 116764 1f1268783f84bbdb97150f9da3a78a26f0611cdc
child 116766 aa1a0d159286496f6d782dec2725afcfe297eca6
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskanru, blocking-basecamp
bugs798448
milestone18.0a2
Bug 798448 - Stop GonkNativeWindow::perform returning an error when the transform is set r=kanru a=blocking-basecamp
dom/camera/GonkNativeWindow.cpp
--- a/dom/camera/GonkNativeWindow.cpp
+++ b/dom/camera/GonkNativeWindow.cpp
@@ -440,16 +440,17 @@ int GonkNativeWindow::cancelBuffer(ANati
     mSlots[buf].mFrameNumber = 0;
     mDequeueCondition.signal();
     return OK;
 }
 
 int GonkNativeWindow::perform(int operation, va_list args)
 {
     switch (operation) {
+        case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM:
         case NATIVE_WINDOW_SET_BUFFERS_SIZE:
         case NATIVE_WINDOW_SET_SCALING_MODE:
         case NATIVE_WINDOW_SET_CROP:
         case NATIVE_WINDOW_CONNECT:
         case NATIVE_WINDOW_DISCONNECT:
             // deprecated. must return NO_ERROR.
             return NO_ERROR;
         case NATIVE_WINDOW_SET_USAGE:
@@ -459,22 +460,22 @@ int GonkNativeWindow::perform(int operat
         case NATIVE_WINDOW_SET_BUFFERS_GEOMETRY:
             return dispatchSetBuffersGeometry(args);
         case NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP:
             return dispatchSetBuffersTimestamp(args);
         case NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS:
             return dispatchSetBuffersDimensions(args);
         case NATIVE_WINDOW_SET_BUFFERS_FORMAT:
             return dispatchSetBuffersFormat(args);
-        case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM:
         case NATIVE_WINDOW_LOCK:
         case NATIVE_WINDOW_UNLOCK_AND_POST:
         case NATIVE_WINDOW_API_CONNECT:
         case NATIVE_WINDOW_API_DISCONNECT:
         default:
+            NS_WARNING("Unsupported operation");
             return INVALID_OPERATION;
     }
 }
 
 int GonkNativeWindow::query(int what, int* outValue) const
 {
     Mutex::Autolock lock(mMutex);