summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp/dev/widget_dev.cc
diff options
context:
space:
mode:
authordmichael@google.com <dmichael@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 14:45:44 +0000
committerdmichael@google.com <dmichael@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 14:45:44 +0000
commit6f2e3919c4709404d8d7b6742f9cd9989b799c98 (patch)
tree55a933f7e2988625f0f3ded5a562203c7e3921c9 /ppapi/cpp/dev/widget_dev.cc
parent79ba2d8a26fe6c9b343c57fef57896a90baa3878 (diff)
downloadchromium_src-6f2e3919c4709404d8d7b6742f9cd9989b799c98.zip
chromium_src-6f2e3919c4709404d8d7b6742f9cd9989b799c98.tar.gz
chromium_src-6f2e3919c4709404d8d7b6742f9cd9989b799c98.tar.bz2
Make PPAPI headers compile with C compilers (gcc on Linux & Mac and MSVS on Windows). This includes changing bool to PP_Bool and adding a PP_INLINE macro.
TEST=tests/test_c_includes.c BUG=59791,53451 The first patch set is a straight copy of http://codereview.chromium.org/4019010/show which got LGTMed when PPAPI was in its own repo, but had to be rolled back in order to include chrome changes. IMPORTANT: This change will break plugin implementations that use the C interface, and might break others as well. Review URL: http://codereview.chromium.org/4310002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp/dev/widget_dev.cc')
-rw-r--r--ppapi/cpp/dev/widget_dev.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/ppapi/cpp/dev/widget_dev.cc b/ppapi/cpp/dev/widget_dev.cc
index e3c94ee..00756e5 100644
--- a/ppapi/cpp/dev/widget_dev.cc
+++ b/ppapi/cpp/dev/widget_dev.cc
@@ -5,6 +5,7 @@
#include "ppapi/cpp/dev/widget_dev.h"
#include "ppapi/c/dev/ppb_widget_dev.h"
+#include "ppapi/cpp/common.h"
#include "ppapi/cpp/image_data.h"
#include "ppapi/cpp/instance.h"
#include "ppapi/cpp/module.h"
@@ -38,20 +39,22 @@ void Widget_Dev::swap(Widget_Dev& other) {
bool Widget_Dev::Paint(const Rect& rect, ImageData* image) {
if (!widget_f)
return false;
- return widget_f->Paint(
- pp_resource(), &rect.pp_rect(), image->pp_resource());
+ return PPBoolToBool(widget_f->Paint(pp_resource(),
+ &rect.pp_rect(),
+ image->pp_resource()));
}
bool Widget_Dev::HandleEvent(const PP_InputEvent& event) {
if (!widget_f)
return false;
- return widget_f->HandleEvent(pp_resource(), &event);
+ return PPBoolToBool(widget_f->HandleEvent(pp_resource(), &event));
}
bool Widget_Dev::GetLocation(Rect* location) {
if (!widget_f)
return false;
- return widget_f->GetLocation(pp_resource(), &location->pp_rect());
+ return PPBoolToBool(widget_f->GetLocation(pp_resource(),
+ &location->pp_rect()));
}
void Widget_Dev::SetLocation(const Rect& location) {