summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-09 23:11:04 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-09 23:11:04 +0000
commit6bd4502696dacf2b6109eb9285427bea76cabe1c (patch)
tree86398e0e0d38701fb5fb726c5bd0153f7241fbbc /ppapi
parent0207f1798304d19798e391f8dc98f330548936c4 (diff)
downloadchromium_src-6bd4502696dacf2b6109eb9285427bea76cabe1c.zip
chromium_src-6bd4502696dacf2b6109eb9285427bea76cabe1c.tar.gz
chromium_src-6bd4502696dacf2b6109eb9285427bea76cabe1c.tar.bz2
Fix ppapi proxy
- Originally part of brettw's fix, here so we unblock me. BUG=none TEST= out-of-process pepper works. Review URL: http://codereview.chromium.org/6994001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/resource_creation_proxy.cc6
-rw-r--r--ppapi/thunk/ppb_image_data_api.h7
2 files changed, 9 insertions, 4 deletions
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index f24123c..39c9c11 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -16,6 +16,7 @@
#include "ppapi/c/trusted/ppb_image_data_trusted.h"
#include "ppapi/shared_impl/function_group_base.h"
#include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppb_image_data_api.h"
using ::ppapi::thunk::ResourceCreationAPI;
@@ -126,9 +127,10 @@ void ResourceCreationProxy::OnMsgCreateImageData(
result->SetHostResource(instance, resource);
// Get the description, it's just serialized as a string.
- ppapi::thunk::EnterResource<PPB_ImageData> enter_resource(resource, false);
+ ppapi::thunk::EnterResource<ppapi::thunk::PPB_ImageData_API>
+ enter_resource(resource, false);
PP_ImageDataDesc desc;
- if (enter_resource.object()->Describe(resource, &desc)) {
+ if (enter_resource.object()->Describe(&desc)) {
image_data_desc->resize(sizeof(PP_ImageDataDesc));
memcpy(&(*image_data_desc)[0], &desc, sizeof(PP_ImageDataDesc));
}
diff --git a/ppapi/thunk/ppb_image_data_api.h b/ppapi/thunk/ppb_image_data_api.h
index a76a331..6cfbc43 100644
--- a/ppapi/thunk/ppb_image_data_api.h
+++ b/ppapi/thunk/ppb_image_data_api.h
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#ifndef PPAPI_THUNK_IMAGE_DATA_API_H_
+#define PPAPI_THUNK_IMAGE_DATA_API_H_
+
#include "ppapi/c/pp_bool.h"
#include "ppapi/c/ppb_image_data.h"
-#include "ppapi/c/pp_point.h"
-#include "ppapi/c/pp_resource.h"
namespace ppapi {
namespace thunk {
@@ -19,3 +20,5 @@ class PPB_ImageData_API {
} // namespace thunk
} // namespace ppapi
+
+#endif // PPAPI_THUNK_IMAGE_DATA_API_H_