| Index: ppapi/thunk/ppb_scrollbar_thunk.cc
|
| ===================================================================
|
| --- ppapi/thunk/ppb_scrollbar_thunk.cc (revision 95773)
|
| +++ ppapi/thunk/ppb_scrollbar_thunk.cc (working copy)
|
| @@ -14,11 +14,12 @@
|
|
|
| namespace {
|
|
|
| -PP_Resource Create(PP_Instance instance, PP_Bool vertical) {
|
| - EnterFunction<ResourceCreationAPI> enter(instance, true);
|
| +PP_Resource Create(PP_Resource scrollbar_group, PP_Bool vertical) {
|
| + EnterFunctionGivenResource<ResourceCreationAPI> enter(scrollbar_group, true);
|
| if (enter.failed())
|
| return 0;
|
| - return enter.functions()->CreateScrollbar(instance, vertical);
|
| +
|
| + return enter.functions()->CreateScrollbar(scrollbar_group, vertical);
|
| }
|
|
|
| PP_Bool IsScrollbar(PP_Resource resource) {
|
| @@ -33,6 +34,13 @@
|
| return enter.object()->GetThickness();
|
| }
|
|
|
| +PP_Bool IsOverlay(PP_Resource scrollbar) {
|
| + EnterScrollbar enter(scrollbar, true);
|
| + if (enter.failed())
|
| + return PP_FALSE;
|
| + return PP_FromBool(enter.object()->IsOverlay());
|
| +}
|
| +
|
| uint32_t GetValue(PP_Resource scrollbar) {
|
| EnterScrollbar enter(scrollbar, true);
|
| if (enter.failed())
|
| @@ -66,10 +74,11 @@
|
| enter.object()->ScrollBy(unit, multiplier);
|
| }
|
|
|
| -const PPB_Scrollbar_0_4_Dev g_ppb_scrollbar_thunk = {
|
| +const PPB_Scrollbar_Dev g_ppb_scrollbar_thunk = {
|
| &Create,
|
| &IsScrollbar,
|
| &GetThickness,
|
| + &IsOverlay,
|
| &GetValue,
|
| &SetValue,
|
| &SetDocumentSize,
|
| @@ -79,7 +88,7 @@
|
|
|
| } // namespace
|
|
|
| -const PPB_Scrollbar_0_4_Dev* GetPPB_Scrollbar_Thunk() {
|
| +const PPB_Scrollbar_Dev* GetPPB_Scrollbar_Thunk() {
|
| return &g_ppb_scrollbar_thunk;
|
| }
|
|
|
|
|