summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 04:55:55 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 04:55:55 +0000
commit9c6e0de10e2cbe72e3368c345b31f5ba18e511e3 (patch)
tree3443d267a3ae72f8108fc6baa7659aa4159588ab /webkit
parentfadb1f7f903cbe3007c3f42b0f820b06e14e15ed (diff)
downloadchromium_src-9c6e0de10e2cbe72e3368c345b31f5ba18e511e3.zip
chromium_src-9c6e0de10e2cbe72e3368c345b31f5ba18e511e3.tar.gz
chromium_src-9c6e0de10e2cbe72e3368c345b31f5ba18e511e3.tar.bz2
PPAPI: Move PPB_ArrayBuffer out of Dev.
BUG=103435 TEST=N/A Review URL: http://codereview.chromium.org/9107046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc6
-rw-r--r--webkit/plugins/ppapi/ppb_websocket_impl.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index df8400d..1c2ea1b 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -34,7 +34,6 @@
#include "ppapi/c/dev/ppb_text_input_dev.h"
#include "ppapi/c/dev/ppb_transport_dev.h"
#include "ppapi/c/dev/ppb_url_util_dev.h"
-#include "ppapi/c/dev/ppb_var_array_buffer_dev.h"
#include "ppapi/c/dev/ppb_var_deprecated.h"
#include "ppapi/c/dev/ppb_video_capture_dev.h"
#include "ppapi/c/dev/ppb_video_decoder_dev.h"
@@ -62,6 +61,7 @@
#include "ppapi/c/ppb_url_request_info.h"
#include "ppapi/c/ppb_url_response_info.h"
#include "ppapi/c/ppb_var.h"
+#include "ppapi/c/ppb_var_array_buffer.h"
#include "ppapi/c/ppb_view.h"
#include "ppapi/c/ppp.h"
#include "ppapi/c/ppp_instance.h"
@@ -349,8 +349,8 @@ const void* GetInterface(const char* name) {
return ::ppapi::PPB_Var_Shared::GetVarInterface1_0();
if (strcmp(name, PPB_VAR_INTERFACE_1_1) == 0)
return ::ppapi::PPB_Var_Shared::GetVarInterface1_1();
- if (strcmp(name, PPB_VAR_ARRAY_BUFFER_DEV_INTERFACE) == 0)
- return ::ppapi::PPB_Var_Shared::GetVarArrayBufferInterface();
+ if (strcmp(name, PPB_VAR_ARRAY_BUFFER_INTERFACE_1_0) == 0)
+ return ::ppapi::PPB_Var_Shared::GetVarArrayBufferInterface1_0();
#ifdef ENABLE_FLAPPER_HACKS
if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0)
diff --git a/webkit/plugins/ppapi/ppb_websocket_impl.cc b/webkit/plugins/ppapi/ppb_websocket_impl.cc
index dc52f37..760a4e4 100644
--- a/webkit/plugins/ppapi/ppb_websocket_impl.cc
+++ b/webkit/plugins/ppapi/ppb_websocket_impl.cc
@@ -11,10 +11,10 @@
#include "base/logging.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_util.h"
-#include "ppapi/c/dev/ppb_var_array_buffer_dev.h"
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/pp_var.h"
+#include "ppapi/c/ppb_var_array_buffer.h"
#include "ppapi/c/ppb_var.h"
#include "ppapi/shared_impl/var.h"
#include "ppapi/shared_impl/var_tracker.h"