diff options
| -rw-r--r-- | ppapi/api/dev/ppb_zoom_dev.idl | 4 | ||||
| -rw-r--r-- | ppapi/c/dev/ppb_zoom_dev.h | 4 | ||||
| -rw-r--r-- | ppapi/ppapi_shared.gypi | 2 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_zoom_thunk.cc (renamed from ppapi/thunk/ppb_zoom_dev_thunk.cc) | 19 |
4 files changed, 10 insertions, 19 deletions
diff --git a/ppapi/api/dev/ppb_zoom_dev.idl b/ppapi/api/dev/ppb_zoom_dev.idl index 8e03bd0..874bc8a 100644 --- a/ppapi/api/dev/ppb_zoom_dev.idl +++ b/ppapi/api/dev/ppb_zoom_dev.idl @@ -7,8 +7,6 @@ * Implementation of the Zoom interface. */ -[generate_thunk] - label Chrome { M14 = 0.2 }; @@ -31,6 +29,6 @@ interface PPB_Zoom_Dev { */ void ZoomLimitsChanged([in] PP_Instance instance, [in] double_t minimum_factor, - [in] double_t maximum_factor); + [in] double_t maximium_factor); }; diff --git a/ppapi/c/dev/ppb_zoom_dev.h b/ppapi/c/dev/ppb_zoom_dev.h index e8cf4ce..7dc9525 100644 --- a/ppapi/c/dev/ppb_zoom_dev.h +++ b/ppapi/c/dev/ppb_zoom_dev.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From dev/ppb_zoom_dev.idl modified Thu Apr 18 10:24:21 2013. */ +/* From dev/ppb_zoom_dev.idl modified Thu Mar 28 11:07:32 2013. */ #ifndef PPAPI_C_DEV_PPB_ZOOM_DEV_H_ #define PPAPI_C_DEV_PPB_ZOOM_DEV_H_ @@ -42,7 +42,7 @@ struct PPB_Zoom_Dev_0_2 { */ void (*ZoomLimitsChanged)(PP_Instance instance, double minimum_factor, - double maximum_factor); + double maximium_factor); }; typedef struct PPB_Zoom_Dev_0_2 PPB_Zoom_Dev; diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index 58488b0..db87368 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -258,7 +258,7 @@ 'thunk/ppb_widget_dev_thunk.cc', 'thunk/ppb_x509_certificate_private_api.h', 'thunk/ppb_x509_certificate_private_thunk.cc', - 'thunk/ppb_zoom_dev_thunk.cc', + 'thunk/ppb_zoom_thunk.cc', 'thunk/thunk.h', ], 'defines': [ diff --git a/ppapi/thunk/ppb_zoom_dev_thunk.cc b/ppapi/thunk/ppb_zoom_thunk.cc index ae8492f..193e856 100644 --- a/ppapi/thunk/ppb_zoom_dev_thunk.cc +++ b/ppapi/thunk/ppb_zoom_thunk.cc @@ -2,15 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From dev/ppb_zoom_dev.idl modified Thu Apr 18 10:24:21 2013. - #include "ppapi/c/dev/ppb_zoom_dev.h" -#include "ppapi/c/pp_errors.h" -#include "ppapi/shared_impl/tracked_callback.h" +#include "ppapi/thunk/thunk.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_instance_api.h" -#include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" namespace ppapi { namespace thunk { @@ -18,7 +13,6 @@ namespace thunk { namespace { void ZoomChanged(PP_Instance instance, double factor) { - VLOG(4) << "PPB_Zoom_Dev::ZoomChanged()"; EnterInstance enter(instance); if (enter.succeeded()) enter.functions()->ZoomChanged(instance, factor); @@ -27,15 +21,14 @@ void ZoomChanged(PP_Instance instance, double factor) { void ZoomLimitsChanged(PP_Instance instance, double minimum_factor, double maximum_factor) { - VLOG(4) << "PPB_Zoom_Dev::ZoomLimitsChanged()"; EnterInstance enter(instance); - if (enter.succeeded()) + if (enter.succeeded()) { enter.functions()->ZoomLimitsChanged(instance, - minimum_factor, - maximum_factor); + minimum_factor, maximum_factor); + } } -const PPB_Zoom_Dev_0_2 g_ppb_zoom_dev_thunk_0_2 = { +const PPB_Zoom_Dev g_ppb_zoom_thunk = { &ZoomChanged, &ZoomLimitsChanged }; @@ -43,7 +36,7 @@ const PPB_Zoom_Dev_0_2 g_ppb_zoom_dev_thunk_0_2 = { } // namespace const PPB_Zoom_Dev_0_2* GetPPB_Zoom_Dev_0_2_Thunk() { - return &g_ppb_zoom_dev_thunk_0_2; + return &g_ppb_zoom_thunk; } } // namespace thunk |