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

Unified Diff: ppapi/cpp/module.cc

Issue 4310002: Make PPAPI headers compile with C compilers (gcc on Linux & Mac and MSVS on W... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | « ppapi/cpp/module.h ('k') | ppapi/cpp/var.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/module.cc
===================================================================
--- ppapi/cpp/module.cc (revision 65116)
+++ ppapi/cpp/module.cc (working copy)
@@ -28,6 +28,7 @@
#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/c/ppp_instance.h"
+#include "ppapi/cpp/common.h"
#include "ppapi/cpp/dev/url_loader_dev.h"
#include "ppapi/cpp/instance.h"
#include "ppapi/cpp/rect.h"
@@ -38,19 +39,19 @@
// PPP_Instance implementation -------------------------------------------------
-bool Instance_DidCreate(PP_Instance pp_instance,
- uint32_t argc,
- const char* argn[],
- const char* argv[]) {
+PP_Bool Instance_DidCreate(PP_Instance pp_instance,
+ uint32_t argc,
+ const char* argn[],
+ const char* argv[]) {
Module* module_singleton = Module::Get();
if (!module_singleton)
- return false;
+ return PP_FALSE;
Instance* instance = module_singleton->CreateInstance(pp_instance);
if (!instance)
- return false;
+ return PP_FALSE;
module_singleton->current_instances_[pp_instance] = instance;
- return instance->Init(argc, argn, argv);
+ return BoolToPPBool(instance->Init(argc, argn, argv));
}
void Instance_DidDestroy(PP_Instance instance) {
@@ -80,36 +81,37 @@
instance->DidChangeView(*position, *clip);
}
-void Instance_DidChangeFocus(PP_Instance pp_instance, bool has_focus) {
+void Instance_DidChangeFocus(PP_Instance pp_instance, PP_Bool has_focus) {
Module* module_singleton = Module::Get();
if (!module_singleton)
return;
Instance* instance = module_singleton->InstanceForPPInstance(pp_instance);
if (!instance)
return;
- instance->DidChangeFocus(has_focus);
+ instance->DidChangeFocus(PPBoolToBool(has_focus));
}
-bool Instance_HandleInputEvent(PP_Instance pp_instance,
- const PP_InputEvent* event) {
+PP_Bool Instance_HandleInputEvent(PP_Instance pp_instance,
+ const PP_InputEvent* event) {
Module* module_singleton = Module::Get();
if (!module_singleton)
- return false;
+ return PP_FALSE;
Instance* instance = module_singleton->InstanceForPPInstance(pp_instance);
if (!instance)
- return false;
- return instance->HandleInputEvent(*event);
+ return PP_FALSE;
+ return BoolToPPBool(instance->HandleInputEvent(*event));
}
-bool Instance_HandleDocumentLoad(PP_Instance pp_instance,
- PP_Resource pp_url_loader) {
+PP_Bool Instance_HandleDocumentLoad(PP_Instance pp_instance,
+ PP_Resource pp_url_loader) {
Module* module_singleton = Module::Get();
if (!module_singleton)
- return false;
+ return PP_FALSE;
Instance* instance = module_singleton->InstanceForPPInstance(pp_instance);
if (!instance)
- return false;
- return instance->HandleDocumentLoad(URLLoader_Dev(pp_url_loader));
+ return PP_FALSE;
+ return BoolToPPBool(
+ instance->HandleDocumentLoad(URLLoader_Dev(pp_url_loader)));
}
PP_Var Instance_GetInstanceObject(PP_Instance pp_instance) {
« no previous file with comments | « ppapi/cpp/module.h ('k') | ppapi/cpp/var.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698