| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ppapi/shared_impl/url_util_impl.h" | 5 #include "ppapi/shared_impl/url_util_impl.h" |
| 6 | 6 |
| 7 #include "googleurl/src/gurl.h" | 7 #include "googleurl/src/gurl.h" |
| 8 #include "ppapi/shared_impl/ppapi_globals.h" | 8 #include "ppapi/shared_impl/ppapi_globals.h" |
| 9 #include "ppapi/shared_impl/var.h" | 9 #include "ppapi/shared_impl/var.h" |
| 10 #include "ppapi/shared_impl/var_tracker.h" | 10 #include "ppapi/shared_impl/var_tracker.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 } | 41 } |
| 42 | 42 |
| 43 } // namespace | 43 } // namespace |
| 44 | 44 |
| 45 // static | 45 // static |
| 46 PP_Var URLUtilImpl::Canonicalize(PP_Var url, | 46 PP_Var URLUtilImpl::Canonicalize(PP_Var url, |
| 47 PP_URLComponents_Dev* components) { | 47 PP_URLComponents_Dev* components) { |
| 48 StringVar* url_string = StringVar::FromPPVar(url); | 48 StringVar* url_string = StringVar::FromPPVar(url); |
| 49 if (!url_string) | 49 if (!url_string) |
| 50 return PP_MakeNull(); | 50 return PP_MakeNull(); |
| 51 return GenerateURLReturn(url_string->pp_module(), | 51 return GenerateURLReturn(GURL(url_string->value()), components); |
| 52 GURL(url_string->value()), components); | |
| 53 } | 52 } |
| 54 | 53 |
| 55 // static | 54 // static |
| 56 PP_Var URLUtilImpl::ResolveRelativeToURL(PP_Var base_url, | 55 PP_Var URLUtilImpl::ResolveRelativeToURL(PP_Var base_url, |
| 57 PP_Var relative, | 56 PP_Var relative, |
| 58 PP_URLComponents_Dev* components) { | 57 PP_URLComponents_Dev* components) { |
| 59 StringVar* base_url_string = StringVar::FromPPVar(base_url); | 58 StringVar* base_url_string = StringVar::FromPPVar(base_url); |
| 60 StringVar* relative_string = StringVar::FromPPVar(relative); | 59 StringVar* relative_string = StringVar::FromPPVar(relative); |
| 61 if (!base_url_string || !relative_string) | 60 if (!base_url_string || !relative_string) |
| 62 return PP_MakeNull(); | 61 return PP_MakeNull(); |
| 63 | 62 |
| 64 GURL base_gurl(base_url_string->value()); | 63 GURL base_gurl(base_url_string->value()); |
| 65 if (!base_gurl.is_valid()) | 64 if (!base_gurl.is_valid()) |
| 66 return PP_MakeNull(); | 65 return PP_MakeNull(); |
| 67 return GenerateURLReturn(base_url_string->pp_module(), | 66 return GenerateURLReturn(base_gurl.Resolve(relative_string->value()), |
| 68 base_gurl.Resolve(relative_string->value()), | |
| 69 components); | 67 components); |
| 70 } | 68 } |
| 71 | 69 |
| 72 // static | 70 // static |
| 73 PP_Bool URLUtilImpl::IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) { | 71 PP_Bool URLUtilImpl::IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) { |
| 74 StringVar* url_a_string = StringVar::FromPPVar(url_a); | 72 StringVar* url_a_string = StringVar::FromPPVar(url_a); |
| 75 StringVar* url_b_string = StringVar::FromPPVar(url_b); | 73 StringVar* url_b_string = StringVar::FromPPVar(url_b); |
| 76 if (!url_a_string || !url_b_string) | 74 if (!url_a_string || !url_b_string) |
| 77 return PP_FALSE; | 75 return PP_FALSE; |
| 78 | 76 |
| 79 GURL gurl_a(url_a_string->value()); | 77 GURL gurl_a(url_a_string->value()); |
| 80 GURL gurl_b(url_b_string->value()); | 78 GURL gurl_b(url_b_string->value()); |
| 81 if (!gurl_a.is_valid() || !gurl_b.is_valid()) | 79 if (!gurl_a.is_valid() || !gurl_b.is_valid()) |
| 82 return PP_FALSE; | 80 return PP_FALSE; |
| 83 | 81 |
| 84 return gurl_a.GetOrigin() == gurl_b.GetOrigin() ? PP_TRUE : PP_FALSE; | 82 return gurl_a.GetOrigin() == gurl_b.GetOrigin() ? PP_TRUE : PP_FALSE; |
| 85 } | 83 } |
| 86 | 84 |
| 87 // Used for returning the given GURL from a PPAPI function, with an optional | 85 // Used for returning the given GURL from a PPAPI function, with an optional |
| 88 // out param indicating the components. | 86 // out param indicating the components. |
| 89 PP_Var URLUtilImpl::GenerateURLReturn(PP_Module module, | 87 PP_Var URLUtilImpl::GenerateURLReturn(const GURL& url, |
| 90 const GURL& url, | |
| 91 PP_URLComponents_Dev* components) { | 88 PP_URLComponents_Dev* components) { |
| 92 if (!url.is_valid()) | 89 if (!url.is_valid()) |
| 93 return PP_MakeNull(); | 90 return PP_MakeNull(); |
| 94 ConvertComponents(url.parsed_for_possibly_invalid_spec(), components); | 91 ConvertComponents(url.parsed_for_possibly_invalid_spec(), components); |
| 95 return StringVar::StringToPPVar(module, url.possibly_invalid_spec()); | 92 return StringVar::StringToPPVar(url.possibly_invalid_spec()); |
| 96 } | 93 } |
| 97 | 94 |
| 98 PP_Var URLUtilImpl::ConvertComponentsAndReturnURL( | 95 PP_Var URLUtilImpl::ConvertComponentsAndReturnURL( |
| 99 const PP_Var& url, | 96 const PP_Var& url, |
| 100 PP_URLComponents_Dev* components) { | 97 PP_URLComponents_Dev* components) { |
| 101 if (!components) | 98 if (!components) |
| 102 return url; // Common case - plugin doesn't care about parsing. | 99 return url; // Common case - plugin doesn't care about parsing. |
| 103 | 100 |
| 104 StringVar* url_string = StringVar::FromPPVar(url); | 101 StringVar* url_string = StringVar::FromPPVar(url); |
| 105 if (!url_string) | 102 if (!url_string) |
| 106 return url; | 103 return url; |
| 107 | 104 |
| 108 PP_Var result = Canonicalize(url, components); | 105 PP_Var result = Canonicalize(url, components); |
| 109 PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(url); | 106 PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(url); |
| 110 return result; | 107 return result; |
| 111 } | 108 } |
| 112 | 109 |
| 113 } // namespace ppapi | 110 } // namespace ppapi |
| OLD | NEW |