summaryrefslogtreecommitdiffstats
path: root/chromium/ppapi/cpp/var.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ppapi/cpp/var.cc')
-rw-r--r--chromium/ppapi/cpp/var.cc111
1 files changed, 87 insertions, 24 deletions
diff --git a/chromium/ppapi/cpp/var.cc b/chromium/ppapi/cpp/var.cc
index 1108e05ef46..e16b0e40668 100644
--- a/chromium/ppapi/cpp/var.cc
+++ b/chromium/ppapi/cpp/var.cc
@@ -25,6 +25,9 @@ namespace pp {
namespace {
+template <> const char* interface_name<PPB_Var_1_2>() {
+ return PPB_VAR_INTERFACE_1_2;
+}
template <> const char* interface_name<PPB_Var_1_1>() {
return PPB_VAR_INTERFACE_1_1;
}
@@ -39,19 +42,51 @@ inline bool NeedsRefcounting(const PP_Var& var) {
return var.type > PP_VARTYPE_DOUBLE;
}
-// This helper function detects whether PPB_Var version 1.1 is available. If so,
-// it uses it to create a PP_Var for the given string. Otherwise it falls back
-// to PPB_Var version 1.0.
+// This helper function uses the latest available version of VarFromUtf8. Note
+// that version 1.0 of this method has a different API to later versions.
PP_Var VarFromUtf8Helper(const char* utf8_str, uint32_t len) {
- if (has_interface<PPB_Var_1_1>()) {
+ if (has_interface<PPB_Var_1_2>()) {
+ return get_interface<PPB_Var_1_2>()->VarFromUtf8(utf8_str, len);
+ } else if (has_interface<PPB_Var_1_1>()) {
return get_interface<PPB_Var_1_1>()->VarFromUtf8(utf8_str, len);
} else if (has_interface<PPB_Var_1_0>()) {
return get_interface<PPB_Var_1_0>()->VarFromUtf8(Module::Get()->pp_module(),
utf8_str,
len);
- } else {
- return PP_MakeNull();
}
+ return PP_MakeNull();
+}
+
+// This helper function uses the latest available version of AddRef.
+// Returns true on success, false if no appropriate interface was available.
+bool AddRefHelper(const PP_Var& var) {
+ if (has_interface<PPB_Var_1_2>()) {
+ get_interface<PPB_Var_1_2>()->AddRef(var);
+ return true;
+ } else if (has_interface<PPB_Var_1_1>()) {
+ get_interface<PPB_Var_1_1>()->AddRef(var);
+ return true;
+ } else if (has_interface<PPB_Var_1_0>()) {
+ get_interface<PPB_Var_1_0>()->AddRef(var);
+ return true;
+ }
+ return false;
+}
+
+// This helper function uses the latest available version of Release.
+// Returns true on success, false if no appropriate interface was available.
+bool ReleaseHelper(const PP_Var& var) {
+ if (has_interface<PPB_Var_1_2>()) {
+ get_interface<PPB_Var_1_2>()->Release(var);
+ return true;
+ } else if (has_interface<PPB_Var_1_1>()) {
+ get_interface<PPB_Var_1_1>()->Release(var);
+ return true;
+ } else if (has_interface<PPB_Var_1_0>()) {
+ get_interface<PPB_Var_1_0>()->Release(var);
+ return true;
+ }
+ return false;
}
} // namespace
@@ -101,14 +136,25 @@ Var::Var(const std::string& utf8_str) {
is_managed_ = true;
}
+Var::Var(const pp::Resource& resource) {
+ if (has_interface<PPB_Var_1_2>()) {
+ var_ = get_interface<PPB_Var_1_2>()->VarFromResource(
+ resource.pp_resource());
+ } else {
+ PP_NOTREACHED();
+ return;
+ }
+ // Set |is_managed_| to true, so |var_| will be properly released upon
+ // destruction.
+ is_managed_ = true;
+}
+
Var::Var(const PP_Var& var) {
var_ = var;
is_managed_ = true;
if (NeedsRefcounting(var_)) {
- if (has_interface<PPB_Var_1_0>())
- get_interface<PPB_Var_1_0>()->AddRef(var_);
- else
+ if (!AddRefHelper(var_))
var_.type = PP_VARTYPE_NULL;
}
}
@@ -117,18 +163,14 @@ Var::Var(const Var& other) {
var_ = other.var_;
is_managed_ = true;
if (NeedsRefcounting(var_)) {
- if (has_interface<PPB_Var_1_0>())
- get_interface<PPB_Var_1_0>()->AddRef(var_);
- else
+ if (!AddRefHelper(var_))
var_.type = PP_VARTYPE_NULL;
}
}
Var::~Var() {
- if (NeedsRefcounting(var_) &&
- is_managed_ &&
- has_interface<PPB_Var_1_0>())
- get_interface<PPB_Var_1_0>()->Release(var_);
+ if (NeedsRefcounting(var_) && is_managed_)
+ ReleaseHelper(var_);
}
Var& Var::operator=(const Var& other) {
@@ -143,12 +185,10 @@ Var& Var::operator=(const Var& other) {
bool old_is_managed = is_managed_;
is_managed_ = true;
if (NeedsRefcounting(other.var_)) {
- // Assume we already has_interface<PPB_Var_1_0> for refcounted vars or else
- // we couldn't have created them in the first place.
- get_interface<PPB_Var_1_0>()->AddRef(other.var_);
+ AddRefHelper(other.var_);
}
if (NeedsRefcounting(var_) && old_is_managed)
- get_interface<PPB_Var_1_0>()->Release(var_);
+ ReleaseHelper(var_);
var_ = other.var_;
return *this;
@@ -175,7 +215,8 @@ bool Var::operator==(const Var& other) const {
case PP_VARTYPE_ARRAY:
case PP_VARTYPE_ARRAY_BUFFER:
case PP_VARTYPE_DICTIONARY:
- default: // Objects, arrays, dictionaries.
+ case PP_VARTYPE_RESOURCE:
+ default: // Objects, arrays, dictionaries, resources.
return var_.value.as_id == other.var_.value.as_id;
}
}
@@ -212,13 +253,33 @@ std::string Var::AsString() const {
return std::string();
}
- if (!has_interface<PPB_Var_1_0>())
- return std::string();
uint32_t len;
- const char* str = get_interface<PPB_Var_1_0>()->VarToUtf8(var_, &len);
+ const char* str;
+ if (has_interface<PPB_Var_1_2>())
+ str = get_interface<PPB_Var_1_2>()->VarToUtf8(var_, &len);
+ else if (has_interface<PPB_Var_1_1>())
+ str = get_interface<PPB_Var_1_1>()->VarToUtf8(var_, &len);
+ else if (has_interface<PPB_Var_1_0>())
+ str = get_interface<PPB_Var_1_0>()->VarToUtf8(var_, &len);
+ else
+ return std::string();
return std::string(str, len);
}
+pp::Resource Var::AsResource() const {
+ if (!is_resource()) {
+ PP_NOTREACHED();
+ return pp::Resource();
+ }
+
+ if (has_interface<PPB_Var_1_2>()) {
+ return pp::Resource(pp::PASS_REF,
+ get_interface<PPB_Var_1_2>()->VarToResource(var_));
+ } else {
+ return pp::Resource();
+ }
+}
+
std::string Var::DebugString() const {
char buf[256];
if (is_undefined()) {
@@ -249,6 +310,8 @@ std::string Var::DebugString() const {
snprintf(buf, sizeof(buf), "Var(DICTIONARY)");
} else if (is_array_buffer()) {
snprintf(buf, sizeof(buf), "Var(ARRAY_BUFFER)");
+ } else if (is_resource()) {
+ snprintf(buf, sizeof(buf), "Var(RESOURCE)");
} else {
buf[0] = '\0';
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 01:52:04 +0000