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

Unified Diff: ppapi/shared_impl/url_util_impl.cc

Issue 8826011: Remove PP_Module from parameters for PPB_Var.VarFromUtf8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows build and some nacl tests. Created 9 years 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/shared_impl/url_util_impl.cc
diff --git a/ppapi/shared_impl/url_util_impl.cc b/ppapi/shared_impl/url_util_impl.cc
index fdccdb61f72d36168b5cc086e19f6dba3712bc3d..7c116d1cbfb62a8e51d5963eefcde7c79dcd58cf 100644
--- a/ppapi/shared_impl/url_util_impl.cc
+++ b/ppapi/shared_impl/url_util_impl.cc
@@ -48,8 +48,7 @@ PP_Var URLUtilImpl::Canonicalize(PP_Var url,
StringVar* url_string = StringVar::FromPPVar(url);
if (!url_string)
return PP_MakeNull();
- return GenerateURLReturn(url_string->pp_module(),
- GURL(url_string->value()), components);
+ return GenerateURLReturn(GURL(url_string->value()), components);
}
// static
@@ -64,8 +63,7 @@ PP_Var URLUtilImpl::ResolveRelativeToURL(PP_Var base_url,
GURL base_gurl(base_url_string->value());
if (!base_gurl.is_valid())
return PP_MakeNull();
- return GenerateURLReturn(base_url_string->pp_module(),
- base_gurl.Resolve(relative_string->value()),
+ return GenerateURLReturn(base_gurl.Resolve(relative_string->value()),
components);
}
@@ -86,13 +84,12 @@ PP_Bool URLUtilImpl::IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) {
// Used for returning the given GURL from a PPAPI function, with an optional
// out param indicating the components.
-PP_Var URLUtilImpl::GenerateURLReturn(PP_Module module,
- const GURL& url,
+PP_Var URLUtilImpl::GenerateURLReturn(const GURL& url,
PP_URLComponents_Dev* components) {
if (!url.is_valid())
return PP_MakeNull();
ConvertComponents(url.parsed_for_possibly_invalid_spec(), components);
- return StringVar::StringToPPVar(module, url.possibly_invalid_spec());
+ return StringVar::StringToPPVar(url.possibly_invalid_spec());
}
PP_Var URLUtilImpl::ConvertComponentsAndReturnURL(

Powered by Google App Engine
This is Rietveld 408576698