summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 16:53:16 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 16:53:16 +0000
commitd5cc7198356bdfa3945e7a61f964d8c9ac77070f (patch)
tree61bb3b104e2ba6acaba0ddc062b5fa263a8ab697 /native_client_sdk
parentd815b6b8043a7114cbb0bf97beba8778c08d7e6f (diff)
downloadchromium_src-d5cc7198356bdfa3945e7a61f964d8c9ac77070f.zip
chromium_src-d5cc7198356bdfa3945e7a61f964d8c9ac77070f.tar.gz
chromium_src-d5cc7198356bdfa3945e7a61f964d8c9ac77070f.tar.bz2
Rename NaCl/pepper gamepad interface from _dev to stable
Following API review, and revisions here: https://chromiumcodereview.appspot.com/9405033/. This change is just the mechanical renames and bump of version number to 1.0. BUG=112879, 115119 Review URL: http://codereview.chromium.org/9566022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rw-r--r--native_client_sdk/src/examples/gamepad/gamepad.cc10
-rw-r--r--native_client_sdk/src/examples/gamepad/gamepad.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/native_client_sdk/src/examples/gamepad/gamepad.cc b/native_client_sdk/src/examples/gamepad/gamepad.cc
index 9ee653e..4fc70f9 100644
--- a/native_client_sdk/src/examples/gamepad/gamepad.cc
+++ b/native_client_sdk/src/examples/gamepad/gamepad.cc
@@ -10,7 +10,7 @@
#include <cmath>
#include <cstring>
#include <string>
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
+#include "ppapi/c/ppb_gamepad.h"
#include "ppapi/cpp/completion_callback.h"
#include "ppapi/cpp/var.h"
@@ -35,8 +35,8 @@ Gamepad::Gamepad(PP_Instance instance)
quit_(false) {
pp::Module* module = pp::Module::Get();
assert(module);
- gamepad_ = static_cast<const PPB_Gamepad_Dev*>(
- module->GetBrowserInterface(PPB_GAMEPAD_DEV_INTERFACE));
+ gamepad_ = static_cast<const PPB_Gamepad*>(
+ module->GetBrowserInterface(PPB_GAMEPAD_INTERFACE));
assert(gamepad_);
}
@@ -84,7 +84,7 @@ void Gamepad::Paint() {
FillRect(pixel_buffer_, 0, 0, width(), height(), 0xfff0f0f0);
// Get current gamepad data.
- PP_GamepadsSampleData_Dev gamepad_data;
+ PP_GamepadsSampleData gamepad_data;
gamepad_->Sample(pp_instance(), &gamepad_data);
// Draw the current state for each connected gamepad.
@@ -92,7 +92,7 @@ void Gamepad::Paint() {
int width2 = width() / gamepad_data.length / 2;
int height2 = height() / 2;
int offset = width2 * 2 * p;
- PP_GamepadSampleData_Dev& pad = gamepad_data.items[p];
+ PP_GamepadSampleData& pad = gamepad_data.items[p];
if (!pad.connected)
continue;
diff --git a/native_client_sdk/src/examples/gamepad/gamepad.h b/native_client_sdk/src/examples/gamepad/gamepad.h
index e5a5e3a..4c9f367 100644
--- a/native_client_sdk/src/examples/gamepad/gamepad.h
+++ b/native_client_sdk/src/examples/gamepad/gamepad.h
@@ -7,7 +7,7 @@
#include <map>
#include <vector>
-#include "ppapi/c/dev/ppb_gamepad_dev.h"
+#include "ppapi/c/ppb_gamepad.h"
#include "ppapi/cpp/graphics_2d.h"
#include "ppapi/cpp/image_data.h"
#include "ppapi/cpp/instance.h"
@@ -70,7 +70,7 @@ class Gamepad : public pp::Instance {
pp::Graphics2D* graphics_2d_context_;
pp::ImageData* pixel_buffer_;
- const PPB_Gamepad_Dev* gamepad_;
+ const PPB_Gamepad* gamepad_;
bool flush_pending_;
bool quit_;
};