summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins/pepper_url_util.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 /webkit/glue/plugins/pepper_url_util.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 'webkit/glue/plugins/pepper_url_util.cc')
-rw-r--r--webkit/glue/plugins/pepper_url_util.cc27
1 files changed, 14 insertions, 13 deletions
diff --git a/webkit/glue/plugins/pepper_url_util.cc b/webkit/glue/plugins/pepper_url_util.cc
index c6ea5f8..2f97e6c 100644
--- a/webkit/glue/plugins/pepper_url_util.cc
+++ b/webkit/glue/plugins/pepper_url_util.cc
@@ -13,6 +13,7 @@
#include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
+#include "webkit/glue/plugins/pepper_common.h"
#include "webkit/glue/plugins/pepper_plugin_instance.h"
#include "webkit/glue/plugins/pepper_string.h"
#include "webkit/glue/plugins/pepper_var.h"
@@ -115,46 +116,46 @@ PP_Var ResolveRelativeToDocument(PP_Instance instance_id,
components);
}
-bool IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) {
+PP_Bool IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) {
scoped_refptr<StringVar> url_a_string(StringVar::FromPPVar(url_a));
scoped_refptr<StringVar> url_b_string(StringVar::FromPPVar(url_b));
if (!url_a_string || !url_b_string)
- return false;
+ return PP_FALSE;
GURL gurl_a(url_a_string->value());
GURL gurl_b(url_b_string->value());
if (!gurl_a.is_valid() || !gurl_b.is_valid())
- return false;
+ return PP_FALSE;
- return gurl_a.GetOrigin() == gurl_b.GetOrigin();
+ return BoolToPPBool(gurl_a.GetOrigin() == gurl_b.GetOrigin());
}
-bool DocumentCanRequest(PP_Instance instance, PP_Var url) {
+PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) {
scoped_refptr<StringVar> url_string(StringVar::FromPPVar(url));
if (!url_string)
- return false;
+ return PP_FALSE;
WebKit::WebSecurityOrigin security_origin;
if (!SecurityOriginForInstance(instance, &security_origin))
- return false;
+ return PP_FALSE;
GURL gurl(url_string->value());
if (!gurl.is_valid())
- return false;
+ return PP_FALSE;
- return security_origin.canRequest(gurl);
+ return BoolToPPBool(security_origin.canRequest(gurl));
}
-bool DocumentCanAccessDocument(PP_Instance active, PP_Instance target) {
+PP_Bool DocumentCanAccessDocument(PP_Instance active, PP_Instance target) {
WebKit::WebSecurityOrigin active_origin;
if (!SecurityOriginForInstance(active, &active_origin))
- return false;
+ return PP_FALSE;
WebKit::WebSecurityOrigin target_origin;
if (!SecurityOriginForInstance(active, &target_origin))
- return false;
+ return PP_FALSE;
- return active_origin.canAccess(target_origin);
+ return BoolToPPBool(active_origin.canAccess(target_origin));
}
} // namespace