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

Unified Diff: webkit/glue/plugins/pepper_image_data.cc

Issue 2925007: Update Chrome to pull latest PPAPI with new uses of point and size.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/plugins/pepper_file_system.cc ('k') | webkit/glue/plugins/pepper_plugin_module.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/pepper_image_data.cc
===================================================================
--- webkit/glue/plugins/pepper_image_data.cc (revision 51996)
+++ webkit/glue/plugins/pepper_image_data.cc (working copy)
@@ -27,14 +27,17 @@
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.
@@ -45,8 +48,7 @@
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));
@@ -118,8 +120,8 @@
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;
}
« no previous file with comments | « webkit/glue/plugins/pepper_file_system.cc ('k') | webkit/glue/plugins/pepper_plugin_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698