Merge 217400 "Change ppapi_simple to support pixel format select..."

native_client_sdk/src/libraries/ppapi_simple/ps_context_2d.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.auto
+// found in the LICENSE file.
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_view.h"
 #include "ppapi/cpp/image_data.h"
 
 #include "ppapi_simple/ps.h"
 #include "ppapi_simple/ps_context_2d.h"
 #include "ppapi_simple/ps_event.h"
 #include "ppapi_simple/ps_instance.h"
 #include "ppapi_simple/ps_interface.h"
 
-PSContext2D_t* PSContext2DAllocate() {
+PSContext2D_t* PSContext2DAllocate(PP_ImageDataFormat format) {
   PSContext2D_t* ctx = (PSContext2D_t*) malloc(sizeof(PSContext2D_t));
   memset(ctx, 0, sizeof(PSContext2D_t));
 
-  ctx->format = PSInterfaceImageData()->GetNativeImageDataFormat();
+  ctx->format = format;
   return ctx;
 }
 
 void PSContext2DFree(PSContext2D_t* ctx) {
   if (ctx->graphic_2d) {
     PSInterfaceCore()->ReleaseResource(ctx->graphic_2d);
     ctx->graphic_2d = 0;
   }
   if (ctx->image) {
     PSInterfaceCore()->ReleaseResource(ctx->image);
     ctx->image = 0;
   }
   free(ctx);
 }
 
+PP_ImageDataFormat PSContext2DGetNativeImageDataFormat() {
+  return PSInterfaceImageData()->GetNativeImageDataFormat();
+}
+
 // Update the 2D context if the message is appropriate, returning non-zero
 // if the event was consumed.
 int PSContext2DHandleEvent(PSContext2D_t* ctx, PSEvent* event) {
   switch(event->type) {
     case PSE_INSTANCE_DIDCHANGEVIEW: {
       struct PP_Rect rect;
 
       PSInterfaceView()->GetRect(event->as_resource, &rect);
       PSInterfaceCore()->ReleaseResource(ctx->graphic_2d);
       ctx->bound = 0;
@@ skipping 71 matching lines @@
     PSInterfaceCore()->ReleaseResource(ctx->image);
 
     ctx->image = 0;
     ctx->stride = 0;
     ctx->data = NULL;
     return 1;
   }
   return 0;
 }