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

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

Issue 8790004: Rename the shared impl files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged 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_video_decoder_shared.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/url_util_impl.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"
11 11
12 namespace ppapi { 12 namespace ppapi {
13 13
14 namespace { 14 namespace {
15 15
(...skipping 20 matching lines...) Expand all
36 ConvertComponent(input.host, &output->host); 36 ConvertComponent(input.host, &output->host);
37 ConvertComponent(input.port, &output->port); 37 ConvertComponent(input.port, &output->port);
38 ConvertComponent(input.path, &output->path); 38 ConvertComponent(input.path, &output->path);
39 ConvertComponent(input.query, &output->query); 39 ConvertComponent(input.query, &output->query);
40 ConvertComponent(input.ref, &output->ref); 40 ConvertComponent(input.ref, &output->ref);
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 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(url_string->pp_module(),
52 GURL(url_string->value()), components); 52 GURL(url_string->value()), components);
53 } 53 }
54 54
55 // static 55 // static
56 PP_Var URLUtilImpl::ResolveRelativeToURL(PP_Var base_url, 56 PP_Var PPB_URLUtil_Shared::ResolveRelativeToURL(
57 PP_Var relative, 57 PP_Var base_url,
58 PP_URLComponents_Dev* components) { 58 PP_Var relative,
59 PP_URLComponents_Dev* components) {
59 StringVar* base_url_string = StringVar::FromPPVar(base_url); 60 StringVar* base_url_string = StringVar::FromPPVar(base_url);
60 StringVar* relative_string = StringVar::FromPPVar(relative); 61 StringVar* relative_string = StringVar::FromPPVar(relative);
61 if (!base_url_string || !relative_string) 62 if (!base_url_string || !relative_string)
62 return PP_MakeNull(); 63 return PP_MakeNull();
63 64
64 GURL base_gurl(base_url_string->value()); 65 GURL base_gurl(base_url_string->value());
65 if (!base_gurl.is_valid()) 66 if (!base_gurl.is_valid())
66 return PP_MakeNull(); 67 return PP_MakeNull();
67 return GenerateURLReturn(base_url_string->pp_module(), 68 return GenerateURLReturn(base_url_string->pp_module(),
68 base_gurl.Resolve(relative_string->value()), 69 base_gurl.Resolve(relative_string->value()),
69 components); 70 components);
70 } 71 }
71 72
72 // static 73 // static
73 PP_Bool URLUtilImpl::IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) { 74 PP_Bool PPB_URLUtil_Shared::IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) {
74 StringVar* url_a_string = StringVar::FromPPVar(url_a); 75 StringVar* url_a_string = StringVar::FromPPVar(url_a);
75 StringVar* url_b_string = StringVar::FromPPVar(url_b); 76 StringVar* url_b_string = StringVar::FromPPVar(url_b);
76 if (!url_a_string || !url_b_string) 77 if (!url_a_string || !url_b_string)
77 return PP_FALSE; 78 return PP_FALSE;
78 79
79 GURL gurl_a(url_a_string->value()); 80 GURL gurl_a(url_a_string->value());
80 GURL gurl_b(url_b_string->value()); 81 GURL gurl_b(url_b_string->value());
81 if (!gurl_a.is_valid() || !gurl_b.is_valid()) 82 if (!gurl_a.is_valid() || !gurl_b.is_valid())
82 return PP_FALSE; 83 return PP_FALSE;
83 84
84 return gurl_a.GetOrigin() == gurl_b.GetOrigin() ? PP_TRUE : PP_FALSE; 85 return gurl_a.GetOrigin() == gurl_b.GetOrigin() ? PP_TRUE : PP_FALSE;
85 } 86 }
86 87
87 // Used for returning the given GURL from a PPAPI function, with an optional 88 // Used for returning the given GURL from a PPAPI function, with an optional
88 // out param indicating the components. 89 // out param indicating the components.
89 PP_Var URLUtilImpl::GenerateURLReturn(PP_Module module, 90 PP_Var PPB_URLUtil_Shared::GenerateURLReturn(
90 const GURL& url, 91 PP_Module module,
91 PP_URLComponents_Dev* components) { 92 const GURL& url,
93 PP_URLComponents_Dev* components) {
92 if (!url.is_valid()) 94 if (!url.is_valid())
93 return PP_MakeNull(); 95 return PP_MakeNull();
94 ConvertComponents(url.parsed_for_possibly_invalid_spec(), components); 96 ConvertComponents(url.parsed_for_possibly_invalid_spec(), components);
95 return StringVar::StringToPPVar(module, url.possibly_invalid_spec()); 97 return StringVar::StringToPPVar(module, url.possibly_invalid_spec());
96 } 98 }
97 99
98 PP_Var URLUtilImpl::ConvertComponentsAndReturnURL( 100 PP_Var PPB_URLUtil_Shared::ConvertComponentsAndReturnURL(
99 const PP_Var& url, 101 const PP_Var& url,
100 PP_URLComponents_Dev* components) { 102 PP_URLComponents_Dev* components) {
101 if (!components) 103 if (!components)
102 return url; // Common case - plugin doesn't care about parsing. 104 return url; // Common case - plugin doesn't care about parsing.
103 105
104 StringVar* url_string = StringVar::FromPPVar(url); 106 StringVar* url_string = StringVar::FromPPVar(url);
105 if (!url_string) 107 if (!url_string)
106 return url; 108 return url;
107 109
108 PP_Var result = Canonicalize(url, components); 110 PP_Var result = Canonicalize(url, components);
109 PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(url); 111 PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(url);
110 return result; 112 return result;
111 } 113 }
112 114
113 } // namespace ppapi 115 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/shared_impl/ppb_url_util_shared.h ('k') | ppapi/shared_impl/ppb_video_decoder_shared.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698