OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "webkit/glue/plugins/pepper_url_util.h" | 5 #include "webkit/plugins/ppapi/ppb_url_util_impl.h" |
6 | 6 |
7 #include "googleurl/src/gurl.h" | 7 #include "googleurl/src/gurl.h" |
8 #include "ppapi/c/dev/ppb_url_util_dev.h" | 8 #include "ppapi/c/dev/ppb_url_util_dev.h" |
9 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" | 9 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" |
10 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h" | 10 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h" |
11 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" | 11 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" |
12 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h" | 12 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h" |
13 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" | 13 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" |
14 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h" | 14 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h" |
15 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" | 15 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" |
16 #include "webkit/glue/plugins/pepper_common.h" | 16 #include "webkit/plugins/ppapi/common.h" |
17 #include "webkit/glue/plugins/pepper_plugin_instance.h" | 17 #include "webkit/plugins/ppapi/plugin_instance.h" |
18 #include "webkit/glue/plugins/pepper_string.h" | 18 #include "webkit/plugins/ppapi/string.h" |
19 #include "webkit/glue/plugins/pepper_var.h" | 19 #include "webkit/plugins/ppapi/var.h" |
20 | 20 |
21 namespace pepper { | 21 namespace webkit { |
| 22 namespace ppapi { |
22 | 23 |
23 namespace { | 24 namespace { |
24 | 25 |
25 void ConvertComponent(const url_parse::Component& input, | 26 void ConvertComponent(const url_parse::Component& input, |
26 PP_UrlComponent_Dev* output) { | 27 PP_UrlComponent_Dev* output) { |
27 output->begin = input.begin; | 28 output->begin = input.begin; |
28 output->len = input.len; | 29 output->len = input.len; |
29 } | 30 } |
30 | 31 |
31 // Output can be NULL to specify "do nothing." This rule is followed by all the | 32 // Output can be NULL to specify "do nothing." This rule is followed by all the |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 const PPB_UrlUtil_Dev ppb_url_util = { | 164 const PPB_UrlUtil_Dev ppb_url_util = { |
164 &Canonicalize, | 165 &Canonicalize, |
165 &ResolveRelativeToUrl, | 166 &ResolveRelativeToUrl, |
166 &ResolveRelativeToDocument, | 167 &ResolveRelativeToDocument, |
167 &IsSameSecurityOrigin, | 168 &IsSameSecurityOrigin, |
168 &DocumentCanRequest, | 169 &DocumentCanRequest, |
169 &DocumentCanAccessDocument | 170 &DocumentCanAccessDocument |
170 }; | 171 }; |
171 | 172 |
172 // static | 173 // static |
173 const PPB_UrlUtil_Dev* UrlUtil::GetInterface() { | 174 const PPB_UrlUtil_Dev* PPB_UrlUtil_Impl::GetInterface() { |
174 return &ppb_url_util; | 175 return &ppb_url_util; |
175 } | 176 } |
176 | 177 |
177 } // namespace pepper | 178 } // namespace ppapi |
| 179 } // namespace webkit |
| 180 |
OLD | NEW |