| Index: ppapi/cpp/url_response_info.cc
|
| ===================================================================
|
| --- ppapi/cpp/url_response_info.cc (revision 65458)
|
| +++ ppapi/cpp/url_response_info.cc (working copy)
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ppapi/cpp/dev/url_response_info_dev.h"
|
| +#include "ppapi/cpp/url_response_info.h"
|
|
|
| #include "ppapi/cpp/dev/file_ref_dev.h"
|
| #include "ppapi/cpp/module.h"
|
| @@ -10,45 +10,33 @@
|
|
|
| namespace {
|
|
|
| -DeviceFuncs<PPB_URLResponseInfo_Dev> url_response_info_f(
|
| - PPB_URLRESPONSEINFO_DEV_INTERFACE);
|
| +DeviceFuncs<PPB_URLResponseInfo> url_response_info_f(
|
| + PPB_URLRESPONSEINFO_INTERFACE);
|
|
|
| } // namespace
|
|
|
| namespace pp {
|
|
|
| -URLResponseInfo_Dev::URLResponseInfo_Dev(const URLResponseInfo_Dev& other)
|
| +URLResponseInfo::URLResponseInfo(const URLResponseInfo& other)
|
| : Resource(other) {
|
| }
|
|
|
| -URLResponseInfo_Dev::URLResponseInfo_Dev(PassRef, PP_Resource resource) {
|
| +URLResponseInfo::URLResponseInfo(PassRef, PP_Resource resource) {
|
| PassRefFromConstructor(resource);
|
| }
|
|
|
| -URLResponseInfo_Dev& URLResponseInfo_Dev::operator=(
|
| - const URLResponseInfo_Dev& other) {
|
| - URLResponseInfo_Dev copy(other);
|
| - swap(copy);
|
| - return *this;
|
| -}
|
| -
|
| -void URLResponseInfo_Dev::swap(URLResponseInfo_Dev& other) {
|
| - Resource::swap(other);
|
| -}
|
| -
|
| -Var URLResponseInfo_Dev::GetProperty(
|
| - PP_URLResponseProperty_Dev property) const {
|
| +Var URLResponseInfo::GetProperty(PP_URLResponseProperty property) const {
|
| if (!url_response_info_f)
|
| return Var();
|
| return Var(Var::PassRef(),
|
| url_response_info_f->GetProperty(pp_resource(), property));
|
| }
|
|
|
| -FileRef_Dev URLResponseInfo_Dev::GetBody() const {
|
| +FileRef_Dev URLResponseInfo::GetBodyAsFileRef() const {
|
| if (!url_response_info_f)
|
| return FileRef_Dev();
|
| return FileRef_Dev(FileRef_Dev::PassRef(),
|
| - url_response_info_f->GetBody(pp_resource()));
|
| + url_response_info_f->GetBodyAsFileRef(pp_resource()));
|
| }
|
|
|
| } // namespace pp
|
|
|