| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "webkit/glue/plugins/pepper_image_data.h" | 5 #include "webkit/glue/plugins/pepper_image_data.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 #include <limits> | 8 #include <limits> | 
| 9 | 9 | 
| 10 #include "base/logging.h" | 10 #include "base/logging.h" | 
| 11 #include "base/scoped_ptr.h" | 11 #include "base/scoped_ptr.h" | 
| 12 #include "skia/ext/platform_canvas.h" | 12 #include "skia/ext/platform_canvas.h" | 
| 13 #include "third_party/ppapi/c/pp_instance.h" | 13 #include "ppapi/c/pp_instance.h" | 
| 14 #include "third_party/ppapi/c/pp_module.h" | 14 #include "ppapi/c/pp_module.h" | 
| 15 #include "third_party/ppapi/c/pp_resource.h" | 15 #include "ppapi/c/pp_resource.h" | 
| 16 #include "third_party/ppapi/c/ppb_image_data.h" | 16 #include "ppapi/c/ppb_image_data.h" | 
| 17 #include "third_party/ppapi/c/trusted/ppb_image_data_trusted.h" | 17 #include "ppapi/c/trusted/ppb_image_data_trusted.h" | 
| 18 #include "third_party/skia/include/core/SkColorPriv.h" | 18 #include "third_party/skia/include/core/SkColorPriv.h" | 
| 19 #include "webkit/glue/plugins/pepper_plugin_instance.h" | 19 #include "webkit/glue/plugins/pepper_plugin_instance.h" | 
| 20 #include "webkit/glue/plugins/pepper_plugin_module.h" | 20 #include "webkit/glue/plugins/pepper_plugin_module.h" | 
| 21 | 21 | 
| 22 namespace pepper { | 22 namespace pepper { | 
| 23 | 23 | 
| 24 namespace { | 24 namespace { | 
| 25 | 25 | 
| 26 PP_ImageDataFormat GetNativeImageDataFormat() { | 26 PP_ImageDataFormat GetNativeImageDataFormat() { | 
| 27   return ImageData::GetNativeImageDataFormat(); | 27   return ImageData::GetNativeImageDataFormat(); | 
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 196 | 196 | 
| 197 void ImageData::Swap(ImageData* other) { | 197 void ImageData::Swap(ImageData* other) { | 
| 198   swap(other->platform_image_, platform_image_); | 198   swap(other->platform_image_, platform_image_); | 
| 199   swap(other->mapped_canvas_, mapped_canvas_); | 199   swap(other->mapped_canvas_, mapped_canvas_); | 
| 200   std::swap(other->format_, format_); | 200   std::swap(other->format_, format_); | 
| 201   std::swap(other->width_, width_); | 201   std::swap(other->width_, width_); | 
| 202   std::swap(other->height_, height_); | 202   std::swap(other->height_, height_); | 
| 203 } | 203 } | 
| 204 | 204 | 
| 205 }  // namespace pepper | 205 }  // namespace pepper | 
| OLD | NEW | 
|---|