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

webkit/glue/plugins/pepper_url_request_info.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_request_info.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/http/http_util.h"
@@ skipping 44 matching lines @@
   URLRequestInfo* request = new URLRequestInfo(module);
 
   return request->GetReference();
 }
 
 bool IsURLRequestInfo(PP_Resource resource) {
   return !!Resource::GetAs<URLRequestInfo>(resource);
 }
 
 bool SetProperty(PP_Resource request_id,
-                 PP_URLRequestProperty property,
+                 PP_URLRequestProperty_Dev property,
                  PP_Var var) {
   scoped_refptr<URLRequestInfo> request(
       Resource::GetAs<URLRequestInfo>(request_id));
   if (!request)
     return false;
 
   if (var.type == PP_VARTYPE_BOOL)
     return request->SetBooleanProperty(property, var.value.as_bool);
 
   if (var.type == PP_VARTYPE_STRING)
@@ skipping 28 matching lines @@
   scoped_refptr<FileRef> file_ref(Resource::GetAs<FileRef>(file_ref_id));
   if (!file_ref)
     return false;
 
   return request->AppendFileToBody(file_ref,
                                    start_offset,
                                    number_of_bytes,
                                    expected_last_modified_time);
 }
 
-const PPB_URLRequestInfo ppb_urlrequestinfo = {
+const PPB_URLRequestInfo_Dev ppb_urlrequestinfo = {
   &Create,
   &IsURLRequestInfo,
   &SetProperty,
   &AppendDataToBody,
   &AppendFileToBody
 };
 
 }  // namespace
 
 URLRequestInfo::URLRequestInfo(PluginModule* module)
     : Resource(module),
       stream_to_file_(false) {
 }
 
 URLRequestInfo::~URLRequestInfo() {
 }
 
 // static
-const PPB_URLRequestInfo* URLRequestInfo::GetInterface() {
+const PPB_URLRequestInfo_Dev* URLRequestInfo::GetInterface() {
   return &ppb_urlrequestinfo;
 }
 
-bool URLRequestInfo::SetBooleanProperty(PP_URLRequestProperty property,
+bool URLRequestInfo::SetBooleanProperty(PP_URLRequestProperty_Dev property,
                                         bool value) {
   switch (property) {
     case PP_URLREQUESTPROPERTY_STREAMTOFILE:
       stream_to_file_ = value;
       return true;
     default:
       NOTIMPLEMENTED();  // TODO(darin): Implement me!
       return false;
   }
 }
 
-bool URLRequestInfo::SetStringProperty(PP_URLRequestProperty property,
+bool URLRequestInfo::SetStringProperty(PP_URLRequestProperty_Dev property,
                                        const std::string& value) {
   // TODO(darin): Validate input.  Perhaps at a different layer?
   switch (property) {
     case PP_URLREQUESTPROPERTY_URL:
       url_ = value;  // NOTE: This may be a relative URL.
       return true;
     case PP_URLREQUESTPROPERTY_METHOD:
       method_ = value;
       return true;
     case PP_URLREQUESTPROPERTY_HEADERS:
@@ skipping 67 matching lines @@
       }
     }
     web_request.setHTTPBody(http_body);
   }
 
   frame->setReferrerForRequest(web_request, WebURL());  // Use default.
   return web_request;
 }
 
 }  // namespace pepper