| Index: ppapi/cpp/url_loader.cc
|
| diff --git a/ppapi/cpp/url_loader.cc b/ppapi/cpp/url_loader.cc
|
| index 73855e94c126fd9952117b5b438865781564bc9c..1be87a777b05b5f1f04f23b6a7717a5933a697a9 100644
|
| --- a/ppapi/cpp/url_loader.cc
|
| +++ b/ppapi/cpp/url_loader.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 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.
|
|
|
| @@ -18,8 +18,8 @@ namespace pp {
|
|
|
| namespace {
|
|
|
| -template <> const char* interface_name<PPB_URLLoader>() {
|
| - return PPB_URLLOADER_INTERFACE;
|
| +template <> const char* interface_name<PPB_URLLoader_1_0>() {
|
| + return PPB_URLLOADER_INTERFACE_1_0;
|
| }
|
|
|
| } // namespace
|
| @@ -28,9 +28,9 @@ URLLoader::URLLoader(PP_Resource resource) : Resource(resource) {
|
| }
|
|
|
| URLLoader::URLLoader(const InstanceHandle& instance) {
|
| - if (!has_interface<PPB_URLLoader>())
|
| + if (!has_interface<PPB_URLLoader_1_0>())
|
| return;
|
| - PassRefFromConstructor(get_interface<PPB_URLLoader>()->Create(
|
| + PassRefFromConstructor(get_interface<PPB_URLLoader_1_0>()->Create(
|
| instance.pp_instance()));
|
| }
|
|
|
| @@ -39,65 +39,65 @@ URLLoader::URLLoader(const URLLoader& other) : Resource(other) {
|
|
|
| int32_t URLLoader::Open(const URLRequestInfo& request_info,
|
| const CompletionCallback& cc) {
|
| - if (!has_interface<PPB_URLLoader>())
|
| + if (!has_interface<PPB_URLLoader_1_0>())
|
| return cc.MayForce(PP_ERROR_NOINTERFACE);
|
| - return get_interface<PPB_URLLoader>()->Open(pp_resource(),
|
| + return get_interface<PPB_URLLoader_1_0>()->Open(pp_resource(),
|
| request_info.pp_resource(),
|
| cc.pp_completion_callback());
|
| }
|
|
|
| int32_t URLLoader::FollowRedirect(const CompletionCallback& cc) {
|
| - if (!has_interface<PPB_URLLoader>())
|
| + if (!has_interface<PPB_URLLoader_1_0>())
|
| return cc.MayForce(PP_ERROR_NOINTERFACE);
|
| - return get_interface<PPB_URLLoader>()->FollowRedirect(
|
| + return get_interface<PPB_URLLoader_1_0>()->FollowRedirect(
|
| pp_resource(), cc.pp_completion_callback());
|
| }
|
|
|
| bool URLLoader::GetUploadProgress(int64_t* bytes_sent,
|
| int64_t* total_bytes_to_be_sent) const {
|
| - if (!has_interface<PPB_URLLoader>())
|
| + if (!has_interface<PPB_URLLoader_1_0>())
|
| return false;
|
| - return PP_ToBool(get_interface<PPB_URLLoader>()->GetUploadProgress(
|
| + return PP_ToBool(get_interface<PPB_URLLoader_1_0>()->GetUploadProgress(
|
| pp_resource(), bytes_sent, total_bytes_to_be_sent));
|
| }
|
|
|
| bool URLLoader::GetDownloadProgress(
|
| int64_t* bytes_received,
|
| int64_t* total_bytes_to_be_received) const {
|
| - if (!has_interface<PPB_URLLoader>())
|
| + if (!has_interface<PPB_URLLoader_1_0>())
|
| return false;
|
| - return PP_ToBool(get_interface<PPB_URLLoader>()->GetDownloadProgress(
|
| + return PP_ToBool(get_interface<PPB_URLLoader_1_0>()->GetDownloadProgress(
|
| pp_resource(), bytes_received, total_bytes_to_be_received));
|
| }
|
|
|
| URLResponseInfo URLLoader::GetResponseInfo() const {
|
| - if (!has_interface<PPB_URLLoader>())
|
| + if (!has_interface<PPB_URLLoader_1_0>())
|
| return URLResponseInfo();
|
| return URLResponseInfo(PASS_REF,
|
| - get_interface<PPB_URLLoader>()->GetResponseInfo(
|
| + get_interface<PPB_URLLoader_1_0>()->GetResponseInfo(
|
| pp_resource()));
|
| }
|
|
|
| int32_t URLLoader::ReadResponseBody(void* buffer,
|
| int32_t bytes_to_read,
|
| const CompletionCallback& cc) {
|
| - if (!has_interface<PPB_URLLoader>())
|
| + if (!has_interface<PPB_URLLoader_1_0>())
|
| return cc.MayForce(PP_ERROR_NOINTERFACE);
|
| - return get_interface<PPB_URLLoader>()->ReadResponseBody(
|
| + return get_interface<PPB_URLLoader_1_0>()->ReadResponseBody(
|
| pp_resource(), buffer, bytes_to_read, cc.pp_completion_callback());
|
| }
|
|
|
| int32_t URLLoader::FinishStreamingToFile(const CompletionCallback& cc) {
|
| - if (!has_interface<PPB_URLLoader>())
|
| + if (!has_interface<PPB_URLLoader_1_0>())
|
| return cc.MayForce(PP_ERROR_NOINTERFACE);
|
| - return get_interface<PPB_URLLoader>()->FinishStreamingToFile(
|
| + return get_interface<PPB_URLLoader_1_0>()->FinishStreamingToFile(
|
| pp_resource(), cc.pp_completion_callback());
|
| }
|
|
|
| void URLLoader::Close() {
|
| - if (!has_interface<PPB_URLLoader>())
|
| + if (!has_interface<PPB_URLLoader_1_0>())
|
| return;
|
| - get_interface<PPB_URLLoader>()->Close(pp_resource());
|
| + get_interface<PPB_URLLoader_1_0>()->Close(pp_resource());
|
| }
|
|
|
| } // namespace pp
|
|
|