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

Unified Diff: ppapi/cpp/dev/url_util_dev.cc

Issue 6594107: Add PPB_URLUtil_Dev::GetDocumentURL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "add TestGetDocumentURL Created 9 years, 10 months 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
Index: ppapi/cpp/dev/url_util_dev.cc
diff --git a/ppapi/cpp/dev/url_util_dev.cc b/ppapi/cpp/dev/url_util_dev.cc
index ec08856cf5e3cda47f9b0dcb3bdd818e65b98533..234828a124907ca11b1f852f2f97c9ea21205498 100644
--- a/ppapi/cpp/dev/url_util_dev.cc
+++ b/ppapi/cpp/dev/url_util_dev.cc
@@ -11,13 +11,13 @@
namespace pp {
// static
-const UrlUtil_Dev* UrlUtil_Dev::Get() {
+const URLUtil_Dev* URLUtil_Dev::Get() {
static bool tried_to_init = false;
- static UrlUtil_Dev util;
+ static URLUtil_Dev util;
if (!tried_to_init) {
tried_to_init = true;
- util.interface_ = static_cast<const PPB_UrlUtil_Dev*>(
+ util.interface_ = static_cast<const PPB_URLUtil_Dev*>(
Module::Get()->GetBrowserInterface(PPB_URLUTIL_DEV_INTERFACE));
}
@@ -26,48 +26,54 @@ const UrlUtil_Dev* UrlUtil_Dev::Get() {
return &util;
}
-Var UrlUtil_Dev::Canonicalize(const Var& url,
- PP_UrlComponents_Dev* components) const {
+Var URLUtil_Dev::Canonicalize(const Var& url,
+ PP_URLComponents_Dev* components) const {
return Var(Var::PassRef(),
interface_->Canonicalize(url.pp_var(), components));
}
-Var UrlUtil_Dev::ResolveRelativeToUrl(const Var& base_url,
+Var URLUtil_Dev::ResolveRelativeToURL(const Var& base_url,
const Var& relative_string,
- PP_UrlComponents_Dev* components) const {
+ PP_URLComponents_Dev* components) const {
return Var(Var::PassRef(),
- interface_->ResolveRelativeToUrl(base_url.pp_var(),
+ interface_->ResolveRelativeToURL(base_url.pp_var(),
relative_string.pp_var(),
components));
}
-Var UrlUtil_Dev::ResoveRelativeToDocument(
+Var URLUtil_Dev::ResoveRelativeToDocument(
const Instance& instance,
const Var& relative_string,
- PP_UrlComponents_Dev* components) const {
+ PP_URLComponents_Dev* components) const {
return Var(Var::PassRef(),
interface_->ResolveRelativeToDocument(instance.pp_instance(),
relative_string.pp_var(),
components));
}
-bool UrlUtil_Dev::IsSameSecurityOrigin(const Var& url_a,
+bool URLUtil_Dev::IsSameSecurityOrigin(const Var& url_a,
const Var& url_b) const {
return PPBoolToBool(interface_->IsSameSecurityOrigin(url_a.pp_var(),
url_b.pp_var()));
}
-bool UrlUtil_Dev::DocumentCanRequest(const Instance& instance,
+bool URLUtil_Dev::DocumentCanRequest(const Instance& instance,
const Var& url) const {
return PPBoolToBool(interface_->DocumentCanRequest(instance.pp_instance(),
url.pp_var()));
}
-bool UrlUtil_Dev::DocumentCanAccessDocument(const Instance& active,
+bool URLUtil_Dev::DocumentCanAccessDocument(const Instance& active,
const Instance& target) const {
return PPBoolToBool(
interface_->DocumentCanAccessDocument(active.pp_instance(),
target.pp_instance()));
}
+Var URLUtil_Dev::GetDocumentURL(const Instance& instance,
+ PP_URLComponents_Dev* components) const {
+ return Var(Var::PassRef(),
+ interface_->GetDocumentURL(instance.pp_instance(), components));
+}
+
} // namespace pp

Powered by Google App Engine
This is Rietveld 408576698