Make PPAPI headers compile with C compilers (gcc on Linux & Mac and MSVS on W...

ppapi/tests/test_graphics_2d.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/tests/test_graphics_2d.h"
 
 #include <string.h>
 
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_graphics_2d.h"
+#include "ppapi/cpp/common.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(Graphics2D);
 
@@ skipping 39 matching lines @@
   instance_->LogTest("Flush", TestFlush());
 }
 
 void TestGraphics2D::QuitMessageLoop() {
   testing_interface_->QuitMessageLoop();
 }
 
 bool TestGraphics2D::ReadImageData(const pp::Graphics2D& dc,
                                    pp::ImageData* image,
                                    const pp::Point& top_left) const {
-  return testing_interface_->ReadImageData(dc.pp_resource(),
-                                           image->pp_resource(),
-                                           &top_left.pp_point());
+  return pp::PPBoolToBool(testing_interface_->ReadImageData(
+      dc.pp_resource(),
+      image->pp_resource(),
+      &top_left.pp_point()));
 }
 
 bool TestGraphics2D::IsDCUniformColor(const pp::Graphics2D& dc,
                                       uint32_t color) const {
   pp::ImageData readback(PP_IMAGEDATAFORMAT_BGRA_PREMUL,
                          dc.size(), false);
   if (readback.is_null())
     return false;
   if (!ReadImageData(dc, &readback, pp::Point(0, 0)))
     return false;
@@ skipping 90 matching lines @@
 }
 
 // Test all the functions with an invalid handle. Most of these just check for
 // a crash since the browser don't return a value.
 std::string TestGraphics2D::TestInvalidResource() {
   pp::Graphics2D null_context;
   pp::ImageData image(PP_IMAGEDATAFORMAT_BGRA_PREMUL, pp::Size(16, 16), true);
 
   // Describe.
   PP_Size size;
-  bool opaque;
+  PP_Bool opaque;
   graphics_2d_interface_->Describe(image.pp_resource(), &size, &opaque);
   graphics_2d_interface_->Describe(null_context.pp_resource(),
                                    &size, &opaque);
 
   // PaintImageData.
   PP_Point zero_zero;
   zero_zero.x = 0;
   zero_zero.y = 0;
   graphics_2d_interface_->PaintImageData(image.pp_resource(),
                                          image.pp_resource(),
@@ skipping 46 matching lines @@
 
   pp::Graphics2D b(pp::Size(0, 16), false);
   if (!b.is_null())
     return "0 width accepted";
 
   // Need to use the C API since pp::Size prevents negative sizes.
   PP_Size size;
   size.width = 16;
   size.height = -16;
   ASSERT_FALSE(!!graphics_2d_interface_->Create(
-      pp::Module::Get()->pp_module(), &size, false));
+      pp::Module::Get()->pp_module(), &size, PP_FALSE));
 
   size.width = -16;
   size.height = 16;
   ASSERT_FALSE(!!graphics_2d_interface_->Create(
-      pp::Module::Get()->pp_module(), &size, false));
+      pp::Module::Get()->pp_module(), &size, PP_FALSE));
 
   return "";
 }
 
 std::string TestGraphics2D::TestHumongous() {
   pp::Graphics2D a(pp::Size(100000, 100000), false);
   if (!a.is_null())
     return "Humongous device created";
   return "";
 }
@@ skipping 22 matching lines @@
 
 std::string TestGraphics2D::TestDescribe() {
   const int w = 15, h = 17;
   pp::Graphics2D dc(pp::Size(w, h), false);
   if (dc.is_null())
     return "Failure creating a boring device";
 
   PP_Size size;
   size.width = -1;
   size.height = -1;
-  bool is_always_opaque = true;
+  PP_Bool is_always_opaque = PP_TRUE;
   if (!graphics_2d_interface_->Describe(dc.pp_resource(), &size,
                                         &is_always_opaque))
     return "Describe failed";
-  if (size.width != w || size.height != h || is_always_opaque != false)
+  if (size.width != w || size.height != h || is_always_opaque != PP_FALSE)
     return "Mismatch of data.";
 
   return "";
 }
 
 std::string TestGraphics2D::TestPaint() {
   const int w = 15, h = 17;
   pp::Graphics2D dc(pp::Size(w, h), false);
   if (dc.is_null())
     return "Failure creating a boring device";
@@ skipping 219 matching lines @@
 
   if (rv != PP_OK) {
     // If the first flush would block, then a second should fail.
     rv = dc_nopaints.Flush(pp::CompletionCallback(&FlushCallbackNOP, NULL));
     if (rv == PP_OK || rv == PP_ERROR_WOULDBLOCK)
       return "Second flush succeeded before callback ran.";
   }
 
   return "";
 }