diff options
| author | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 14:50:00 +0000 |
|---|---|---|
| committer | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 14:50:00 +0000 |
| commit | 4d5a4e0301895e4d81042510904183ddb224c1b5 (patch) | |
| tree | 7e9a3e9decad55b73b3e1270e90db96cc4777534 /native_client_sdk | |
| parent | 84b021a7fd34220ca954a626c6d1a7b712983e23 (diff) | |
| download | chromium_src-4d5a4e0301895e4d81042510904183ddb224c1b5.zip chromium_src-4d5a4e0301895e4d81042510904183ddb224c1b5.tar.gz chromium_src-4d5a4e0301895e4d81042510904183ddb224c1b5.tar.bz2 | |
[PPAPI] Moving pp::VarResource_Dev API into pp::Var (now stable).
This API allows pp::Resource objects to be read and written to pp::Vars.
Moved the methods of PPB_VarResource_Dev (C API) to PPB_Var version 1.2.
Moved the methods of pp::VarResource_Dev (C++ API) to pp::Var.
Code written against the dev API will no longer compile, as references
to the API need to be updated to use Var instead of VarResource_Dev.
Binaries compiled against the dev API will now experience run-time
errors loading the old interface.
BUG=177017
Review URL: https://codereview.chromium.org/148213016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
3 files changed, 1 insertions, 5 deletions
diff --git a/native_client_sdk/src/examples/api/media_stream_video/media_stream_video.cc b/native_client_sdk/src/examples/api/media_stream_video/media_stream_video.cc index efcb725..831d98a 100644 --- a/native_client_sdk/src/examples/api/media_stream_video/media_stream_video.cc +++ b/native_client_sdk/src/examples/api/media_stream_video/media_stream_video.cc @@ -6,7 +6,6 @@ #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_opengles2.h" #include "ppapi/cpp/completion_callback.h" -#include "ppapi/cpp/dev/var_resource_dev.h" #include "ppapi/cpp/graphics_3d.h" #include "ppapi/cpp/graphics_3d_client.h" #include "ppapi/cpp/instance.h" @@ -132,7 +131,7 @@ void MediaStreamVideoDemoInstance::HandleMessage(const pp::Var& var_message) { if (!var_track.is_resource()) return; - pp::Resource resource_track = pp::VarResource_Dev(var_track).AsResource(); + pp::Resource resource_track = var_track.AsResource(); video_track_ = pp::MediaStreamVideoTrack(resource_track); diff --git a/native_client_sdk/src/libraries/ppapi/library.dsc b/native_client_sdk/src/libraries/ppapi/library.dsc index 3e5e319..04fa67d 100644 --- a/native_client_sdk/src/libraries/ppapi/library.dsc +++ b/native_client_sdk/src/libraries/ppapi/library.dsc @@ -113,7 +113,6 @@ 'ppb_truetype_font_dev.h', 'ppb_url_util_dev.h', 'ppb_var_deprecated.h', - 'ppb_var_resource_dev.h', 'ppb_video_capture_dev.h', 'ppb_video_decoder_dev.h', 'ppb_view_dev.h', diff --git a/native_client_sdk/src/libraries/ppapi_cpp/library.dsc b/native_client_sdk/src/libraries/ppapi_cpp/library.dsc index 223e7c2..2722c40 100644 --- a/native_client_sdk/src/libraries/ppapi_cpp/library.dsc +++ b/native_client_sdk/src/libraries/ppapi_cpp/library.dsc @@ -90,7 +90,6 @@ 'string_wrapper_dev.cc', 'graphics_2d_dev.cc', 'widget_dev.cc', - 'var_resource_dev.cc', # ppapi/cpp/extensions/dev 'socket_dev.cc', @@ -193,7 +192,6 @@ 'to_c_type_converter_dev.h', 'truetype_font_dev.h', 'url_util_dev.h', - 'var_resource_dev.h', 'video_capture_client_dev.h', 'video_capture_dev.h', 'video_decoder_client_dev.h', |