Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_image_data_impl.h

 // Copyright (c) 2011 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_IMAGE_DATA_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_IMAGE_DATA_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/shared_impl/image_data_impl.h"
+#include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
-#include "webkit/plugins/ppapi/resource.h"
 
 namespace skia {
 class PlatformCanvas;
 }
 
 struct PPB_ImageDataTrusted;
 class SkBitmap;
 
 namespace webkit {
 namespace ppapi {
 
-class PPB_ImageData_Impl : public Resource,
+class PPB_ImageData_Impl : public ::ppapi::Resource,
                            public ::ppapi::ImageDataImpl,
                            public ::ppapi::thunk::PPB_ImageData_API {
  public:
   // If you call this constructor, you must also call Init before use. Normally
   // you should use the static Create function, but this constructor is needed
   // for some internal uses of ImageData (like Graphics2D).
-  explicit PPB_ImageData_Impl(PluginInstance* instance);
+  explicit PPB_ImageData_Impl(PP_Instance instance);
   virtual ~PPB_ImageData_Impl();
 
-  static PP_Resource Create(PluginInstance* pp_instance,
+  static PP_Resource Create(PP_Instance pp_instance,
                             PP_ImageDataFormat format,
                             const PP_Size& size,
                             PP_Bool init_to_zero);
 
   bool Init(PP_ImageDataFormat format,
             int width, int height,
             bool init_to_zero);
 
   int width() const { return width_; }
   int height() const { return height_; }
@@ skipping 74 matching lines @@
   PPB_ImageData_Impl* image_data_;
   bool is_valid_;
   bool needs_unmap_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDataAutoMapper);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_IMAGE_DATA_IMPL_H_

[viettrungluu, 2011/08/22 23:19:47]

I got here before getting bored.