| 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/ppb_url_util_shared.h" | 5 #include "ppapi/shared_impl/ppb_url_util_shared.h" |
| 6 | 6 |
| 7 #include "googleurl/src/gurl.h" | |
| 8 #include "ppapi/shared_impl/ppapi_globals.h" | 7 #include "ppapi/shared_impl/ppapi_globals.h" |
| 9 #include "ppapi/shared_impl/proxy_lock.h" | 8 #include "ppapi/shared_impl/proxy_lock.h" |
| 10 #include "ppapi/shared_impl/var.h" | 9 #include "ppapi/shared_impl/var.h" |
| 11 #include "ppapi/shared_impl/var_tracker.h" | 10 #include "ppapi/shared_impl/var_tracker.h" |
| 11 #include "url/gurl.h" |
| 12 | 12 |
| 13 namespace ppapi { | 13 namespace ppapi { |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 void ConvertComponent(const url_parse::Component& input, | 17 void ConvertComponent(const url_parse::Component& input, |
| 18 PP_URLComponent_Dev* output) { | 18 PP_URLComponent_Dev* output) { |
| 19 output->begin = input.begin; | 19 output->begin = input.begin; |
| 20 output->len = input.len; | 20 output->len = input.len; |
| 21 } | 21 } |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 StringVar* url_string = StringVar::FromPPVar(url); | 106 StringVar* url_string = StringVar::FromPPVar(url); |
| 107 if (!url_string) | 107 if (!url_string) |
| 108 return url; | 108 return url; |
| 109 | 109 |
| 110 PP_Var result = Canonicalize(url, components); | 110 PP_Var result = Canonicalize(url, components); |
| 111 PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(url); | 111 PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(url); |
| 112 return result; | 112 return result; |
| 113 } | 113 } |
| 114 | 114 |
| 115 } // namespace ppapi | 115 } // namespace ppapi |
| OLD | NEW |