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

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

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_input_event_shared.cc ('k') | ppapi/shared_impl/ppb_url_util_shared.cc » ('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 #ifndef PPAPI_SHARED_IMPL_PPB_URL_UTIL_SHARED_H_ 5 #ifndef PPAPI_SHARED_IMPL_PPB_URL_UTIL_SHARED_H_
6 #define PPAPI_SHARED_IMPL_PPB_URL_UTIL_SHARED_H_ 6 #define PPAPI_SHARED_IMPL_PPB_URL_UTIL_SHARED_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "googleurl/src/url_parse.h" 11 #include "googleurl/src/url_parse.h"
12 #include "ppapi/c/dev/ppb_url_util_dev.h" 12 #include "ppapi/c/dev/ppb_url_util_dev.h"
13 #include "ppapi/c/pp_module.h"
14 #include "ppapi/c/pp_var.h" 13 #include "ppapi/c/pp_var.h"
15 #include "ppapi/shared_impl/ppapi_shared_export.h" 14 #include "ppapi/shared_impl/ppapi_shared_export.h"
16 15
17 class GURL; 16 class GURL;
18 17
19 namespace ppapi { 18 namespace ppapi {
20 19
21 // Contains the implementation of PPB_URLUtil that is shared between the proxy 20 // Contains the implementation of PPB_URLUtil that is shared between the proxy
22 // and the renderer. 21 // and the renderer.
23 class PPAPI_SHARED_EXPORT PPB_URLUtil_Shared { 22 class PPAPI_SHARED_EXPORT PPB_URLUtil_Shared {
24 public: 23 public:
25 // PPB_URLUtil shared functions. 24 // PPB_URLUtil shared functions.
26 static PP_Var Canonicalize(PP_Var url, 25 static PP_Var Canonicalize(PP_Var url,
27 PP_URLComponents_Dev* components); 26 PP_URLComponents_Dev* components);
28 static PP_Var ResolveRelativeToURL(PP_Var base_url, 27 static PP_Var ResolveRelativeToURL(PP_Var base_url,
29 PP_Var relative, 28 PP_Var relative,
30 PP_URLComponents_Dev* components); 29 PP_URLComponents_Dev* components);
31 static PP_Bool IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b); 30 static PP_Bool IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b);
32 31
33 // Used for returning the given GURL from a PPAPI function, with an optional 32 // Used for returning the given GURL from a PPAPI function, with an optional
34 // out param indicating the components. 33 // out param indicating the components.
35 static PP_Var GenerateURLReturn(PP_Module pp_module, 34 static PP_Var GenerateURLReturn(const GURL& url,
36 const GURL& url,
37 PP_URLComponents_Dev* components); 35 PP_URLComponents_Dev* components);
38 36
39 // Helper function that optionally take a components structure and fills it 37 // Helper function that optionally take a components structure and fills it
40 // out with the parsed version of the given URL. If the components pointer is 38 // out with the parsed version of the given URL. If the components pointer is
41 // NULL, this function will do nothing. 39 // NULL, this function will do nothing.
42 // 40 //
43 // It's annoying to serialze the large PP_URLComponents structure across IPC 41 // It's annoying to serialze the large PP_URLComponents structure across IPC
44 // and the data isn't often requested by plugins. This function is used on 42 // and the data isn't often requested by plugins. This function is used on
45 // the plugin side to fill in the components for those cases where it's 43 // the plugin side to fill in the components for those cases where it's
46 // actually needed. 44 // actually needed.
47 static PP_Var ConvertComponentsAndReturnURL(const PP_Var& url, 45 static PP_Var ConvertComponentsAndReturnURL(const PP_Var& url,
48 PP_URLComponents_Dev* components); 46 PP_URLComponents_Dev* components);
49 }; 47 };
50 48
51 } // namespace ppapi 49 } // namespace ppapi
52 50
53 #endif // PPAPI_SHARED_IMPL_PPB_URL_UTIL_SHARED_H_ 51 #endif // PPAPI_SHARED_IMPL_PPB_URL_UTIL_SHARED_H_
OLDNEW
« no previous file with comments | « ppapi/shared_impl/ppb_input_event_shared.cc ('k') | ppapi/shared_impl/ppb_url_util_shared.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698