diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 20:59:23 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 20:59:23 +0000 |
| commit | 2e0fe8db72b77ba394efe6f7b195ae4fe6dc2f4c (patch) | |
| tree | b6de285df9e4def766f3aab9841648f336dd3d46 /ppapi | |
| parent | 0141ba3ca96fe156474074493b277cf2fd352cc8 (diff) | |
| download | chromium_src-2e0fe8db72b77ba394efe6f7b195ae4fe6dc2f4c.zip chromium_src-2e0fe8db72b77ba394efe6f7b195ae4fe6dc2f4c.tar.gz chromium_src-2e0fe8db72b77ba394efe6f7b195ae4fe6dc2f4c.tar.bz2 | |
Move the default Scrollbar implementation to 0.4 and update the C++ wrapper.
TEST=ppapi tests
BUG=none
Review URL: http://codereview.chromium.org/7346015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/c/dev/ppb_scrollbar_dev.h | 6 | ||||
| -rw-r--r-- | ppapi/cpp/dev/scrollbar_dev.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ppapi/c/dev/ppb_scrollbar_dev.h b/ppapi/c/dev/ppb_scrollbar_dev.h index d283cbc..be51b58 100644 --- a/ppapi/c/dev/ppb_scrollbar_dev.h +++ b/ppapi/c/dev/ppb_scrollbar_dev.h @@ -23,7 +23,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_ScrollBy_Dev, 4); #define PPB_SCROLLBAR_DEV_INTERFACE_0_3 "PPB_Scrollbar(Dev);0.3" #define PPB_SCROLLBAR_DEV_INTERFACE_0_4 "PPB_Scrollbar(Dev);0.4" -#define PPB_SCROLLBAR_DEV_INTERFACE PPB_SCROLLBAR_DEV_INTERFACE_0_3 +#define PPB_SCROLLBAR_DEV_INTERFACE PPB_SCROLLBAR_DEV_INTERFACE_0_4 // The interface for a scrollbar. A scrollbar is a widget, so the functions // in PPB_Widget can also be used with scrollbar objects. @@ -65,7 +65,7 @@ struct PPB_Scrollbar_0_4_Dev { }; // Old version with no resource argument to GetThickness. -struct PPB_Scrollbar_Dev { +struct PPB_Scrollbar_0_3_Dev { PP_Resource (*Create)(PP_Instance instance, PP_Bool vertical); PP_Bool (*IsScrollbar)(PP_Resource resource); @@ -83,7 +83,7 @@ struct PPB_Scrollbar_Dev { int32_t multiplier); }; -typedef struct PPB_Scrollbar_Dev PPB_Scrollbar_0_3_Dev; +typedef struct PPB_Scrollbar_0_4_Dev PPB_Scrollbar_Dev; #endif /* PPAPI_C_DEV_PPB_SCROLLBAR_DEV_H_ */ diff --git a/ppapi/cpp/dev/scrollbar_dev.cc b/ppapi/cpp/dev/scrollbar_dev.cc index 9ea2c14..1f873c0 100644 --- a/ppapi/cpp/dev/scrollbar_dev.cc +++ b/ppapi/cpp/dev/scrollbar_dev.cc @@ -38,7 +38,7 @@ Scrollbar_Dev::Scrollbar_Dev(const Scrollbar_Dev& other) uint32_t Scrollbar_Dev::GetThickness() { if (!has_interface<PPB_Scrollbar_Dev>()) return 0; - return get_interface<PPB_Scrollbar_Dev>()->GetThickness(); + return get_interface<PPB_Scrollbar_Dev>()->GetThickness(pp_resource()); } uint32_t Scrollbar_Dev::GetValue() { |