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

Side by Side Diff: ppapi/shared_impl/ppb_url_util_shared.cc

Issue 8826011: Remove PP_Module from parameters for PPB_Var.VarFromUtf8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/shared_impl/ppb_url_util_shared.h ('k') | ppapi/shared_impl/ppb_var_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ppb_url_util_shared.h" 5 #include "ppapi/shared_impl/ppb_url_util_shared.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
41 } 41 }
42 42
43 } // namespace 43 } // namespace
44 44
45 // static 45 // static
46 PP_Var PPB_URLUtil_Shared::Canonicalize(PP_Var url, 46 PP_Var PPB_URLUtil_Shared::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 PPB_URLUtil_Shared::ResolveRelativeToURL( 55 PP_Var PPB_URLUtil_Shared::ResolveRelativeToURL(
57 PP_Var base_url, 56 PP_Var base_url,
58 PP_Var relative, 57 PP_Var relative,
59 PP_URLComponents_Dev* components) { 58 PP_URLComponents_Dev* components) {
60 StringVar* base_url_string = StringVar::FromPPVar(base_url); 59 StringVar* base_url_string = StringVar::FromPPVar(base_url);
61 StringVar* relative_string = StringVar::FromPPVar(relative); 60 StringVar* relative_string = StringVar::FromPPVar(relative);
62 if (!base_url_string || !relative_string) 61 if (!base_url_string || !relative_string)
63 return PP_MakeNull(); 62 return PP_MakeNull();
64 63
65 GURL base_gurl(base_url_string->value()); 64 GURL base_gurl(base_url_string->value());
66 if (!base_gurl.is_valid()) 65 if (!base_gurl.is_valid())
67 return PP_MakeNull(); 66 return PP_MakeNull();
68 return GenerateURLReturn(base_url_string->pp_module(), 67 return GenerateURLReturn(base_gurl.Resolve(relative_string->value()),
69 base_gurl.Resolve(relative_string->value()),
70 components); 68 components);
71 } 69 }
72 70
73 // static 71 // static
74 PP_Bool PPB_URLUtil_Shared::IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) { 72 PP_Bool PPB_URLUtil_Shared::IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) {
75 StringVar* url_a_string = StringVar::FromPPVar(url_a); 73 StringVar* url_a_string = StringVar::FromPPVar(url_a);
76 StringVar* url_b_string = StringVar::FromPPVar(url_b); 74 StringVar* url_b_string = StringVar::FromPPVar(url_b);
77 if (!url_a_string || !url_b_string) 75 if (!url_a_string || !url_b_string)
78 return PP_FALSE; 76 return PP_FALSE;
79 77
80 GURL gurl_a(url_a_string->value()); 78 GURL gurl_a(url_a_string->value());
81 GURL gurl_b(url_b_string->value()); 79 GURL gurl_b(url_b_string->value());
82 if (!gurl_a.is_valid() || !gurl_b.is_valid()) 80 if (!gurl_a.is_valid() || !gurl_b.is_valid())
83 return PP_FALSE; 81 return PP_FALSE;
84 82
85 return gurl_a.GetOrigin() == gurl_b.GetOrigin() ? PP_TRUE : PP_FALSE; 83 return gurl_a.GetOrigin() == gurl_b.GetOrigin() ? PP_TRUE : PP_FALSE;
86 } 84 }
87 85
88 // Used for returning the given GURL from a PPAPI function, with an optional 86 // Used for returning the given GURL from a PPAPI function, with an optional
89 // out param indicating the components. 87 // out param indicating the components.
90 PP_Var PPB_URLUtil_Shared::GenerateURLReturn( 88 PP_Var PPB_URLUtil_Shared::GenerateURLReturn(const GURL& url,
91 PP_Module module, 89 PP_URLComponents_Dev* components) {
92 const GURL& url,
93 PP_URLComponents_Dev* components) {
94 if (!url.is_valid()) 90 if (!url.is_valid())
95 return PP_MakeNull(); 91 return PP_MakeNull();
96 ConvertComponents(url.parsed_for_possibly_invalid_spec(), components); 92 ConvertComponents(url.parsed_for_possibly_invalid_spec(), components);
97 return StringVar::StringToPPVar(module, url.possibly_invalid_spec()); 93 return StringVar::StringToPPVar(url.possibly_invalid_spec());
98 } 94 }
99 95
100 PP_Var PPB_URLUtil_Shared::ConvertComponentsAndReturnURL( 96 PP_Var PPB_URLUtil_Shared::ConvertComponentsAndReturnURL(
101 const PP_Var& url, 97 const PP_Var& url,
102 PP_URLComponents_Dev* components) { 98 PP_URLComponents_Dev* components) {
103 if (!components) 99 if (!components)
104 return url; // Common case - plugin doesn't care about parsing. 100 return url; // Common case - plugin doesn't care about parsing.
105 101
106 StringVar* url_string = StringVar::FromPPVar(url); 102 StringVar* url_string = StringVar::FromPPVar(url);
107 if (!url_string) 103 if (!url_string)
108 return url; 104 return url;
109 105
110 PP_Var result = Canonicalize(url, components); 106 PP_Var result = Canonicalize(url, components);
111 PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(url); 107 PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(url);
112 return result; 108 return result;
113 } 109 }
114 110
115 } // namespace ppapi 111 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/shared_impl/ppb_url_util_shared.h ('k') | ppapi/shared_impl/ppb_var_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698