Update Chrome to use the new int64-typedefed module, instance, and resources ...

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"
@@ skipping 12 matching lines @@
 namespace {
 
 ImageData* ResourceAsImageData(PP_Resource resource) {
   scoped_refptr<Resource> image_resource =
       ResourceTracker::Get()->GetResource(resource);
   if (!image_resource.get())
     return NULL;
   return image_resource->AsImageData();
 }
 
+PP_ImageDataFormat GetNativeImageDataFormat() {
+  return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
+}
+
 PP_Resource Create(PP_Module module_id,
                    PP_ImageDataFormat format,
                    int32_t width, int32_t height,
                    bool init_to_zero) {
   PluginModule* module = PluginModule::FromPPModule(module_id);
   if (!module)
-    return NullPPResource();
+    return NULL;
 
   scoped_refptr<ImageData> data(new ImageData(module));
   if (!data->Init(format, width, height, init_to_zero))
-    return NullPPResource();
+    return NULL;
   data->AddRef();  // AddRef for the caller.
 
   return data->GetResource();
 }
 
 bool IsImageData(PP_Resource resource) {
   return !!ResourceTracker::Get()->GetAsImageData(resource).get();
 }
 
 bool Describe(PP_Resource resource,
@@ skipping 19 matching lines @@
 
 void Unmap(PP_Resource resource) {
   scoped_refptr<ImageData> image_data(
       ResourceTracker::Get()->GetAsImageData(resource));
   if (!image_data)
     return;
   return image_data->Unmap();
 }
 
 const PPB_ImageData ppb_imagedata = {
+  &GetNativeImageDataFormat,
   &Create,
   &IsImageData,
   &Describe,
   &Map,
   &Unmap,
 };
 
 }  // namespace
 
 ImageData::ImageData(PluginModule* module)
@@ skipping 69 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