| 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 plugins { |
| 23 namespace ppapi { |
| 22 | 24 |
| 23 namespace { | 25 namespace { |
| 24 | 26 |
| 25 void ConvertComponent(const url_parse::Component& input, | 27 void ConvertComponent(const url_parse::Component& input, |
| 26 PP_UrlComponent_Dev* output) { | 28 PP_UrlComponent_Dev* output) { |
| 27 output->begin = input.begin; | 29 output->begin = input.begin; |
| 28 output->len = input.len; | 30 output->len = input.len; |
| 29 } | 31 } |
| 30 | 32 |
| 31 // Output can be NULL to specify "do nothing." This rule is followed by all the | 33 // 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 = { | 165 const PPB_UrlUtil_Dev ppb_url_util = { |
| 164 &Canonicalize, | 166 &Canonicalize, |
| 165 &ResolveRelativeToUrl, | 167 &ResolveRelativeToUrl, |
| 166 &ResolveRelativeToDocument, | 168 &ResolveRelativeToDocument, |
| 167 &IsSameSecurityOrigin, | 169 &IsSameSecurityOrigin, |
| 168 &DocumentCanRequest, | 170 &DocumentCanRequest, |
| 169 &DocumentCanAccessDocument | 171 &DocumentCanAccessDocument |
| 170 }; | 172 }; |
| 171 | 173 |
| 172 // static | 174 // static |
| 173 const PPB_UrlUtil_Dev* UrlUtil::GetInterface() { | 175 const PPB_UrlUtil_Dev* PPB_UrlUtil_Impl::GetInterface() { |
| 174 return &ppb_url_util; | 176 return &ppb_url_util; |
| 175 } | 177 } |
| 176 | 178 |
| 177 } // namespace pepper | 179 } // namespace ppapi |
| 180 } // namespace plugins |
| 181 } // namespace webkit |
| 182 |
| OLD | NEW |