diff options
author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 18:41:21 +0000 |
---|---|---|
committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 18:41:21 +0000 |
commit | 8f3c5a6530cd4ca2530815202b0d0ab607ac9b7a (patch) | |
tree | f926148bd7f97b222f9f112c602cc8b407631778 | |
parent | a740c8acf1fb1f9bb8d20f8fdf94e9d229e080ce (diff) | |
download | chromium_src-8f3c5a6530cd4ca2530815202b0d0ab607ac9b7a.zip chromium_src-8f3c5a6530cd4ca2530815202b0d0ab607ac9b7a.tar.gz chromium_src-8f3c5a6530cd4ca2530815202b0d0ab607ac9b7a.tar.bz2 |
Ppapi: Autogenerate thunk for PPB_Zoom_Dev.
This also corrects a typo in the argument names for a function.
BUG=
Review URL: https://chromiumcodereview.appspot.com/14087017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195857 0039d316-1c4b-4281-b951-d872f2087c98
-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_dev_thunk.cc (renamed from ppapi/thunk/ppb_zoom_thunk.cc) | 19 |
4 files changed, 19 insertions, 10 deletions
diff --git a/ppapi/api/dev/ppb_zoom_dev.idl b/ppapi/api/dev/ppb_zoom_dev.idl index 874bc8a..8e03bd0 100644 --- a/ppapi/api/dev/ppb_zoom_dev.idl +++ b/ppapi/api/dev/ppb_zoom_dev.idl @@ -7,6 +7,8 @@ * Implementation of the Zoom interface. */ +[generate_thunk] + label Chrome { M14 = 0.2 }; @@ -29,6 +31,6 @@ interface PPB_Zoom_Dev { */ void ZoomLimitsChanged([in] PP_Instance instance, [in] double_t minimum_factor, - [in] double_t maximium_factor); + [in] double_t maximum_factor); }; diff --git a/ppapi/c/dev/ppb_zoom_dev.h b/ppapi/c/dev/ppb_zoom_dev.h index 7dc9525..e8cf4ce 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 Mar 28 11:07:32 2013. */ +/* From dev/ppb_zoom_dev.idl modified Thu Apr 18 10:24:21 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 maximium_factor); + double maximum_factor); }; typedef struct PPB_Zoom_Dev_0_2 PPB_Zoom_Dev; diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index db87368..58488b0 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_thunk.cc', + 'thunk/ppb_zoom_dev_thunk.cc', 'thunk/thunk.h', ], 'defines': [ diff --git a/ppapi/thunk/ppb_zoom_thunk.cc b/ppapi/thunk/ppb_zoom_dev_thunk.cc index 193e856..ae8492f 100644 --- a/ppapi/thunk/ppb_zoom_thunk.cc +++ b/ppapi/thunk/ppb_zoom_dev_thunk.cc @@ -2,10 +2,15 @@ // 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/thunk/thunk.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/shared_impl/tracked_callback.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 { @@ -13,6 +18,7 @@ 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); @@ -21,14 +27,15 @@ 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 g_ppb_zoom_thunk = { +const PPB_Zoom_Dev_0_2 g_ppb_zoom_dev_thunk_0_2 = { &ZoomChanged, &ZoomLimitsChanged }; @@ -36,7 +43,7 @@ const PPB_Zoom_Dev g_ppb_zoom_thunk = { } // namespace const PPB_Zoom_Dev_0_2* GetPPB_Zoom_Dev_0_2_Thunk() { - return &g_ppb_zoom_thunk; + return &g_ppb_zoom_dev_thunk_0_2; } } // namespace thunk |