Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Side by Side Diff: content/renderer/pepper/ppb_image_data_impl.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/plugins/ppapi/ppb_image_data_impl.h" 5 #include "content/renderer/pepper/ppb_image_data_impl.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/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "content/renderer/pepper/common.h"
13 #include "content/renderer/pepper/resource_helper.h"
12 #include "skia/ext/platform_canvas.h" 14 #include "skia/ext/platform_canvas.h"
13 #include "ppapi/c/pp_instance.h" 15 #include "ppapi/c/pp_instance.h"
14 #include "ppapi/c/pp_resource.h" 16 #include "ppapi/c/pp_resource.h"
15 #include "ppapi/c/ppb_image_data.h" 17 #include "ppapi/c/ppb_image_data.h"
16 #include "ppapi/thunk/thunk.h" 18 #include "ppapi/thunk/thunk.h"
17 #include "third_party/skia/include/core/SkColorPriv.h" 19 #include "third_party/skia/include/core/SkColorPriv.h"
18 #include "webkit/plugins/ppapi/common.h"
19 #include "webkit/plugins/ppapi/resource_helper.h"
20 20
21 using ::ppapi::thunk::PPB_ImageData_API; 21 using ::ppapi::thunk::PPB_ImageData_API;
22 22
23 namespace webkit { 23 namespace webkit {
24 namespace ppapi { 24 namespace ppapi {
25 25
26 PPB_ImageData_Impl::PPB_ImageData_Impl(PP_Instance instance, 26 PPB_ImageData_Impl::PPB_ImageData_Impl(PP_Instance instance,
27 PPB_ImageData_Shared::ImageDataType type) 27 PPB_ImageData_Shared::ImageDataType type)
28 : Resource(::ppapi::OBJECT_IS_IMPL, instance), 28 : Resource(::ppapi::OBJECT_IS_IMPL, instance),
29 format_(PP_IMAGEDATAFORMAT_BGRA_PREMUL), 29 format_(PP_IMAGEDATAFORMAT_BGRA_PREMUL),
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 } 269 }
270 270
271 const SkBitmap* ImageDataSimpleBackend::GetMappedBitmap() const { 271 const SkBitmap* ImageDataSimpleBackend::GetMappedBitmap() const {
272 if (!IsMapped()) 272 if (!IsMapped())
273 return NULL; 273 return NULL;
274 return &skia_bitmap_; 274 return &skia_bitmap_;
275 } 275 }
276 276
277 } // namespace ppapi 277 } // namespace ppapi
278 } // namespace webkit 278 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698