Pull new PPAPI, rename non-P0 interfaces to Dev, rename DeviceContext2D to Gr...

webkit/glue/plugins/pepper_url_util.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/plugins/pepper_url_util.h"
 
 #include "googleurl/src/gurl.h"
-#include "third_party/ppapi/c/ppb_url_util.h"
+#include "third_party/ppapi/c/dev/ppb_url_util_dev.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 #include "webkit/glue/plugins/pepper_string.h"
 #include "webkit/glue/plugins/pepper_var.h"
 
 namespace pepper {
 
 namespace {
 
 void ConvertComponent(const url_parse::Component& input,
-                      PP_UrlComponent* output) {
+                      PP_UrlComponent_Dev* output) {
   output->begin = input.begin;
   output->len = input.len;
 }
 
 // Output can be NULL to specify "do nothing." This rule is followed by all the
 // url util functions, so we implement it once here.
 void ConvertComponents(const url_parse::Parsed& input,
-                       PP_UrlComponents* output) {
+                       PP_UrlComponents_Dev* output) {
   if (!output)
     return;
 
   ConvertComponent(input.scheme, &output->scheme);
   ConvertComponent(input.username, &output->username);
   ConvertComponent(input.password, &output->password);
   ConvertComponent(input.host, &output->host);
   ConvertComponent(input.port, &output->port);
   ConvertComponent(input.path, &output->path);
   ConvertComponent(input.query, &output->query);
   ConvertComponent(input.ref, &output->ref);
 }
 
 // Used for returning the given GURL from a PPAPI function, with an optional
 // out param indicating the components.
-PP_Var GenerateUrlReturn(const GURL& url, PP_UrlComponents* components) {
+PP_Var GenerateUrlReturn(const GURL& url, PP_UrlComponents_Dev* components) {
   if (!url.is_valid())
     return PP_MakeNull();
   ConvertComponents(url.parsed_for_possibly_invalid_spec(), components);
   return StringToPPVar(url.possibly_invalid_spec());
 }
 
 // Sets |*security_origin| to be the WebKit security origin associated with the
 // document containing the given plugin instance. On success, returns true. If
 // the instance is invalid, returns false and |*security_origin| will be
 // unchanged.
 bool SecurityOriginForInstance(PP_Instance instance_id,
                                WebKit::WebSecurityOrigin* security_origin) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return false;
 
   WebKit::WebElement plugin_element = instance->container()->element();
   WebKit::WebFrame* plugin_frame = plugin_element.document().frame();
   if (!plugin_frame)
     return false;
 
   *security_origin = plugin_frame->securityOrigin();
   return true;
 }
 
-PP_Var Canonicalize(PP_Var url, PP_UrlComponents* components) {
+PP_Var Canonicalize(PP_Var url, PP_UrlComponents_Dev* components) {
   String* url_string = GetString(url);
   if (!url_string)
     return PP_MakeNull();
   return GenerateUrlReturn(GURL(url_string->value()), components);
 }
 
 PP_Var ResolveRelativeToUrl(PP_Var base_url,
                             PP_Var relative,
-                            PP_UrlComponents* components) {
+                            PP_UrlComponents_Dev* components) {
   String* base_url_string = GetString(base_url);
   String* relative_string = GetString(relative);
   if (!base_url_string || !relative_string)
     return PP_MakeNull();
 
   GURL base_gurl(base_url_string->value());
   if (!base_gurl.is_valid())
     return PP_MakeNull();
   return GenerateUrlReturn(base_gurl.Resolve(relative_string->value()),
                            components);
 }
 
 PP_Var ResolveRelativeToDocument(PP_Instance instance_id,
                                  PP_Var relative,
-                                 PP_UrlComponents* components) {
+                                 PP_UrlComponents_Dev* components) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return PP_MakeNull();
 
   String* relative_string = GetString(relative);
   if (!relative_string)
     return PP_MakeNull();
 
   WebKit::WebElement plugin_element = instance->container()->element();
   GURL document_url = plugin_element.document().baseURL();
@@ skipping 38 matching lines @@
 
   WebKit::WebSecurityOrigin target_origin;
   if (!SecurityOriginForInstance(active, &target_origin))
     return false;
 
   return active_origin.canAccess(target_origin);
 }
 
 }  // namespace
 
-const PPB_UrlUtil ppb_url_util = {
+const PPB_UrlUtil_Dev ppb_url_util = {
   &Canonicalize,
   &ResolveRelativeToUrl,
   &ResolveRelativeToDocument,
   &IsSameSecurityOrigin,
   &DocumentCanRequest,
   &DocumentCanAccessDocument
 };
 
-const PPB_UrlUtil* GetUrlUtilInterface() {
+// static
+const PPB_UrlUtil_Dev* UrlUtil::GetInterface() {
   return &ppb_url_util;
 }
 
 }  // namespace pepper