| Index: ppapi/generators/test_thunk/simple_thunk.cc
|
| diff --git a/ppapi/generators/test_thunk/simple_thunk.cc b/ppapi/generators/test_thunk/simple_thunk.cc
|
| index 8fc2ba26aba2d8d6331ec9325eec94118dffa302..ed073ae6114b912a7dd6b2098cfd04394f6a2c0e 100644
|
| --- a/ppapi/generators/test_thunk/simple_thunk.cc
|
| +++ b/ppapi/generators/test_thunk/simple_thunk.cc
|
| @@ -1,17 +1,15 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -// From ../test_thunk/simple.idl modified Fri Nov 16 11:26:06 2012.
|
| +// From ../test_thunk/simple.idl modified Fri May 31 10:59:55 2013.
|
|
|
| #include "ppapi/c/../test_thunk/simple.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/ppapi_thunk_export.h"
|
| #include "ppapi/thunk/simple_api.h"
|
| -#include "ppapi/thunk/thunk.h"
|
|
|
| namespace ppapi {
|
| namespace thunk {
|
| @@ -80,44 +78,44 @@ int32_t OnFailure12(PP_Instance instance) {
|
| return enter.functions()->OnFailure12(instance);
|
| }
|
|
|
| -const PPB_Simple_0_5 g_ppb_simple_thunk_0_5 = {
|
| - &Create,
|
| - &IsSimple,
|
| - &PostMessage,
|
| - &DoUint32Instance_0_5,
|
| - &DoUint32Resource,
|
| - &DoUint32ResourceNoErrors
|
| +const PPB_Simple_0_5 g_ppb_simple_thunk_0_5 = { //
|
| + &Create, //
|
| + &IsSimple, //
|
| + &PostMessage, //
|
| + &DoUint32Instance_0_5, //
|
| + &DoUint32Resource, //
|
| + &DoUint32ResourceNoErrors //
|
| };
|
|
|
| -const PPB_Simple_1_0 g_ppb_simple_thunk_1_0 = {
|
| - &Create,
|
| - &IsSimple,
|
| - &DoUint32Instance_0_5,
|
| - &DoUint32Resource,
|
| - &DoUint32ResourceNoErrors,
|
| - &OnFailure12
|
| +const PPB_Simple_1_0 g_ppb_simple_thunk_1_0 = { //
|
| + &Create, //
|
| + &IsSimple, //
|
| + &DoUint32Instance_0_5, //
|
| + &DoUint32Resource, //
|
| + &DoUint32ResourceNoErrors, //
|
| + &OnFailure12 //
|
| };
|
|
|
| -const PPB_Simple_1_5 g_ppb_simple_thunk_1_5 = {
|
| - &Create,
|
| - &IsSimple,
|
| - &DoUint32Instance,
|
| - &DoUint32Resource,
|
| - &DoUint32ResourceNoErrors,
|
| - &OnFailure12
|
| +const PPB_Simple_1_5 g_ppb_simple_thunk_1_5 = { //
|
| + &Create, //
|
| + &IsSimple, //
|
| + &DoUint32Instance, //
|
| + &DoUint32Resource, //
|
| + &DoUint32ResourceNoErrors, //
|
| + &OnFailure12 //
|
| };
|
|
|
| } // namespace
|
|
|
| -const PPB_Simple_0_5* GetPPB_Simple_0_5_Thunk() {
|
| +PPAPI_THUNK_EXPORT const PPB_Simple_0_5* GetPPB_Simple_0_5_Thunk() {
|
| return &g_ppb_simple_thunk_0_5;
|
| }
|
|
|
| -const PPB_Simple_1_0* GetPPB_Simple_1_0_Thunk() {
|
| +PPAPI_THUNK_EXPORT const PPB_Simple_1_0* GetPPB_Simple_1_0_Thunk() {
|
| return &g_ppb_simple_thunk_1_0;
|
| }
|
|
|
| -const PPB_Simple_1_5* GetPPB_Simple_1_5_Thunk() {
|
| +PPAPI_THUNK_EXPORT const PPB_Simple_1_5* GetPPB_Simple_1_5_Thunk() {
|
| return &g_ppb_simple_thunk_1_5;
|
| }
|
|
|
|
|