Update Chrome to pull latest PPAPI with new uses of point and size....

webkit/glue/plugins/pepper_image_data.cc

 // Copyright (c) 2010 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.
 
 #include "webkit/glue/plugins/pepper_image_data.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/ppapi/c/pp_instance.h"
 #include "third_party/ppapi/c/pp_module.h"
 #include "third_party/ppapi/c/pp_resource.h"
 #include "third_party/ppapi/c/ppb_image_data.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 #include "webkit/glue/plugins/pepper_plugin_module.h"
 
 namespace pepper {
 
 namespace {
 
 PP_ImageDataFormat GetNativeImageDataFormat() {
   return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
 }
 
 PP_Resource Create(PP_Module module_id,
                    PP_ImageDataFormat format,
-                   int32_t width, int32_t height,
+                   const PP_Size* size,
                    bool init_to_zero) {
   PluginModule* module = PluginModule::FromPPModule(module_id);
   if (!module)
     return NULL;
 
+  if (!size)
+    return NULL;
+
   scoped_refptr<ImageData> data(new ImageData(module));
-  if (!data->Init(format, width, height, init_to_zero))
+  if (!data->Init(format, size->width, size->height, init_to_zero))
     return NULL;
   data->AddRef();  // AddRef for the caller.
 
   return data->GetResource();
 }
 
 bool IsImageData(PP_Resource resource) {
   return !!Resource::GetAs<ImageData>(resource).get();
 }
 
-bool Describe(PP_Resource resource,
-              PP_ImageDataDesc* desc) {
+bool Describe(PP_Resource resource, PP_ImageDataDesc* desc) {
   // Give predictable values on failure.
   memset(desc, 0, sizeof(PP_ImageDataDesc));
 
   scoped_refptr<ImageData> image_data(Resource::GetAs<ImageData>(resource));
   if (!image_data.get())
     return false;
   image_data->Describe(desc);
   return true;
 }
 
@@ skipping 51 matching lines @@
 
   platform_image_.reset(
       module()->GetSomeInstance()->delegate()->CreateImage2D(width, height));
   width_ = width;
   height_ = height;
   return !!platform_image_.get();
 }
 
 void ImageData::Describe(PP_ImageDataDesc* desc) const {
   desc->format = PP_IMAGEDATAFORMAT_BGRA_PREMUL;
-  desc->width = width_;
-  desc->height = height_;
+  desc->size.width = width_;
+  desc->size.height = height_;
   desc->stride = width_ * 4;
 }
 
 void* ImageData::Map() {
   if (!mapped_canvas_.get()) {
     mapped_canvas_.reset(platform_image_->Map());
     if (!mapped_canvas_.get())
       return NULL;
   }
   const SkBitmap& bitmap =
@@ skipping 20 matching lines @@
 }
 
 void ImageData::Swap(ImageData* other) {
   swap(other->platform_image_, platform_image_);
   swap(other->mapped_canvas_, mapped_canvas_);
   std::swap(other->width_, width_);
   std::swap(other->height_, height_);
 }
 
 }  // namespace pepper