diff options
313 files changed, 1031 insertions, 939 deletions
diff --git a/native_client_sdk/src/examples/hello_world_c/hello_world_c.c b/native_client_sdk/src/examples/hello_world_c/hello_world_c.c index 23a6441..e62381d 100644 --- a/native_client_sdk/src/examples/hello_world_c/hello_world_c.c +++ b/native_client_sdk/src/examples/hello_world_c/hello_world_c.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Native Client Authors. All rights reserved. +/* Copyright (c) 2012 The Native Client Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -32,8 +32,8 @@ static const char* const kFortyTwoMethodId = "fortyTwo"; static const char kMessageArgumentSeparator = ':'; static const char kNullTerminator = '\0'; -static struct PPB_Messaging* ppb_messaging_interface = NULL; -static struct PPB_Var* ppb_var_interface = NULL; +static PPB_Messaging* ppb_messaging_interface = NULL; +static PPB_Var* ppb_var_interface = NULL; static PP_Module module_id = 0; @@ -249,8 +249,8 @@ PP_EXPORT int32_t PPP_InitializeModule(PP_Module a_module_id, PPB_GetInterface get_browser) { module_id = a_module_id; ppb_messaging_interface = - (struct PPB_Messaging*)(get_browser(PPB_MESSAGING_INTERFACE)); - ppb_var_interface = (struct PPB_Var*)(get_browser(PPB_VAR_INTERFACE)); + (PPB_Messaging*)(get_browser(PPB_MESSAGING_INTERFACE)); + ppb_var_interface = (PPB_Var*)(get_browser(PPB_VAR_INTERFACE)); return PP_OK; } @@ -263,7 +263,7 @@ PP_EXPORT int32_t PPP_InitializeModule(PP_Module a_module_id, */ PP_EXPORT const void* PPP_GetInterface(const char* interface_name) { if (strcmp(interface_name, PPP_INSTANCE_INTERFACE) == 0) { - static struct PPP_Instance instance_interface = { + static PPP_Instance instance_interface = { &Instance_DidCreate, &Instance_DidDestroy, &Instance_DidChangeView, @@ -272,7 +272,7 @@ PP_EXPORT const void* PPP_GetInterface(const char* interface_name) { }; return &instance_interface; } else if (strcmp(interface_name, PPP_MESSAGING_INTERFACE) == 0) { - static struct PPP_Messaging messaging_interface = { + static PPP_Messaging messaging_interface = { &Messaging_HandleMessage }; return &messaging_interface; diff --git a/ppapi/api/dev/pp_cursor_type_dev.idl b/ppapi/api/dev/pp_cursor_type_dev.idl index c89d859..7166c2af 100644 --- a/ppapi/api/dev/pp_cursor_type_dev.idl +++ b/ppapi/api/dev/pp_cursor_type_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/pp_video_capture_dev.idl b/ppapi/api/dev/pp_video_capture_dev.idl index d11ec47..7acee89 100644 --- a/ppapi/api/dev/pp_video_capture_dev.idl +++ b/ppapi/api/dev/pp_video_capture_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/pp_video_dev.idl b/ppapi/api/dev/pp_video_dev.idl index 9c75d66..60f0f51 100644 --- a/ppapi/api/dev/pp_video_dev.idl +++ b/ppapi/api/dev/pp_video_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_audio_input_dev.idl b/ppapi/api/dev/ppb_audio_input_dev.idl index 24543ae..1411d85 100644 --- a/ppapi/api/dev/ppb_audio_input_dev.idl +++ b/ppapi/api/dev/ppb_audio_input_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_buffer_dev.idl b/ppapi/api/dev/ppb_buffer_dev.idl index 9aa980e..0fbc5b8 100644 --- a/ppapi/api/dev/ppb_buffer_dev.idl +++ b/ppapi/api/dev/ppb_buffer_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_console_dev.idl b/ppapi/api/dev/ppb_console_dev.idl index 027d28b..86b7606 100644 --- a/ppapi/api/dev/ppb_console_dev.idl +++ b/ppapi/api/dev/ppb_console_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_cursor_control_dev.idl b/ppapi/api/dev/ppb_cursor_control_dev.idl index 714250a..8f5a107 100644 --- a/ppapi/api/dev/ppb_cursor_control_dev.idl +++ b/ppapi/api/dev/ppb_cursor_control_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_file_chooser_dev.idl b/ppapi/api/dev/ppb_file_chooser_dev.idl index 8d3556a..980df57 100644 --- a/ppapi/api/dev/ppb_file_chooser_dev.idl +++ b/ppapi/api/dev/ppb_file_chooser_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_find_dev.idl b/ppapi/api/dev/ppb_find_dev.idl index 3e10c73..7a91263 100644 --- a/ppapi/api/dev/ppb_find_dev.idl +++ b/ppapi/api/dev/ppb_find_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_font_dev.idl b/ppapi/api/dev/ppb_font_dev.idl index be5bf3f..f951d8d 100644 --- a/ppapi/api/dev/ppb_font_dev.idl +++ b/ppapi/api/dev/ppb_font_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_fullscreen_dev.idl b/ppapi/api/dev/ppb_fullscreen_dev.idl index 8dc8844..22b44f2 100644 --- a/ppapi/api/dev/ppb_fullscreen_dev.idl +++ b/ppapi/api/dev/ppb_fullscreen_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_ime_input_event_dev.idl b/ppapi/api/dev/ppb_ime_input_event_dev.idl index 6f484e2..3e2deba 100644 --- a/ppapi/api/dev/ppb_ime_input_event_dev.idl +++ b/ppapi/api/dev/ppb_ime_input_event_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_memory_dev.idl b/ppapi/api/dev/ppb_memory_dev.idl index 1ed1d0d..e77c1d2 100644 --- a/ppapi/api/dev/ppb_memory_dev.idl +++ b/ppapi/api/dev/ppb_memory_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_scrollbar_dev.idl b/ppapi/api/dev/ppb_scrollbar_dev.idl index 5700f7d..e06711d 100644 --- a/ppapi/api/dev/ppb_scrollbar_dev.idl +++ b/ppapi/api/dev/ppb_scrollbar_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_testing_dev.idl b/ppapi/api/dev/ppb_testing_dev.idl index fa63fce..6c0b22b 100644 --- a/ppapi/api/dev/ppb_testing_dev.idl +++ b/ppapi/api/dev/ppb_testing_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_text_input_dev.idl b/ppapi/api/dev/ppb_text_input_dev.idl index be4065e..fde2574 100644 --- a/ppapi/api/dev/ppb_text_input_dev.idl +++ b/ppapi/api/dev/ppb_text_input_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_transport_dev.idl b/ppapi/api/dev/ppb_transport_dev.idl index 30beb00..24d552e 100644 --- a/ppapi/api/dev/ppb_transport_dev.idl +++ b/ppapi/api/dev/ppb_transport_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_url_util_dev.idl b/ppapi/api/dev/ppb_url_util_dev.idl index cd698e4..0e4b540 100644 --- a/ppapi/api/dev/ppb_url_util_dev.idl +++ b/ppapi/api/dev/ppb_url_util_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_var_array_buffer_dev.idl b/ppapi/api/dev/ppb_var_array_buffer_dev.idl index 9105b11..909ad71 100644 --- a/ppapi/api/dev/ppb_var_array_buffer_dev.idl +++ b/ppapi/api/dev/ppb_var_array_buffer_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_video_capture_dev.idl b/ppapi/api/dev/ppb_video_capture_dev.idl index c60f957..fd79190 100644 --- a/ppapi/api/dev/ppb_video_capture_dev.idl +++ b/ppapi/api/dev/ppb_video_capture_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_video_decoder_dev.idl b/ppapi/api/dev/ppb_video_decoder_dev.idl index 257562e..5b1a94e 100644 --- a/ppapi/api/dev/ppb_video_decoder_dev.idl +++ b/ppapi/api/dev/ppb_video_decoder_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_video_layer_dev.idl b/ppapi/api/dev/ppb_video_layer_dev.idl index 1ec50ec..fb6ccfc 100644 --- a/ppapi/api/dev/ppb_video_layer_dev.idl +++ b/ppapi/api/dev/ppb_video_layer_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_websocket_dev.idl b/ppapi/api/dev/ppb_websocket_dev.idl index cd31296..2354b72 100644 --- a/ppapi/api/dev/ppb_websocket_dev.idl +++ b/ppapi/api/dev/ppb_websocket_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_widget_dev.idl b/ppapi/api/dev/ppb_widget_dev.idl index e7e62d4..dc97c9f 100644 --- a/ppapi/api/dev/ppb_widget_dev.idl +++ b/ppapi/api/dev/ppb_widget_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppb_zoom_dev.idl b/ppapi/api/dev/ppb_zoom_dev.idl index 0e51fc0..5e9514e 100644 --- a/ppapi/api/dev/ppb_zoom_dev.idl +++ b/ppapi/api/dev/ppb_zoom_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppp_printing_dev.idl b/ppapi/api/dev/ppp_printing_dev.idl index 746cf9f..67ed487 100644 --- a/ppapi/api/dev/ppp_printing_dev.idl +++ b/ppapi/api/dev/ppp_printing_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppp_video_decoder_dev.idl b/ppapi/api/dev/ppp_video_decoder_dev.idl index 2f5d4d5..529a7eb 100644 --- a/ppapi/api/dev/ppp_video_decoder_dev.idl +++ b/ppapi/api/dev/ppp_video_decoder_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppp_widget_dev.idl b/ppapi/api/dev/ppp_widget_dev.idl index 41cf89f..18d9ba7c 100644 --- a/ppapi/api/dev/ppp_widget_dev.idl +++ b/ppapi/api/dev/ppp_widget_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/dev/ppp_zoom_dev.idl b/ppapi/api/dev/ppp_zoom_dev.idl index 6c0a343..e8254da 100644 --- a/ppapi/api/dev/ppp_zoom_dev.idl +++ b/ppapi/api/dev/ppp_zoom_dev.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_bool.idl b/ppapi/api/pp_bool.idl index 4eec884..dedb5c6 100644 --- a/ppapi/api/pp_bool.idl +++ b/ppapi/api/pp_bool.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_completion_callback.idl b/ppapi/api/pp_completion_callback.idl index 0b2125c..0dff263 100644 --- a/ppapi/api/pp_completion_callback.idl +++ b/ppapi/api/pp_completion_callback.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_errors.idl b/ppapi/api/pp_errors.idl index bd49081..0f4855d 100644 --- a/ppapi/api/pp_errors.idl +++ b/ppapi/api/pp_errors.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_file_info.idl b/ppapi/api/pp_file_info.idl index dab34abc..b0fa3732 100644 --- a/ppapi/api/pp_file_info.idl +++ b/ppapi/api/pp_file_info.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_graphics_3d.idl b/ppapi/api/pp_graphics_3d.idl index 97c735c..09b0cf6 100644 --- a/ppapi/api/pp_graphics_3d.idl +++ b/ppapi/api/pp_graphics_3d.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_input_event.idl b/ppapi/api/pp_input_event.idl index 1afcac7..f9dc737 100644 --- a/ppapi/api/pp_input_event.idl +++ b/ppapi/api/pp_input_event.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_instance.idl b/ppapi/api/pp_instance.idl index 9fa28ac..569fb25 100644 --- a/ppapi/api/pp_instance.idl +++ b/ppapi/api/pp_instance.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_macros.idl b/ppapi/api/pp_macros.idl index fc6e4ad..9d890b8 100644 --- a/ppapi/api/pp_macros.idl +++ b/ppapi/api/pp_macros.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_module.idl b/ppapi/api/pp_module.idl index 7cb8080..d96d60a 100644 --- a/ppapi/api/pp_module.idl +++ b/ppapi/api/pp_module.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_point.idl b/ppapi/api/pp_point.idl index e3ba570..7be466f 100644 --- a/ppapi/api/pp_point.idl +++ b/ppapi/api/pp_point.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_rect.idl b/ppapi/api/pp_rect.idl index 798cd2d..f342ab0 100644 --- a/ppapi/api/pp_rect.idl +++ b/ppapi/api/pp_rect.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_resource.idl b/ppapi/api/pp_resource.idl index e57fd85..453a00e 100644 --- a/ppapi/api/pp_resource.idl +++ b/ppapi/api/pp_resource.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_size.idl b/ppapi/api/pp_size.idl index dc31438..f289231 100644 --- a/ppapi/api/pp_size.idl +++ b/ppapi/api/pp_size.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_stdint.idl b/ppapi/api/pp_stdint.idl index 5137f90..ca58c9c 100644 --- a/ppapi/api/pp_stdint.idl +++ b/ppapi/api/pp_stdint.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_time.idl b/ppapi/api/pp_time.idl index 05c28d9..02de3ae 100644 --- a/ppapi/api/pp_time.idl +++ b/ppapi/api/pp_time.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/pp_var.idl b/ppapi/api/pp_var.idl index 8a1b05a..c0f6c9e 100644 --- a/ppapi/api/pp_var.idl +++ b/ppapi/api/pp_var.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb.idl b/ppapi/api/ppb.idl index a303127..296a471 100644 --- a/ppapi/api/ppb.idl +++ b/ppapi/api/ppb.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_audio.idl b/ppapi/api/ppb_audio.idl index acd76da..c7001d5 100644 --- a/ppapi/api/ppb_audio.idl +++ b/ppapi/api/ppb_audio.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_audio_config.idl b/ppapi/api/ppb_audio_config.idl index b798e38..2954e6e 100644 --- a/ppapi/api/ppb_audio_config.idl +++ b/ppapi/api/ppb_audio_config.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_core.idl b/ppapi/api/ppb_core.idl index a02d4bf..58bd921 100644 --- a/ppapi/api/ppb_core.idl +++ b/ppapi/api/ppb_core.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_file_io.idl b/ppapi/api/ppb_file_io.idl index d595bdc..a0bcb23 100644 --- a/ppapi/api/ppb_file_io.idl +++ b/ppapi/api/ppb_file_io.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_file_ref.idl b/ppapi/api/ppb_file_ref.idl index 250194f..1265830 100644 --- a/ppapi/api/ppb_file_ref.idl +++ b/ppapi/api/ppb_file_ref.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_file_system.idl b/ppapi/api/ppb_file_system.idl index f221c66..45b4805 100644 --- a/ppapi/api/ppb_file_system.idl +++ b/ppapi/api/ppb_file_system.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_fullscreen.idl b/ppapi/api/ppb_fullscreen.idl index 7ac3daa..2f26418 100644 --- a/ppapi/api/ppb_fullscreen.idl +++ b/ppapi/api/ppb_fullscreen.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_graphics_2d.idl b/ppapi/api/ppb_graphics_2d.idl index 1161b15..34c5aa6 100644 --- a/ppapi/api/ppb_graphics_2d.idl +++ b/ppapi/api/ppb_graphics_2d.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_image_data.idl b/ppapi/api/ppb_image_data.idl index 790be4e..79d78a3 100644 --- a/ppapi/api/ppb_image_data.idl +++ b/ppapi/api/ppb_image_data.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_input_event.idl b/ppapi/api/ppb_input_event.idl index 8061415..03d5d70 100644 --- a/ppapi/api/ppb_input_event.idl +++ b/ppapi/api/ppb_input_event.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_instance.idl b/ppapi/api/ppb_instance.idl index b911f58..2eb34600d 100644 --- a/ppapi/api/ppb_instance.idl +++ b/ppapi/api/ppb_instance.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_messaging.idl b/ppapi/api/ppb_messaging.idl index c37f91a..172bb9c 100644 --- a/ppapi/api/ppb_messaging.idl +++ b/ppapi/api/ppb_messaging.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_mouse_lock.idl b/ppapi/api/ppb_mouse_lock.idl index 52fb581..23e4722 100644 --- a/ppapi/api/ppb_mouse_lock.idl +++ b/ppapi/api/ppb_mouse_lock.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_url_loader.idl b/ppapi/api/ppb_url_loader.idl index d6e9d42..ad31100 100644 --- a/ppapi/api/ppb_url_loader.idl +++ b/ppapi/api/ppb_url_loader.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_url_request_info.idl b/ppapi/api/ppb_url_request_info.idl index 99e6cce..c6baedf 100644 --- a/ppapi/api/ppb_url_request_info.idl +++ b/ppapi/api/ppb_url_request_info.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_url_response_info.idl b/ppapi/api/ppb_url_response_info.idl index a896720..01c7df8 100644 --- a/ppapi/api/ppb_url_response_info.idl +++ b/ppapi/api/ppb_url_response_info.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_var.idl b/ppapi/api/ppb_var.idl index 96b684e..5bc6131 100644 --- a/ppapi/api/ppb_var.idl +++ b/ppapi/api/ppb_var.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppb_view.idl b/ppapi/api/ppb_view.idl index 48a3ef7..f971505 100644 --- a/ppapi/api/ppb_view.idl +++ b/ppapi/api/ppb_view.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppp.idl b/ppapi/api/ppp.idl index 4b9aed6..b26e63f 100644 --- a/ppapi/api/ppp.idl +++ b/ppapi/api/ppp.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppp_input_event.idl b/ppapi/api/ppp_input_event.idl index 59c12bf..a7efb5b 100644 --- a/ppapi/api/ppp_input_event.idl +++ b/ppapi/api/ppp_input_event.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppp_instance.idl b/ppapi/api/ppp_instance.idl index 3a5cfa8..bf6a9ff 100644 --- a/ppapi/api/ppp_instance.idl +++ b/ppapi/api/ppp_instance.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ @@ -231,10 +231,3 @@ interface PPP_Instance { [in] PP_Resource url_loader); }; - -#inline c - -typedef struct PPP_Instance PPP_Instance_1_1; - -#endinl - diff --git a/ppapi/api/ppp_messaging.idl b/ppapi/api/ppp_messaging.idl index af5f66c..6a9f15e 100644 --- a/ppapi/api/ppp_messaging.idl +++ b/ppapi/api/ppp_messaging.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/ppp_mouse_lock.idl b/ppapi/api/ppp_mouse_lock.idl index 21d03f5..f54543b 100644 --- a/ppapi/api/ppp_mouse_lock.idl +++ b/ppapi/api/ppp_mouse_lock.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/finish_writing_these/ppb_flash_file.idl b/ppapi/api/private/finish_writing_these/ppb_flash_file.idl index 6ad1a8a..3fc64a2 100644 --- a/ppapi/api/private/finish_writing_these/ppb_flash_file.idl +++ b/ppapi/api/private/finish_writing_these/ppb_flash_file.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/finish_writing_these/ppb_flash_menu.idl b/ppapi/api/private/finish_writing_these/ppb_flash_menu.idl index df6aa44..85149ad 100644 --- a/ppapi/api/private/finish_writing_these/ppb_flash_menu.idl +++ b/ppapi/api/private/finish_writing_these/ppb_flash_menu.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/finish_writing_these/ppb_nacl_private.idl b/ppapi/api/private/finish_writing_these/ppb_nacl_private.idl index 2642a8e..20e8833 100644 --- a/ppapi/api/private/finish_writing_these/ppb_nacl_private.idl +++ b/ppapi/api/private/finish_writing_these/ppb_nacl_private.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/finish_writing_these/ppb_pdf.idl b/ppapi/api/private/finish_writing_these/ppb_pdf.idl index 3a6094f..b428386 100644 --- a/ppapi/api/private/finish_writing_these/ppb_pdf.idl +++ b/ppapi/api/private/finish_writing_these/ppb_pdf.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/finish_writing_these/ppb_proxy_private.idl b/ppapi/api/private/finish_writing_these/ppb_proxy_private.idl index b455636..f0173eb 100644 --- a/ppapi/api/private/finish_writing_these/ppb_proxy_private.idl +++ b/ppapi/api/private/finish_writing_these/ppb_proxy_private.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/ppb_file_ref_private.idl b/ppapi/api/private/ppb_file_ref_private.idl index 0b0da72..e19e8ec 100644 --- a/ppapi/api/private/ppb_file_ref_private.idl +++ b/ppapi/api/private/ppb_file_ref_private.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/ppb_flash.idl b/ppapi/api/private/ppb_flash.idl index 81960a7..c57b5a4 100644 --- a/ppapi/api/private/ppb_flash.idl +++ b/ppapi/api/private/ppb_flash.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/ppb_flash_clipboard.idl b/ppapi/api/private/ppb_flash_clipboard.idl index e0f0b0d..890a7d4 100644 --- a/ppapi/api/private/ppb_flash_clipboard.idl +++ b/ppapi/api/private/ppb_flash_clipboard.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/ppb_flash_fullscreen.idl b/ppapi/api/private/ppb_flash_fullscreen.idl index 6760fad..b646e8f 100644 --- a/ppapi/api/private/ppb_flash_fullscreen.idl +++ b/ppapi/api/private/ppb_flash_fullscreen.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/ppb_flash_tcp_socket.idl b/ppapi/api/private/ppb_flash_tcp_socket.idl index fae44e1..1ec9ec4 100644 --- a/ppapi/api/private/ppb_flash_tcp_socket.idl +++ b/ppapi/api/private/ppb_flash_tcp_socket.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/ppb_flash_udp_socket.idl b/ppapi/api/private/ppb_flash_udp_socket.idl index 3fd5523..d0906cb 100644 --- a/ppapi/api/private/ppb_flash_udp_socket.idl +++ b/ppapi/api/private/ppb_flash_udp_socket.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/ppb_tcp_socket_private.idl b/ppapi/api/private/ppb_tcp_socket_private.idl index 847df9f..ae5cba2 100644 --- a/ppapi/api/private/ppb_tcp_socket_private.idl +++ b/ppapi/api/private/ppb_tcp_socket_private.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/private/ppb_udp_socket_private.idl b/ppapi/api/private/ppb_udp_socket_private.idl index 82b7c3a..4babbb4 100644 --- a/ppapi/api/private/ppb_udp_socket_private.idl +++ b/ppapi/api/private/ppb_udp_socket_private.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/trusted/ppb_audio_trusted.idl b/ppapi/api/trusted/ppb_audio_trusted.idl index 6cd27f6..c75b97b 100644 --- a/ppapi/api/trusted/ppb_audio_trusted.idl +++ b/ppapi/api/trusted/ppb_audio_trusted.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/trusted/ppb_broker_trusted.idl b/ppapi/api/trusted/ppb_broker_trusted.idl index 4771cbb..54039c4 100644 --- a/ppapi/api/trusted/ppb_broker_trusted.idl +++ b/ppapi/api/trusted/ppb_broker_trusted.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/trusted/ppb_buffer_trusted.idl b/ppapi/api/trusted/ppb_buffer_trusted.idl index 1606928..202ebd2 100644 --- a/ppapi/api/trusted/ppb_buffer_trusted.idl +++ b/ppapi/api/trusted/ppb_buffer_trusted.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/trusted/ppb_file_io_trusted.idl b/ppapi/api/trusted/ppb_file_io_trusted.idl index a3c35e7..1ee03ab 100644 --- a/ppapi/api/trusted/ppb_file_io_trusted.idl +++ b/ppapi/api/trusted/ppb_file_io_trusted.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/trusted/ppb_image_data_trusted.idl b/ppapi/api/trusted/ppb_image_data_trusted.idl index da942df..61e0d7b 100644 --- a/ppapi/api/trusted/ppb_image_data_trusted.idl +++ b/ppapi/api/trusted/ppb_image_data_trusted.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/trusted/ppb_url_loader_trusted.idl b/ppapi/api/trusted/ppb_url_loader_trusted.idl index 89ca4f4..19156f4 100644 --- a/ppapi/api/trusted/ppb_url_loader_trusted.idl +++ b/ppapi/api/trusted/ppb_url_loader_trusted.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/api/trusted/ppp_broker.idl b/ppapi/api/trusted/ppp_broker.idl index 5fac4ad..a9dc4fa 100644 --- a/ppapi/api/trusted/ppp_broker.idl +++ b/ppapi/api/trusted/ppp_broker.idl @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ diff --git a/ppapi/c/dev/pp_video_capture_dev.h b/ppapi/c/dev/pp_video_capture_dev.h index c7b4c40..cb1bb8a 100644 --- a/ppapi/c/dev/pp_video_capture_dev.h +++ b/ppapi/c/dev/pp_video_capture_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/pp_video_capture_dev.idl modified Fri Nov 11 20:19:26 2011. */ +/* From dev/pp_video_capture_dev.idl modified Mon Nov 14 10:36:01 2011. */ #ifndef PPAPI_C_DEV_PP_VIDEO_CAPTURE_DEV_H_ #define PPAPI_C_DEV_PP_VIDEO_CAPTURE_DEV_H_ diff --git a/ppapi/c/dev/pp_video_dev.h b/ppapi/c/dev/pp_video_dev.h index 2342d0e..d13c3e2 100644 --- a/ppapi/c/dev/pp_video_dev.h +++ b/ppapi/c/dev/pp_video_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/pp_video_dev.idl modified Wed Nov 23 13:51:18 2011. */ +/* From dev/pp_video_dev.idl modified Wed Dec 14 18:08:00 2011. */ #ifndef PPAPI_C_DEV_PP_VIDEO_DEV_H_ #define PPAPI_C_DEV_PP_VIDEO_DEV_H_ diff --git a/ppapi/c/dev/ppb_audio_input_dev.h b/ppapi/c/dev/ppb_audio_input_dev.h index 73d9bc5..671f51e 100644 --- a/ppapi/c/dev/ppb_audio_input_dev.h +++ b/ppapi/c/dev/ppb_audio_input_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_audio_input_dev.idl modified Wed Nov 23 09:26:09 2011. */ +/* From dev/ppb_audio_input_dev.idl modified Mon Nov 28 22:30:37 2011. */ #ifndef PPAPI_C_DEV_PPB_AUDIO_INPUT_DEV_H_ #define PPAPI_C_DEV_PPB_AUDIO_INPUT_DEV_H_ @@ -48,7 +48,7 @@ typedef void (*PPB_AudioInput_Callback)(const void* sample_buffer, * The <code>PPB_AudioInput_Dev</code> interface contains pointers to several * functions for handling audio input resources. */ -struct PPB_AudioInput_Dev { +struct PPB_AudioInput_Dev_0_1 { /** * Create is a pointer to a function that creates an audio input resource. * No sound will be captured until StartCapture() is called. @@ -104,6 +104,8 @@ struct PPB_AudioInput_Dev { */ PP_Bool (*StopCapture)(PP_Resource audio_input); }; + +typedef struct PPB_AudioInput_Dev_0_1 PPB_AudioInput_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_buffer_dev.h b/ppapi/c/dev/ppb_buffer_dev.h index 785fc3a..5e05f05 100644 --- a/ppapi/c/dev/ppb_buffer_dev.h +++ b/ppapi/c/dev/ppb_buffer_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_buffer_dev.idl modified Fri Aug 26 13:58:06 2011. */ +/* From dev/ppb_buffer_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPB_BUFFER_DEV_H_ #define PPAPI_C_DEV_PPB_BUFFER_DEV_H_ @@ -27,7 +27,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_Buffer_Dev { +struct PPB_Buffer_Dev_0_4 { /** * Allocates a buffer of the given size in bytes. The return value will have * a non-zero ID on success, or zero on failure. Failure means the module @@ -54,6 +54,8 @@ struct PPB_Buffer_Dev { */ void (*Unmap)(PP_Resource resource); }; + +typedef struct PPB_Buffer_Dev_0_4 PPB_Buffer_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_char_set_dev.h b/ppapi/c/dev/ppb_char_set_dev.h index 26c3b2e..36ab825 100644 --- a/ppapi/c/dev/ppb_char_set_dev.h +++ b/ppapi/c/dev/ppb_char_set_dev.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ @@ -35,7 +35,7 @@ enum PP_CharSet_ConversionError { }; PP_COMPILE_ASSERT_ENUM_SIZE_IN_BYTES(PP_CharSet_ConversionError, 4); -struct PPB_CharSet_Dev { +struct PPB_CharSet_Dev_0_4 { // Converts the UTF-16 string pointed to in |*utf16| to an 8-bit string in the // specified code page. |utf16_len| is measured in UTF-16 units, not bytes. // This value may not be NULL. @@ -80,5 +80,6 @@ struct PPB_CharSet_Dev { struct PP_Var (*GetDefaultCharSet)(PP_Instance instance); }; -#endif /* PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_ */ +typedef struct PPB_CharSet_Dev_0_4 PPB_CharSet_Dev; +#endif /* PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_ */ diff --git a/ppapi/c/dev/ppb_console_dev.h b/ppapi/c/dev/ppb_console_dev.h index 5f30527..68e697e 100644 --- a/ppapi/c/dev/ppb_console_dev.h +++ b/ppapi/c/dev/ppb_console_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_console_dev.idl modified Fri Nov 11 20:17:52 2011. */ +/* From dev/ppb_console_dev.idl modified Mon Nov 14 10:36:01 2011. */ #ifndef PPAPI_C_DEV_PPB_CONSOLE_DEV_H_ #define PPAPI_C_DEV_PPB_CONSOLE_DEV_H_ @@ -42,7 +42,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_LogLevel_Dev, 4); * @addtogroup Interfaces * @{ */ -struct PPB_Console_Dev { +struct PPB_Console_Dev_0_1 { /** * Logs the given message to the JavaScript console associated with the * given plugin instance with the given logging level. The name of the plugin @@ -65,6 +65,8 @@ struct PPB_Console_Dev { struct PP_Var source, struct PP_Var value); }; + +typedef struct PPB_Console_Dev_0_1 PPB_Console_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_crypto_dev.h b/ppapi/c/dev/ppb_crypto_dev.h index 27ef6ac9..732d3dc 100644 --- a/ppapi/c/dev/ppb_crypto_dev.h +++ b/ppapi/c/dev/ppb_crypto_dev.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ @@ -11,7 +11,7 @@ #define PPB_CRYPTO_DEV_INTERFACE_0_1 "PPB_Crypto(Dev);0.1" #define PPB_CRYPTO_DEV_INTERFACE PPB_CRYPTO_DEV_INTERFACE_0_1 -struct PPB_Crypto_Dev { +struct PPB_Crypto_Dev_0_1 { /** * Fills the given buffer with random bytes. This is potentially slow so only * request the amount of data you need. @@ -19,4 +19,6 @@ struct PPB_Crypto_Dev { void (*GetRandomBytes)(char* buffer, uint32_t num_bytes); }; +typedef struct PPB_Crypto_Dev_0_1 PPB_Crypto_Dev; + #endif diff --git a/ppapi/c/dev/ppb_cursor_control_dev.h b/ppapi/c/dev/ppb_cursor_control_dev.h index 4bb3b80..262d5cf 100644 --- a/ppapi/c/dev/ppb_cursor_control_dev.h +++ b/ppapi/c/dev/ppb_cursor_control_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_cursor_control_dev.idl modified Thu Nov 17 14:24:28 2011. */ +/* From dev/ppb_cursor_control_dev.idl modified Fri Nov 18 15:58:00 2011. */ #ifndef PPAPI_C_DEV_PPB_CURSOR_CONTROL_DEV_H_ #define PPAPI_C_DEV_PPB_CURSOR_CONTROL_DEV_H_ @@ -30,7 +30,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_CursorControl_Dev { +struct PPB_CursorControl_Dev_0_4 { /** * Set a cursor. If "type" is PP_CURSORTYPE_CUSTOM, then "custom_image" * must be an ImageData resource containing the cursor and "hot_spot" must @@ -75,6 +75,8 @@ struct PPB_CursorControl_Dev { */ PP_Bool (*CanLockCursor)(PP_Instance instance); }; + +typedef struct PPB_CursorControl_Dev_0_4 PPB_CursorControl_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_directory_reader_dev.h b/ppapi/c/dev/ppb_directory_reader_dev.h index 2a49ee9..78e3c17 100644 --- a/ppapi/c/dev/ppb_directory_reader_dev.h +++ b/ppapi/c/dev/ppb_directory_reader_dev.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ @@ -22,7 +22,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DirectoryEntry_Dev, 8); #define PPB_DIRECTORYREADER_DEV_INTERFACE_0_5 "PPB_DirectoryReader(Dev);0.5" #define PPB_DIRECTORYREADER_DEV_INTERFACE PPB_DIRECTORYREADER_DEV_INTERFACE_0_5 -struct PPB_DirectoryReader_Dev { +struct PPB_DirectoryReader_Dev_0_5 { // Creates a DirectoryReader for the given directory. Upon success, the // corresponding directory is classified as "in use" by the resulting // DirectoryReader object until such time as the DirectoryReader object is @@ -55,4 +55,6 @@ struct PPB_DirectoryReader_Dev { struct PP_CompletionCallback callback); }; +typedef struct PPB_DirectoryReader_Dev_0_5 PPB_DirectoryReader_Dev; + #endif /* PPAPI_C_DEV_PPB_DIRECTORY_READER_DEV_H_ */ diff --git a/ppapi/c/dev/ppb_file_chooser_dev.h b/ppapi/c/dev/ppb_file_chooser_dev.h index a2f575d..a2ef7ce 100644 --- a/ppapi/c/dev/ppb_file_chooser_dev.h +++ b/ppapi/c/dev/ppb_file_chooser_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_file_chooser_dev.idl modified Fri Nov 11 20:18:10 2011. */ +/* From dev/ppb_file_chooser_dev.idl modified Mon Nov 14 10:36:01 2011. */ #ifndef PPAPI_C_DEV_PPB_FILE_CHOOSER_DEV_H_ #define PPAPI_C_DEV_PPB_FILE_CHOOSER_DEV_H_ @@ -52,7 +52,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileChooserMode_Dev, 4); * @addtogroup Interfaces * @{ */ -struct PPB_FileChooser_Dev { +struct PPB_FileChooser_Dev_0_5 { /** * This function creates a file chooser dialog resource. The chooser is * associated with a particular instance, so that it may be positioned on the @@ -115,6 +115,8 @@ struct PPB_FileChooser_Dev { */ PP_Resource (*GetNextChosenFile)(PP_Resource chooser); }; + +typedef struct PPB_FileChooser_Dev_0_5 PPB_FileChooser_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_find_dev.h b/ppapi/c/dev/ppb_find_dev.h index 4cefc9c..203425d 100644 --- a/ppapi/c/dev/ppb_find_dev.h +++ b/ppapi/c/dev/ppb_find_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_find_dev.idl modified Tue Oct 4 08:34:10 2011. */ +/* From dev/ppb_find_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPB_FIND_DEV_H_ #define PPAPI_C_DEV_PPB_FIND_DEV_H_ @@ -26,7 +26,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_Find_Dev { +struct PPB_Find_Dev_0_3 { /** * Updates the number of find results for the current search term. If * there are no matches 0 should be passed in. Only when the plugin has @@ -41,6 +41,8 @@ struct PPB_Find_Dev { */ void (*SelectedFindResultChanged)(PP_Instance instance, int32_t index); }; + +typedef struct PPB_Find_Dev_0_3 PPB_Find_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_font_dev.h b/ppapi/c/dev/ppb_font_dev.h index da5b4c4..6ba36a6 100644 --- a/ppapi/c/dev/ppb_font_dev.h +++ b/ppapi/c/dev/ppb_font_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_font_dev.idl modified Wed Oct 5 19:40:26 2011. */ +/* From dev/ppb_font_dev.idl modified Tue Oct 11 10:01:39 2011. */ #ifndef PPAPI_C_DEV_PPB_FONT_DEV_H_ #define PPAPI_C_DEV_PPB_FONT_DEV_H_ @@ -158,7 +158,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_TextRun_Dev, 24); * @addtogroup Interfaces * @{ */ -struct PPB_Font_Dev { +struct PPB_Font_Dev_0_6 { /** * Returns a list of all available font families on the system. You can use * this list to decide whether to Create() a font. @@ -252,6 +252,8 @@ struct PPB_Font_Dev { const struct PP_TextRun_Dev* text, uint32_t char_offset); }; + +typedef struct PPB_Font_Dev_0_6 PPB_Font_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_fullscreen_dev.h b/ppapi/c/dev/ppb_fullscreen_dev.h index 519b19a..ac718c3 100644 --- a/ppapi/c/dev/ppb_fullscreen_dev.h +++ b/ppapi/c/dev/ppb_fullscreen_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_fullscreen_dev.idl modified Fri Oct 14 05:00:39 2011. */ +/* From dev/ppb_fullscreen_dev.idl modified Fri Oct 14 14:57:50 2011. */ #ifndef PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_ #define PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_ @@ -27,7 +27,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_Fullscreen_Dev { +struct PPB_Fullscreen_Dev_0_5 { /** * Checks whether the plugin instance is currently in fullscreen mode. */ @@ -52,6 +52,8 @@ struct PPB_Fullscreen_Dev { */ PP_Bool (*GetScreenSize)(PP_Instance instance, struct PP_Size* size); }; + +typedef struct PPB_Fullscreen_Dev_0_5 PPB_Fullscreen_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h b/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h index 616f661..8ad0093 100644 --- a/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h +++ b/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -13,7 +13,7 @@ #define PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE \ PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1 -struct PPB_GLESChromiumTextureMapping_Dev { +struct PPB_GLESChromiumTextureMapping_Dev_0_1 { // Maps the sub-image of a texture. 'level', 'xoffset', 'yoffset', 'width', // 'height', 'format' and 'type' correspond to the similarly named parameters // of TexSubImage2D, and define the sub-image region, as well as the format of @@ -41,4 +41,7 @@ struct PPB_GLESChromiumTextureMapping_Dev { void (*UnmapTexSubImage2DCHROMIUM)(PP_Resource context, const void* mem); }; +typedef struct PPB_GLESChromiumTextureMapping_Dev_0_1 + PPB_GLESChromiumTextureMapping_Dev; + #endif // PPAPI_C_DEV_PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_H_ diff --git a/ppapi/c/dev/ppb_ime_input_event_dev.h b/ppapi/c/dev/ppb_ime_input_event_dev.h index 519a301..cb1af78 100644 --- a/ppapi/c/dev/ppb_ime_input_event_dev.h +++ b/ppapi/c/dev/ppb_ime_input_event_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_ime_input_event_dev.idl modified Wed Sep 21 12:31:56 2011. */ +/* From dev/ppb_ime_input_event_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPB_IME_INPUT_EVENT_DEV_H_ #define PPAPI_C_DEV_PPB_IME_INPUT_EVENT_DEV_H_ @@ -27,7 +27,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_IMEInputEvent_Dev { +struct PPB_IMEInputEvent_Dev_0_1 { /** * IsIMEInputEvent() determines if a resource is an IME event. * @@ -100,6 +100,8 @@ struct PPB_IMEInputEvent_Dev { */ void (*GetSelection)(PP_Resource ime_event, uint32_t* start, uint32_t* end); }; + +typedef struct PPB_IMEInputEvent_Dev_0_1 PPB_IMEInputEvent_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_layer_compositor_dev.h b/ppapi/c/dev/ppb_layer_compositor_dev.h index 1d3ee37..a42737c 100644 --- a/ppapi/c/dev/ppb_layer_compositor_dev.h +++ b/ppapi/c/dev/ppb_layer_compositor_dev.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ @@ -23,7 +23,7 @@ // // This also allows each layer to be updated seperately to avoid excessive // compositing. -struct PPB_LayerCompositor_Dev { +struct PPB_LayerCompositor_Dev_0_2 { // Creates a video layer. PP_Resource (*Create)(PP_Instance instance); @@ -75,4 +75,6 @@ struct PPB_LayerCompositor_Dev { struct PP_CompletionCallback callback); }; +typedef struct PPB_LayerCompositor_Dev_0_2 PPB_LayerCompositor_Dev; + #endif /* PPAPI_C_DEV_PPB_LAYER_COMPOSITOR_DEV_H_ */ diff --git a/ppapi/c/dev/ppb_memory_dev.h b/ppapi/c/dev/ppb_memory_dev.h index 56d6bc5..b25a9d1 100644 --- a/ppapi/c/dev/ppb_memory_dev.h +++ b/ppapi/c/dev/ppb_memory_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_memory_dev.idl modified Thu Nov 17 09:45:57 2011. */ +/* From dev/ppb_memory_dev.idl modified Fri Nov 18 15:58:00 2011. */ #ifndef PPAPI_C_DEV_PPB_MEMORY_DEV_H_ #define PPAPI_C_DEV_PPB_MEMORY_DEV_H_ @@ -30,7 +30,7 @@ * management. * */ -struct PPB_Memory_Dev { +struct PPB_Memory_Dev_0_1 { /** * MemAlloc is a pointer to a function that allocate memory. * @@ -47,6 +47,8 @@ struct PPB_Memory_Dev { */ void (*MemFree)(void* ptr); }; + +typedef struct PPB_Memory_Dev_0_1 PPB_Memory_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_scrollbar_dev.h b/ppapi/c/dev/ppb_scrollbar_dev.h index 4187900..860f372 100644 --- a/ppapi/c/dev/ppb_scrollbar_dev.h +++ b/ppapi/c/dev/ppb_scrollbar_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_scrollbar_dev.idl modified Tue Oct 4 08:53:30 2011. */ +/* From dev/ppb_scrollbar_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPB_SCROLLBAR_DEV_H_ #define PPAPI_C_DEV_PPB_SCROLLBAR_DEV_H_ @@ -49,7 +49,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_ScrollBy_Dev, 4); * The interface for a scrollbar. A scrollbar is a widget, so the functions * in PPB_Widget can also be used with scrollbar objects. */ -struct PPB_Scrollbar_Dev { +struct PPB_Scrollbar_Dev_0_5 { /** * Create a new scrollbar. Returns 0 if the instance is invalid. */ @@ -96,6 +96,8 @@ struct PPB_Scrollbar_Dev { PP_ScrollBy_Dev unit, int32_t multiplier); }; + +typedef struct PPB_Scrollbar_Dev_0_5 PPB_Scrollbar_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_testing_dev.h b/ppapi/c/dev/ppb_testing_dev.h index e52eeb2..b0cb80e 100644 --- a/ppapi/c/dev/ppb_testing_dev.h +++ b/ppapi/c/dev/ppb_testing_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_testing_dev.idl modified Fri Dec 16 16:08:07 2011. */ +/* From dev/ppb_testing_dev.idl modified Thu Dec 22 11:02:53 2011. */ #ifndef PPAPI_C_DEV_PPB_TESTING_DEV_H_ #define PPAPI_C_DEV_PPB_TESTING_DEV_H_ @@ -35,7 +35,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_Testing_Dev { +struct PPB_Testing_Dev_0_91 { /** * Reads the bitmap data out of the backing store for the given * DeviceContext2D and into the given image. If the data was successfully @@ -136,6 +136,8 @@ struct PPB_Testing_Dev { uint32_t (*GetLiveVars)(struct PP_Var live_vars[], uint32_t array_size); }; +typedef struct PPB_Testing_Dev_0_91 PPB_Testing_Dev; + struct PPB_Testing_Dev_0_7 { PP_Bool (*ReadImageData)(PP_Resource device_context_2d, PP_Resource image, diff --git a/ppapi/c/dev/ppb_text_input_dev.h b/ppapi/c/dev/ppb_text_input_dev.h index 3eca1a3..286ec34 100644 --- a/ppapi/c/dev/ppb_text_input_dev.h +++ b/ppapi/c/dev/ppb_text_input_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_text_input_dev.idl modified Tue Sep 27 14:34:33 2011. */ +/* From dev/ppb_text_input_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPB_TEXT_INPUT_DEV_H_ #define PPAPI_C_DEV_PPB_TEXT_INPUT_DEV_H_ @@ -66,7 +66,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_TextInput_Type, 4); * to the browser about the text input status of plugins, and functions for * controlling input method editors (IMEs). */ -struct PPB_TextInput_Dev { +struct PPB_TextInput_Dev_0_1 { /** * Informs the browser about the current text input mode of the plugin. * Typical use of this information in the browser is to properly @@ -88,6 +88,8 @@ struct PPB_TextInput_Dev { */ void (*CancelCompositionText)(PP_Instance instance); }; + +typedef struct PPB_TextInput_Dev_0_1 PPB_TextInput_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_transport_dev.h b/ppapi/c/dev/ppb_transport_dev.h index 8363f49..47c4f3c 100644 --- a/ppapi/c/dev/ppb_transport_dev.h +++ b/ppapi/c/dev/ppb_transport_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_transport_dev.idl modified Tue Oct 4 15:52:58 2011. */ +/* From dev/ppb_transport_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPB_TRANSPORT_DEV_H_ #define PPAPI_C_DEV_PPB_TRANSPORT_DEV_H_ @@ -111,7 +111,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_TransportRelayMode, 4); * connect type, protocol * RTT */ -struct PPB_Transport_Dev { +struct PPB_Transport_Dev_0_7 { /** * Creates a new transport object with the specified name using the * specified protocol. @@ -176,6 +176,8 @@ struct PPB_Transport_Dev { */ int32_t (*Close)(PP_Resource transport); }; + +typedef struct PPB_Transport_Dev_0_7 PPB_Transport_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_url_util_dev.h b/ppapi/c/dev/ppb_url_util_dev.h index 26bddf1..78e3b0a 100644 --- a/ppapi/c/dev/ppb_url_util_dev.h +++ b/ppapi/c/dev/ppb_url_util_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_url_util_dev.idl modified Wed Dec 7 17:25:52 2011. */ +/* From dev/ppb_url_util_dev.idl modified Fri Dec 16 17:34:59 2011. */ #ifndef PPAPI_C_DEV_PPB_URL_UTIL_DEV_H_ #define PPAPI_C_DEV_PPB_URL_UTIL_DEV_H_ @@ -77,7 +77,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_URLComponents_Dev, 64); * except for the reference fragment (stuff after the '#') which will be * encoded as UTF-8. */ -struct PPB_URLUtil_Dev { +struct PPB_URLUtil_Dev_0_6 { /* * Canonicalizes the given URL string according to the rules of the host * browser. If the URL is invalid or the var is not a string, this will @@ -164,6 +164,8 @@ struct PPB_URLUtil_Dev { PP_Instance instance, struct PP_URLComponents_Dev* components); }; + +typedef struct PPB_URLUtil_Dev_0_6 PPB_URLUtil_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_var_array_buffer_dev.h b/ppapi/c/dev/ppb_var_array_buffer_dev.h index 49d9e6a..e4daf90 100644 --- a/ppapi/c/dev/ppb_var_array_buffer_dev.h +++ b/ppapi/c/dev/ppb_var_array_buffer_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_var_array_buffer_dev.idl modified Fri Dec 2 16:17:08 2011. */ +/* From dev/ppb_var_array_buffer_dev.idl modified Wed Dec 14 18:08:00 2011. */ #ifndef PPAPI_C_DEV_PPB_VAR_ARRAY_BUFFER_DEV_H_ #define PPAPI_C_DEV_PPB_VAR_ARRAY_BUFFER_DEV_H_ @@ -34,7 +34,7 @@ * these Vars are not part of the embedding page's DOM, and can only be shared * with JavaScript via pp::Instance's PostMessage and HandleMessage functions. */ -struct PPB_VarArrayBuffer_Dev { +struct PPB_VarArrayBuffer_Dev_0_1 { /** * Create a zero-initialized VarArrayBuffer. * @@ -59,6 +59,8 @@ struct PPB_VarArrayBuffer_Dev { */ void* (*Map)(struct PP_Var array); }; + +typedef struct PPB_VarArrayBuffer_Dev_0_1 PPB_VarArrayBuffer_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_video_capture_dev.h b/ppapi/c/dev/ppb_video_capture_dev.h index 6c3beb3..396879c 100644 --- a/ppapi/c/dev/ppb_video_capture_dev.h +++ b/ppapi/c/dev/ppb_video_capture_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_video_capture_dev.idl modified Wed Oct 5 09:11:07 2011. */ +/* From dev/ppb_video_capture_dev.idl modified Tue Oct 11 10:01:39 2011. */ #ifndef PPAPI_C_DEV_PPB_VIDEO_CAPTURE_DEV_H_ #define PPAPI_C_DEV_PPB_VIDEO_CAPTURE_DEV_H_ @@ -53,7 +53,7 @@ * 4:2:0, one byte per pixel, tightly packed (width x height Y values, then * width/2 x height/2 U values, then width/2 x height/2 V values). */ -struct PPB_VideoCapture_Dev { +struct PPB_VideoCapture_Dev_0_1 { /** * Creates a new VideoCapture. */ @@ -97,6 +97,8 @@ struct PPB_VideoCapture_Dev { */ int32_t (*StopCapture)(PP_Resource video_capture); }; + +typedef struct PPB_VideoCapture_Dev_0_1 PPB_VideoCapture_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_video_decoder_dev.h b/ppapi/c/dev/ppb_video_decoder_dev.h index 6e16bb3..fa57fd4 100644 --- a/ppapi/c/dev/ppb_video_decoder_dev.h +++ b/ppapi/c/dev/ppb_video_decoder_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_video_decoder_dev.idl modified Tue Nov 29 11:27:39 2011. */ +/* From dev/ppb_video_decoder_dev.idl modified Wed Dec 14 18:08:00 2011. */ #ifndef PPAPI_C_DEV_PPB_VIDEO_DECODER_DEV_H_ #define PPAPI_C_DEV_PPB_VIDEO_DECODER_DEV_H_ @@ -49,7 +49,7 @@ * See PPP_VideoDecoder_Dev for the notifications the decoder may send the * plugin. */ -struct PPB_VideoDecoder_Dev { +struct PPB_VideoDecoder_Dev_0_16 { /** * Creates & initializes a video decoder. * @@ -157,6 +157,8 @@ struct PPB_VideoDecoder_Dev { */ void (*Destroy)(PP_Resource video_decoder); }; + +typedef struct PPB_VideoDecoder_Dev_0_16 PPB_VideoDecoder_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_video_layer_dev.h b/ppapi/c/dev/ppb_video_layer_dev.h index b78ea7e..54798a3 100644 --- a/ppapi/c/dev/ppb_video_layer_dev.h +++ b/ppapi/c/dev/ppb_video_layer_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_video_layer_dev.idl modified Tue Nov 29 11:43:36 2011. */ +/* From dev/ppb_video_layer_dev.idl modified Wed Dec 14 18:08:00 2011. */ #ifndef PPAPI_C_DEV_PPB_VIDEO_LAYER_DEV_H_ #define PPAPI_C_DEV_PPB_VIDEO_LAYER_DEV_H_ @@ -83,7 +83,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoLayerMode_Dev, 4); * In this mode the content of the video layer is updated by a hardware video * decoder. */ -struct PPB_VideoLayer_Dev { +struct PPB_VideoLayer_Dev_0_1 { /** * Creates a video layer. */ @@ -153,6 +153,8 @@ struct PPB_VideoLayer_Dev { uint32_t no_of_planes, const void* planes[]); }; + +typedef struct PPB_VideoLayer_Dev_0_1 PPB_VideoLayer_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_websocket_dev.h b/ppapi/c/dev/ppb_websocket_dev.h index 34bad3b..8cb9ebb 100644 --- a/ppapi/c/dev/ppb_websocket_dev.h +++ b/ppapi/c/dev/ppb_websocket_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_websocket_dev.idl modified Fri Dec 16 14:25:06 2011. */ +/* From dev/ppb_websocket_dev.idl modified Mon Dec 19 19:44:12 2011. */ #ifndef PPAPI_C_DEV_PPB_WEBSOCKET_DEV_H_ #define PPAPI_C_DEV_PPB_WEBSOCKET_DEV_H_ @@ -84,7 +84,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_WebSocketMessageType_Dev, 4); * @addtogroup Interfaces * @{ */ -struct PPB_WebSocket_Dev { +struct PPB_WebSocket_Dev_0_1 { /** * Create() creates a WebSocket instance. * @@ -322,6 +322,8 @@ struct PPB_WebSocket_Dev { */ struct PP_Var (*GetURL)(PP_Resource web_socket); }; + +typedef struct PPB_WebSocket_Dev_0_1 PPB_WebSocket_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_widget_dev.h b/ppapi/c/dev/ppb_widget_dev.h index 003bace..3c72934 100644 --- a/ppapi/c/dev/ppb_widget_dev.h +++ b/ppapi/c/dev/ppb_widget_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_widget_dev.idl modified Fri Aug 26 15:18:14 2011. */ +/* From dev/ppb_widget_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPB_WIDGET_DEV_H_ #define PPAPI_C_DEV_PPB_WIDGET_DEV_H_ @@ -32,7 +32,7 @@ /** * The interface for reusing browser widgets. */ -struct PPB_Widget_Dev { +struct PPB_Widget_Dev_0_3 { /** * Returns PP_TRUE if the given resource is a Widget. Returns PP_FALSE if the * resource is invalid or some type other than an Widget. @@ -59,6 +59,8 @@ struct PPB_Widget_Dev { */ void (*SetLocation)(PP_Resource widget, const struct PP_Rect* location); }; + +typedef struct PPB_Widget_Dev_0_3 PPB_Widget_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppb_zoom_dev.h b/ppapi/c/dev/ppb_zoom_dev.h index 299e7e7..f80ec12 100644 --- a/ppapi/c/dev/ppb_zoom_dev.h +++ b/ppapi/c/dev/ppb_zoom_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppb_zoom_dev.idl modified Fri Aug 26 15:06:04 2011. */ +/* From dev/ppb_zoom_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPB_ZOOM_DEV_H_ #define PPAPI_C_DEV_PPB_ZOOM_DEV_H_ @@ -28,7 +28,7 @@ /** * Zoom interface should only apply to those full-page "plugin-document". */ -struct PPB_Zoom_Dev { +struct PPB_Zoom_Dev_0_2 { /** * Informs the browser about the new zoom factor for the plugin (see * ppp_zoom_dev.h for a description of zoom factor). The plugin should only @@ -44,6 +44,8 @@ struct PPB_Zoom_Dev { double minimum_factor, double maximium_factor); }; + +typedef struct PPB_Zoom_Dev_0_2 PPB_Zoom_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppp_printing_dev.h b/ppapi/c/dev/ppp_printing_dev.h index d709b67..2e198a3 100644 --- a/ppapi/c/dev/ppp_printing_dev.h +++ b/ppapi/c/dev/ppp_printing_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppp_printing_dev.idl modified Thu Nov 17 13:26:05 2011. */ +/* From dev/ppp_printing_dev.idl modified Fri Nov 18 15:58:00 2011. */ #ifndef PPAPI_C_DEV_PPP_PRINTING_DEV_H_ #define PPAPI_C_DEV_PPP_PRINTING_DEV_H_ @@ -80,7 +80,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_PrintPageNumberRange_Dev, 8); * @addtogroup Interfaces * @{ */ -struct PPP_Printing_Dev { +struct PPP_Printing_Dev_0_5 { /** * Returns a bit field representing the supported print output formats. For * example, if only Raster and PostScript are supported, @@ -115,6 +115,8 @@ struct PPP_Printing_Dev { */ PP_Bool (*IsScalingDisabled)(PP_Instance instance); }; + +typedef struct PPP_Printing_Dev_0_5 PPP_Printing_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppp_video_decoder_dev.h b/ppapi/c/dev/ppp_video_decoder_dev.h index e3d1d41..8ad59f0 100644 --- a/ppapi/c/dev/ppp_video_decoder_dev.h +++ b/ppapi/c/dev/ppp_video_decoder_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppp_video_decoder_dev.idl modified Wed Oct 5 15:59:17 2011. */ +/* From dev/ppp_video_decoder_dev.idl modified Tue Oct 11 10:01:39 2011. */ #ifndef PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_ #define PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_ @@ -35,7 +35,7 @@ * * See PPB_VideoDecoder_Dev for general usage tips. */ -struct PPP_VideoDecoder_Dev { +struct PPP_VideoDecoder_Dev_0_9 { /** * Callback function to provide buffers for the decoded output pictures. If * succeeds plugin must provide buffers through AssignPictureBuffers function @@ -102,6 +102,8 @@ struct PPP_VideoDecoder_Dev { PP_Resource decoder, PP_VideoDecodeError_Dev error); }; + +typedef struct PPP_VideoDecoder_Dev_0_9 PPP_VideoDecoder_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppp_widget_dev.h b/ppapi/c/dev/ppp_widget_dev.h index d1fd778..883bc1e 100644 --- a/ppapi/c/dev/ppp_widget_dev.h +++ b/ppapi/c/dev/ppp_widget_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppp_widget_dev.idl modified Fri Aug 26 17:59:12 2011. */ +/* From dev/ppp_widget_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPP_WIDGET_DEV_H_ #define PPAPI_C_DEV_PPP_WIDGET_DEV_H_ @@ -32,7 +32,7 @@ /** * The interface for reusing browser widgets. */ -struct PPP_Widget_Dev { +struct PPP_Widget_Dev_0_2 { /** * Informs the instance that the given rectangle needs to be repainted. */ @@ -40,6 +40,8 @@ struct PPP_Widget_Dev { PP_Resource widget, const struct PP_Rect* dirty_rect); }; + +typedef struct PPP_Widget_Dev_0_2 PPP_Widget_Dev; /** * @} */ diff --git a/ppapi/c/dev/ppp_zoom_dev.h b/ppapi/c/dev/ppp_zoom_dev.h index fabf2a6..d70fcdd 100644 --- a/ppapi/c/dev/ppp_zoom_dev.h +++ b/ppapi/c/dev/ppp_zoom_dev.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 dev/ppp_zoom_dev.idl modified Fri Aug 26 15:42:06 2011. */ +/* From dev/ppp_zoom_dev.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_DEV_PPP_ZOOM_DEV_H_ #define PPAPI_C_DEV_PPP_ZOOM_DEV_H_ @@ -29,7 +29,7 @@ /** * Zoom interface should only apply to those full-page "plugin-document". */ -struct PPP_Zoom_Dev { +struct PPP_Zoom_Dev_0_3 { /** * Instruct plug-in to zoom according to the given factor and whether the zoom * only applies to text only. The scale factor is the percentage divided by @@ -37,6 +37,8 @@ struct PPP_Zoom_Dev { */ void (*Zoom)(PP_Instance instance, double factor, PP_Bool text_only); }; + +typedef struct PPP_Zoom_Dev_0_3 PPP_Zoom_Dev; /** * @} */ diff --git a/ppapi/c/pp_completion_callback.h b/ppapi/c/pp_completion_callback.h index d91d75d..911302f 100644 --- a/ppapi/c/pp_completion_callback.h +++ b/ppapi/c/pp_completion_callback.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 pp_completion_callback.idl modified Thu Aug 11 14:45:09 2011. */ +/* From pp_completion_callback.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PP_COMPLETION_CALLBACK_H_ #define PPAPI_C_PP_COMPLETION_CALLBACK_H_ diff --git a/ppapi/c/pp_file_info.h b/ppapi/c/pp_file_info.h index 0b8353d..2f0261b 100644 --- a/ppapi/c/pp_file_info.h +++ b/ppapi/c/pp_file_info.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 pp_file_info.idl modified Fri Nov 11 19:56:09 2011. */ +/* From pp_file_info.idl modified Mon Nov 14 10:36:01 2011. */ #ifndef PPAPI_C_PP_FILE_INFO_H_ #define PPAPI_C_PP_FILE_INFO_H_ diff --git a/ppapi/c/pp_input_event.h b/ppapi/c/pp_input_event.h index 351560a..ce81b90 100644 --- a/ppapi/c/pp_input_event.h +++ b/ppapi/c/pp_input_event.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 pp_input_event.idl modified Thu Aug 11 14:47:50 2011. */ +/* From pp_input_event.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PP_INPUT_EVENT_H_ #define PPAPI_C_PP_INPUT_EVENT_H_ diff --git a/ppapi/c/pp_point.h b/ppapi/c/pp_point.h index b0380f2..39dcda9 100644 --- a/ppapi/c/pp_point.h +++ b/ppapi/c/pp_point.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 pp_point.idl modified Wed Aug 10 14:06:40 2011. */ +/* From pp_point.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PP_POINT_H_ #define PPAPI_C_PP_POINT_H_ diff --git a/ppapi/c/pp_rect.h b/ppapi/c/pp_rect.h index 7aa42c1..38825c3 100644 --- a/ppapi/c/pp_rect.h +++ b/ppapi/c/pp_rect.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 pp_rect.idl modified Sat Jul 16 16:50:26 2011. */ +/* From pp_rect.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PP_RECT_H_ #define PPAPI_C_PP_RECT_H_ diff --git a/ppapi/c/pp_size.h b/ppapi/c/pp_size.h index a1d2a01..117369c 100644 --- a/ppapi/c/pp_size.h +++ b/ppapi/c/pp_size.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 pp_size.idl modified Sat Jul 16 16:50:26 2011. */ +/* From pp_size.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PP_SIZE_H_ #define PPAPI_C_PP_SIZE_H_ diff --git a/ppapi/c/pp_var.h b/ppapi/c/pp_var.h index 2b388f6..d67b9b6 100644 --- a/ppapi/c/pp_var.h +++ b/ppapi/c/pp_var.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 pp_var.idl modified Fri Dec 2 16:45:08 2011. */ +/* From pp_var.idl modified Wed Dec 14 18:08:00 2011. */ #ifndef PPAPI_C_PP_VAR_H_ #define PPAPI_C_PP_VAR_H_ diff --git a/ppapi/c/ppb_audio.h b/ppapi/c/ppb_audio.h index 237687b..2600d9e 100644 --- a/ppapi/c/ppb_audio.h +++ b/ppapi/c/ppb_audio.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_audio.idl modified Mon Aug 29 10:11:34 2011. */ +/* From ppb_audio.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPB_AUDIO_H_ #define PPAPI_C_PPB_AUDIO_H_ @@ -78,7 +78,7 @@ typedef void (*PPB_Audio_Callback)(void* sample_buffer, * ...audio_callback() will now be periodically invoked on a separate thread... * </code> */ -struct PPB_Audio { +struct PPB_Audio_1_0 { /** * Create() creates an audio resource. No sound will be heard until * StartPlayback() is called. The callback is called with the buffer address @@ -156,6 +156,8 @@ struct PPB_Audio { */ PP_Bool (*StopPlayback)(PP_Resource audio); }; + +typedef struct PPB_Audio_1_0 PPB_Audio; /** * @} */ diff --git a/ppapi/c/ppb_audio_config.h b/ppapi/c/ppb_audio_config.h index 8c2157a..777eed4 100644 --- a/ppapi/c/ppb_audio_config.h +++ b/ppapi/c/ppb_audio_config.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_audio_config.idl modified Mon Aug 29 10:11:34 2011. */ +/* From ppb_audio_config.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPB_AUDIO_CONFIG_H_ #define PPAPI_C_PPB_AUDIO_CONFIG_H_ @@ -68,7 +68,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_AudioSampleRate, 4); * <a href="/chrome/nativeclient/docs/audio.html">Pepper * Audio API</a> for information on using this interface. */ -struct PPB_AudioConfig { +struct PPB_AudioConfig_1_0 { /** * CreateStereo16bit() creates a 16 bit audio configuration resource. The * <code>sample_frame_count</code> should be the result of calling @@ -168,6 +168,8 @@ struct PPB_AudioConfig { */ uint32_t (*GetSampleFrameCount)(PP_Resource config); }; + +typedef struct PPB_AudioConfig_1_0 PPB_AudioConfig; /** * @} */ diff --git a/ppapi/c/ppb_core.h b/ppapi/c/ppb_core.h index 0de8485..2bbbcb1 100644 --- a/ppapi/c/ppb_core.h +++ b/ppapi/c/ppb_core.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_core.idl modified Tue Aug 23 11:13:37 2011. */ +/* From ppb_core.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPB_CORE_H_ #define PPAPI_C_PPB_CORE_H_ @@ -35,7 +35,7 @@ * to memory management, time, and threads on the browser. * */ -struct PPB_Core { +struct PPB_Core_1_0 { /** * * AddRefResource() adds a reference to a resource. @@ -109,6 +109,8 @@ struct PPB_Core { */ PP_Bool (*IsMainThread)(); }; + +typedef struct PPB_Core_1_0 PPB_Core; /** * @} */ diff --git a/ppapi/c/ppb_file_io.h b/ppapi/c/ppb_file_io.h index aa028b1..b67c41e 100644 --- a/ppapi/c/ppb_file_io.h +++ b/ppapi/c/ppb_file_io.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_file_io.idl modified Thu Dec 1 10:47:02 2011. */ +/* From ppb_file_io.idl modified Wed Dec 14 18:08:00 2011. */ #ifndef PPAPI_C_PPB_FILE_IO_H_ #define PPAPI_C_PPB_FILE_IO_H_ @@ -73,7 +73,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileOpenFlags, 4); * The <code>PPB_FileIO</code> struct is used to operate on a regular file * (PP_FileType_Regular). */ -struct PPB_FileIO { +struct PPB_FileIO_1_0 { /** * Create() creates a new FileIO object. * @@ -253,6 +253,8 @@ struct PPB_FileIO { */ void (*Close)(PP_Resource file_io); }; + +typedef struct PPB_FileIO_1_0 PPB_FileIO; /** * @} */ diff --git a/ppapi/c/ppb_file_ref.h b/ppapi/c/ppb_file_ref.h index da07f32..d359a7b 100644 --- a/ppapi/c/ppb_file_ref.h +++ b/ppapi/c/ppb_file_ref.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_file_ref.idl modified Wed Aug 24 20:52:42 2011. */ +/* From ppb_file_ref.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPB_FILE_REF_H_ #define PPAPI_C_PPB_FILE_REF_H_ @@ -36,7 +36,7 @@ * a file system. This struct contains a <code>PP_FileSystemType</code> * identifier and a file path string. */ -struct PPB_FileRef { +struct PPB_FileRef_1_0 { /** * Create() creates a weak pointer to a file in the given file system. File * paths are POSIX style. @@ -178,6 +178,8 @@ struct PPB_FileRef { PP_Resource new_file_ref, struct PP_CompletionCallback callback); }; + +typedef struct PPB_FileRef_1_0 PPB_FileRef; /** * @} */ diff --git a/ppapi/c/ppb_file_system.h b/ppapi/c/ppb_file_system.h index 82beea3..2f2c919 100644 --- a/ppapi/c/ppb_file_system.h +++ b/ppapi/c/ppb_file_system.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_file_system.idl modified Mon Aug 29 10:11:34 2011. */ +/* From ppb_file_system.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPB_FILE_SYSTEM_H_ #define PPAPI_C_PPB_FILE_SYSTEM_H_ @@ -33,7 +33,7 @@ * The <code>PPB_FileSystem</code> struct identifies the file system type * associated with a file. */ -struct PPB_FileSystem { +struct PPB_FileSystem_1_0 { /** Create() creates a file system object of the given type. * * @param[in] instance A <code>PP_Instance</code> identifying the instance @@ -87,6 +87,8 @@ struct PPB_FileSystem { */ PP_FileSystemType (*GetType)(PP_Resource file_system); }; + +typedef struct PPB_FileSystem_1_0 PPB_FileSystem; /** * @} */ diff --git a/ppapi/c/ppb_fullscreen.h b/ppapi/c/ppb_fullscreen.h index 72ff98d..7f22f6b 100644 --- a/ppapi/c/ppb_fullscreen.h +++ b/ppapi/c/ppb_fullscreen.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_fullscreen.idl modified Wed Dec 21 11:00:23 2011. */ +/* From ppb_fullscreen.idl modified Wed Dec 21 19:08:34 2011. */ #ifndef PPAPI_C_PPB_FULLSCREEN_H_ #define PPAPI_C_PPB_FULLSCREEN_H_ @@ -33,7 +33,7 @@ * This interface provides a way of checking the current screen mode and * toggling fullscreen mode. */ -struct PPB_Fullscreen { +struct PPB_Fullscreen_1_0 { /** * IsFullscreen() checks whether the module instance is currently in * fullscreen mode. @@ -81,6 +81,8 @@ struct PPB_Fullscreen { */ PP_Bool (*GetScreenSize)(PP_Instance instance, struct PP_Size* size); }; + +typedef struct PPB_Fullscreen_1_0 PPB_Fullscreen; /** * @} */ diff --git a/ppapi/c/ppb_graphics_2d.h b/ppapi/c/ppb_graphics_2d.h index bbacf22..a7b553d 100644 --- a/ppapi/c/ppb_graphics_2d.h +++ b/ppapi/c/ppb_graphics_2d.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_graphics_2d.idl modified Wed Aug 24 20:51:38 2011. */ +/* From ppb_graphics_2d.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPB_GRAPHICS_2D_H_ #define PPAPI_C_PPB_GRAPHICS_2D_H_ @@ -35,7 +35,7 @@ /** * <code>PPB_Graphics2D</code> defines the interface for a 2D graphics context. */ -struct PPB_Graphics2D { +struct PPB_Graphics2D_1_0 { /** * Create() creates a 2D graphics context. The returned graphics context will * not be bound to the module instance on creation (call BindGraphics() on @@ -256,6 +256,8 @@ struct PPB_Graphics2D { int32_t (*Flush)(PP_Resource graphics_2d, struct PP_CompletionCallback callback); }; + +typedef struct PPB_Graphics2D_1_0 PPB_Graphics2D; /** * @} */ diff --git a/ppapi/c/ppb_graphics_3d.h b/ppapi/c/ppb_graphics_3d.h index 6415318..9e8ae099 100644 --- a/ppapi/c/ppb_graphics_3d.h +++ b/ppapi/c/ppb_graphics_3d.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ @@ -32,7 +32,7 @@ #define PPB_GRAPHICS_3D_INTERFACE_1_0 "PPB_Graphics3D;1.0" #define PPB_GRAPHICS_3D_INTERFACE PPB_GRAPHICS_3D_INTERFACE_1_0 -struct PPB_Graphics3D { +struct PPB_Graphics3D_1_0 { /** * Retrieves the maximum supported value for the given attribute. * @@ -218,4 +218,6 @@ struct PPB_Graphics3D { struct PP_CompletionCallback callback); }; +typedef struct PPB_Graphics3D_1_0 PPB_Graphics3D; + #endif /* PPAPI_C_PPB_GRAPHICS_3D_H_ */ diff --git a/ppapi/c/ppb_image_data.h b/ppapi/c/ppb_image_data.h index 982e29d..3e903b2 100644 --- a/ppapi/c/ppb_image_data.h +++ b/ppapi/c/ppb_image_data.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_image_data.idl modified Tue Nov 8 15:46:54 2011. */ +/* From ppb_image_data.idl modified Wed Dec 21 19:08:34 2011. */ #ifndef PPAPI_C_PPB_IMAGE_DATA_H_ #define PPAPI_C_PPB_IMAGE_DATA_H_ @@ -105,7 +105,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ImageDataDesc, 16); * The <code>PPB_ImageData</code> interface contains pointers to several * functions for determining the browser's treatment of image data. */ -struct PPB_ImageData { +struct PPB_ImageData_1_0 { /** * GetNativeImageDataFormat() returns the browser's preferred format for * image data. The browser uses this format internally for painting. Other @@ -195,6 +195,8 @@ struct PPB_ImageData { */ void (*Unmap)(PP_Resource image_data); }; + +typedef struct PPB_ImageData_1_0 PPB_ImageData; /** * @} */ diff --git a/ppapi/c/ppb_input_event.h b/ppapi/c/ppb_input_event.h index af6ad1f..7d94861 100644 --- a/ppapi/c/ppb_input_event.h +++ b/ppapi/c/ppb_input_event.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_input_event.idl modified Wed Nov 2 09:59:40 2011. */ +/* From ppb_input_event.idl modified Mon Nov 14 10:36:01 2011. */ #ifndef PPAPI_C_PPB_INPUT_EVENT_H_ #define PPAPI_C_PPB_INPUT_EVENT_H_ @@ -248,7 +248,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_Class, 4); * The <code>PPB_InputEvent</code> interface contains pointers to several * functions related to generic input events on the browser. */ -struct PPB_InputEvent { +struct PPB_InputEvent_1_0 { /** * RequestInputEvent() requests that input events corresponding to the given * input events are delivered to the instance. @@ -408,11 +408,13 @@ struct PPB_InputEvent { uint32_t (*GetModifiers)(PP_Resource event); }; +typedef struct PPB_InputEvent_1_0 PPB_InputEvent; + /** * The <code>PPB_MouseInputEvent</code> interface contains pointers to several * functions related to mouse input events. */ -struct PPB_MouseInputEvent { +struct PPB_MouseInputEvent_1_1 { /** * Create() creates a mouse input event with the given parameters. Normally * you will get a mouse event passed through the @@ -507,6 +509,8 @@ struct PPB_MouseInputEvent { struct PP_Point (*GetMovement)(PP_Resource mouse_event); }; +typedef struct PPB_MouseInputEvent_1_1 PPB_MouseInputEvent; + struct PPB_MouseInputEvent_1_0 { PP_Resource (*Create)(PP_Instance instance, PP_InputEvent_Type type, @@ -525,7 +529,7 @@ struct PPB_MouseInputEvent_1_0 { * The <code>PPB_WheelIputEvent</code> interface contains pointers to several * functions related to wheel input events. */ -struct PPB_WheelInputEvent { +struct PPB_WheelInputEvent_1_0 { /** * Create() creates a wheel input event with the given parameters. Normally * you will get a wheel event passed through the @@ -629,11 +633,13 @@ struct PPB_WheelInputEvent { PP_Bool (*GetScrollByPage)(PP_Resource wheel_event); }; +typedef struct PPB_WheelInputEvent_1_0 PPB_WheelInputEvent; + /** * The <code>PPB_KeyboardInputEvent</code> interface contains pointers to * several functions related to keyboard input events. */ -struct PPB_KeyboardInputEvent { +struct PPB_KeyboardInputEvent_1_0 { /** * Creates a keyboard input event with the given parameters. Normally you * will get a keyboard event passed through the HandleInputEvent and will not @@ -698,6 +704,8 @@ struct PPB_KeyboardInputEvent { */ struct PP_Var (*GetCharacterText)(PP_Resource character_event); }; + +typedef struct PPB_KeyboardInputEvent_1_0 PPB_KeyboardInputEvent; /** * @} */ diff --git a/ppapi/c/ppb_instance.h b/ppapi/c/ppb_instance.h index 6ad4687..4043396 100644 --- a/ppapi/c/ppb_instance.h +++ b/ppapi/c/ppb_instance.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_instance.idl modified Tue Aug 23 11:25:50 2011. */ +/* From ppb_instance.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPB_INSTANCE_H_ #define PPAPI_C_PPB_INSTANCE_H_ @@ -35,7 +35,7 @@ * The PPB_Instance interface contains pointers to functions * related to the module instance on a web page. */ -struct PPB_Instance { +struct PPB_Instance_1_0 { /** * BindGraphics() binds the given graphics as the current display surface. * The contents of this device is what will be displayed in the instance's @@ -79,6 +79,8 @@ struct PPB_Instance { PP_Bool (*IsFullFrame)(PP_Instance instance); }; +typedef struct PPB_Instance_1_0 PPB_Instance; + struct PPB_Instance_0_5 { struct PP_Var (*GetWindowObject)(PP_Instance instance); struct PP_Var (*GetOwnerElementObject)(PP_Instance instance); diff --git a/ppapi/c/ppb_messaging.h b/ppapi/c/ppb_messaging.h index f12311c..5393f50 100644 --- a/ppapi/c/ppb_messaging.h +++ b/ppapi/c/ppb_messaging.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_messaging.idl modified Mon Aug 29 10:11:34 2011. */ +/* From ppb_messaging.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPB_MESSAGING_H_ #define PPAPI_C_PPB_MESSAGING_H_ @@ -34,7 +34,7 @@ * and is related to sending messages to JavaScript message event listeners on * the DOM element associated with specific module instance. */ -struct PPB_Messaging { +struct PPB_Messaging_1_0 { /** * PostMessage() asynchronously invokes any listeners for message events on * the DOM element for the given module instance. A call to PostMessage() @@ -93,6 +93,8 @@ struct PPB_Messaging { */ void (*PostMessage)(PP_Instance instance, struct PP_Var message); }; + +typedef struct PPB_Messaging_1_0 PPB_Messaging; /** * @} */ diff --git a/ppapi/c/ppb_mouse_lock.h b/ppapi/c/ppb_mouse_lock.h index b04e7a0..d75325e 100644 --- a/ppapi/c/ppb_mouse_lock.h +++ b/ppapi/c/ppb_mouse_lock.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_mouse_lock.idl modified Mon Nov 28 10:59:14 2011. */ +/* From ppb_mouse_lock.idl modified Wed Dec 21 19:08:34 2011. */ #ifndef PPAPI_C_PPB_MOUSE_LOCK_H_ #define PPAPI_C_PPB_MOUSE_LOCK_H_ @@ -34,7 +34,7 @@ * useful for certain classes of applications, especially first-person * perspective 3D applications and 3D modeling software. */ -struct PPB_MouseLock { +struct PPB_MouseLock_1_0 { /** * LockMouse() requests the mouse to be locked. The browser will permit mouse * lock only while the tab is in fullscreen mode. @@ -73,6 +73,8 @@ struct PPB_MouseLock { */ void (*UnlockMouse)(PP_Instance instance); }; + +typedef struct PPB_MouseLock_1_0 PPB_MouseLock; /** * @} */ diff --git a/ppapi/c/ppb_url_loader.h b/ppapi/c/ppb_url_loader.h index 1ee7080..c19cc9d4 100644 --- a/ppapi/c/ppb_url_loader.h +++ b/ppapi/c/ppb_url_loader.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_url_loader.idl modified Mon Aug 29 10:11:34 2011. */ +/* From ppb_url_loader.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPB_URL_LOADER_H_ #define PPAPI_C_PPB_URL_LOADER_H_ @@ -48,7 +48,7 @@ * - Then, access the downloaded file using the GetBodyAsFileRef() function of * the <code>URLResponseInfo</code> returned in step #4. */ -struct PPB_URLLoader { +struct PPB_URLLoader_1_0 { /** * Create() creates a new <code>URLLoader</code> object. The * <code>URLLoader</code> is associated with a particular instance, so that @@ -216,6 +216,8 @@ struct PPB_URLLoader { */ void (*Close)(PP_Resource loader); }; + +typedef struct PPB_URLLoader_1_0 PPB_URLLoader; /** * @} */ diff --git a/ppapi/c/ppb_url_request_info.h b/ppapi/c/ppb_url_request_info.h index d1e9519..fceda5c 100644 --- a/ppapi/c/ppb_url_request_info.h +++ b/ppapi/c/ppb_url_request_info.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_url_request_info.idl modified Fri Nov 11 19:53:07 2011. */ +/* From ppb_url_request_info.idl modified Mon Nov 14 10:36:01 2011. */ #ifndef PPAPI_C_PPB_URL_REQUEST_INFO_H_ #define PPAPI_C_PPB_URL_REQUEST_INFO_H_ @@ -162,7 +162,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLRequestProperty, 4); * <code>PPB_URLLoader</code>. Refer to <code>PPB_URLLoader</code> for further * information. */ -struct PPB_URLRequestInfo { +struct PPB_URLRequestInfo_1_0 { /** * Create() creates a new <code>URLRequestInfo</code> object. * @@ -247,6 +247,8 @@ struct PPB_URLRequestInfo { int64_t number_of_bytes, PP_Time expected_last_modified_time); }; + +typedef struct PPB_URLRequestInfo_1_0 PPB_URLRequestInfo; /** * @} */ diff --git a/ppapi/c/ppb_url_response_info.h b/ppapi/c/ppb_url_response_info.h index 399a13c6..5143ed5 100644 --- a/ppapi/c/ppb_url_response_info.h +++ b/ppapi/c/ppb_url_response_info.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_url_response_info.idl modified Fri Nov 11 19:54:33 2011. */ +/* From ppb_url_response_info.idl modified Mon Nov 14 10:36:01 2011. */ #ifndef PPAPI_C_PPB_URL_RESPONSE_INFO_H_ #define PPAPI_C_PPB_URL_RESPONSE_INFO_H_ @@ -96,7 +96,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLResponseProperty, 4); * examining URL responses. Refer to <code>PPB_URLLoader</code> for further * information. */ -struct PPB_URLResponseInfo { +struct PPB_URLResponseInfo_1_0 { /** * IsURLResponseInfo() determines if a response is a * <code>URLResponseInfo</code>. @@ -139,6 +139,8 @@ struct PPB_URLResponseInfo { */ PP_Resource (*GetBodyAsFileRef)(PP_Resource response); }; + +typedef struct PPB_URLResponseInfo_1_0 PPB_URLResponseInfo; /** * @} */ diff --git a/ppapi/c/ppb_var.h b/ppapi/c/ppb_var.h index 3e6e481..523622d 100644 --- a/ppapi/c/ppb_var.h +++ b/ppapi/c/ppb_var.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_var.idl modified Tue Dec 6 11:26:58 2011. */ +/* From ppb_var.idl modified Wed Dec 14 18:08:00 2011. */ #ifndef PPAPI_C_PPB_VAR_H_ #define PPAPI_C_PPB_VAR_H_ @@ -31,7 +31,7 @@ /** * PPB_Var API */ -struct PPB_Var { +struct PPB_Var_1_1 { /** * AddRef() adds a reference to the given var. If this is not a refcounted * object, this function will do nothing so you can always call it no matter @@ -95,6 +95,8 @@ struct PPB_Var { const char* (*VarToUtf8)(struct PP_Var var, uint32_t* len); }; +typedef struct PPB_Var_1_1 PPB_Var; + struct PPB_Var_1_0 { void (*AddRef)(struct PP_Var var); void (*Release)(struct PP_Var var); diff --git a/ppapi/c/ppb_view.h b/ppapi/c/ppb_view.h index 5c7f5db..9ea7a7b 100644 --- a/ppapi/c/ppb_view.h +++ b/ppapi/c/ppb_view.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppb_view.idl modified Thu Dec 15 10:22:28 2011. */ +/* From ppb_view.idl modified Wed Jan 4 04:40:12 2012. */ #ifndef PPAPI_C_PPB_VIEW_H_ #define PPAPI_C_PPB_VIEW_H_ @@ -37,7 +37,7 @@ * <code>PPB_View</code> objects so you will receive new view information via * <code>PPP_Instance.DidChangeView</code>. */ -struct PPB_View { +struct PPB_View_1_0 { /** * <code>IsView()</code> determines if the given resource is a valid * <code>PPB_View</code> resource. Note that <code>PPB_ViewChanged</code> @@ -146,6 +146,8 @@ struct PPB_View { */ PP_Bool (*GetClipRect)(PP_Resource resource, struct PP_Rect* clip); }; + +typedef struct PPB_View_1_0 PPB_View; /** * @} */ diff --git a/ppapi/c/ppp_input_event.h b/ppapi/c/ppp_input_event.h index 4f07106..76c32b2 100644 --- a/ppapi/c/ppp_input_event.h +++ b/ppapi/c/ppp_input_event.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppp_input_event.idl modified Thu Dec 15 12:44:27 2011. */ +/* From ppp_input_event.idl modified Mon Dec 19 19:44:12 2011. */ #ifndef PPAPI_C_PPP_INPUT_EVENT_H_ #define PPAPI_C_PPP_INPUT_EVENT_H_ @@ -27,7 +27,7 @@ * @addtogroup Interfaces * @{ */ -struct PPP_InputEvent { +struct PPP_InputEvent_0_1 { /** * Function for receiving input events from the browser. * @@ -74,6 +74,8 @@ struct PPP_InputEvent { */ PP_Bool (*HandleInputEvent)(PP_Instance instance, PP_Resource input_event); }; + +typedef struct PPP_InputEvent_0_1 PPP_InputEvent; /** * @} */ diff --git a/ppapi/c/ppp_instance.h b/ppapi/c/ppp_instance.h index 64766e6..61af440 100644 --- a/ppapi/c/ppp_instance.h +++ b/ppapi/c/ppp_instance.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppp_instance.idl modified Thu Dec 15 10:30:21 2011. */ +/* From ppp_instance.idl modified Wed Jan 4 06:11:56 2012. */ #ifndef PPAPI_C_PPP_INSTANCE_H_ #define PPAPI_C_PPP_INSTANCE_H_ @@ -39,7 +39,7 @@ * to handle events such as change of focus or input events (keyboard/mouse) * events. */ -struct PPP_Instance { +struct PPP_Instance_1_1 { /** * DidCreate() is a creation handler that is called when a new instance is * created. This function is called for each instantiation on the page, @@ -166,6 +166,8 @@ struct PPP_Instance { PP_Bool (*HandleDocumentLoad)(PP_Instance instance, PP_Resource url_loader); }; +typedef struct PPP_Instance_1_1 PPP_Instance; + struct PPP_Instance_1_0 { PP_Bool (*DidCreate)(PP_Instance instance, uint32_t argc, @@ -182,8 +184,5 @@ struct PPP_Instance_1_0 { * @} */ - -typedef struct PPP_Instance PPP_Instance_1_1; - #endif /* PPAPI_C_PPP_INSTANCE_H_ */ diff --git a/ppapi/c/ppp_messaging.h b/ppapi/c/ppp_messaging.h index 58f46e7..85ed658 100644 --- a/ppapi/c/ppp_messaging.h +++ b/ppapi/c/ppp_messaging.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppp_messaging.idl modified Mon Aug 29 10:11:34 2011. */ +/* From ppp_messaging.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_PPP_MESSAGING_H_ #define PPAPI_C_PPP_MESSAGING_H_ @@ -35,7 +35,7 @@ * that you must implement to handle postMessage events on the associated * DOM element. */ -struct PPP_Messaging { +struct PPP_Messaging_1_0 { /** * HandleMessage() is a function that the browser calls when PostMessage() * is invoked on the DOM element for the module instance in JavaScript. Note @@ -70,6 +70,8 @@ struct PPP_Messaging { */ void (*HandleMessage)(PP_Instance instance, struct PP_Var message); }; + +typedef struct PPP_Messaging_1_0 PPP_Messaging; /** * @} */ diff --git a/ppapi/c/ppp_mouse_lock.h b/ppapi/c/ppp_mouse_lock.h index 376835a..4c9b2f2 100644 --- a/ppapi/c/ppp_mouse_lock.h +++ b/ppapi/c/ppp_mouse_lock.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 ppp_mouse_lock.idl modified Wed Nov 9 12:07:33 2011. */ +/* From ppp_mouse_lock.idl modified Wed Dec 21 19:08:34 2011. */ #ifndef PPAPI_C_PPP_MOUSE_LOCK_H_ #define PPAPI_C_PPP_MOUSE_LOCK_H_ @@ -31,7 +31,7 @@ * The <code>PPP_MouseLock</code> interface contains a function that you must * implement to receive mouse lock events from the browser. */ -struct PPP_MouseLock { +struct PPP_MouseLock_1_0 { /** * MouseLockLost() is called when the instance loses the mouse lock, such as * when the user presses the ESC key. @@ -41,6 +41,8 @@ struct PPP_MouseLock { */ void (*MouseLockLost)(PP_Instance instance); }; + +typedef struct PPP_MouseLock_1_0 PPP_MouseLock; /** * @} */ diff --git a/ppapi/c/private/ppb_file_ref_private.h b/ppapi/c/private/ppb_file_ref_private.h index 43c1cfe..3f5c463 100644 --- a/ppapi/c/private/ppb_file_ref_private.h +++ b/ppapi/c/private/ppb_file_ref_private.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 private/ppb_file_ref_private.idl modified Mon Dec 12 14:04:17 2011. */ +/* From private/ppb_file_ref_private.idl modified Fri Dec 16 17:34:59 2011. */ #ifndef PPAPI_C_PRIVATE_PPB_FILE_REF_PRIVATE_H_ #define PPAPI_C_PRIVATE_PPB_FILE_REF_PRIVATE_H_ @@ -27,7 +27,7 @@ * @{ */ /* PPB_FileRefPrivate interface */ -struct PPB_FileRefPrivate { +struct PPB_FileRefPrivate_0_1 { /** * GetAbsolutePath() returns the absolute path of the file. * @@ -38,6 +38,8 @@ struct PPB_FileRefPrivate { */ struct PP_Var (*GetAbsolutePath)(PP_Resource file_ref); }; + +typedef struct PPB_FileRefPrivate_0_1 PPB_FileRefPrivate; /** * @} */ diff --git a/ppapi/c/private/ppb_flash.h b/ppapi/c/private/ppb_flash.h index d63b791..d638694 100644 --- a/ppapi/c/private/ppb_flash.h +++ b/ppapi/c/private/ppb_flash.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 private/ppb_flash.idl modified Thu Dec 15 10:30:29 2011. */ +/* From private/ppb_flash.idl modified Mon Dec 19 19:43:03 2011. */ #ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_ #define PPAPI_C_PRIVATE_PPB_FLASH_H_ @@ -38,7 +38,7 @@ * The <code>PPB_Flash</code> interface contains pointers to various functions * that are only needed to support Pepper Flash. */ -struct PPB_Flash { +struct PPB_Flash_12_0 { /** * Sets or clears the rendering hint that the given plugin instance is always * on top of page content. Somewhat more optimized painting can be used in @@ -108,6 +108,8 @@ struct PPB_Flash { */ void (*PreloadFontWin)(const void* logfontw); }; + +typedef struct PPB_Flash_12_0 PPB_Flash; /** * @} */ diff --git a/ppapi/c/private/ppb_flash_clipboard.h b/ppapi/c/private/ppb_flash_clipboard.h index c328525..7b84a27 100644 --- a/ppapi/c/private/ppb_flash_clipboard.h +++ b/ppapi/c/private/ppb_flash_clipboard.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 private/ppb_flash_clipboard.idl modified Wed Nov 23 12:39:42 2011. */ +/* From private/ppb_flash_clipboard.idl modified Wed Dec 14 18:08:00 2011. */ #ifndef PPAPI_C_PRIVATE_PPB_FLASH_CLIPBOARD_H_ #define PPAPI_C_PRIVATE_PPB_FLASH_CLIPBOARD_H_ @@ -72,7 +72,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Flash_Clipboard_Format, 4); * * TODO(viettrungluu): Support more formats (e.g., HTML).... */ -struct PPB_Flash_Clipboard { +struct PPB_Flash_Clipboard_3_0 { /** * Checks whether a given data format is available from the given clipboard. * Returns true if the given format is available from the given clipboard. @@ -94,6 +94,8 @@ struct PPB_Flash_Clipboard { PP_Flash_Clipboard_Type clipboard_type, struct PP_Var text); }; + +typedef struct PPB_Flash_Clipboard_3_0 PPB_Flash_Clipboard; /** * @} */ diff --git a/ppapi/c/private/ppb_flash_fullscreen.h b/ppapi/c/private/ppb_flash_fullscreen.h index 6f84af8..b21a731 100644 --- a/ppapi/c/private/ppb_flash_fullscreen.h +++ b/ppapi/c/private/ppb_flash_fullscreen.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 private/ppb_flash_fullscreen.idl modified Tue Nov 29 11:39:26 2011. */ +/* From private/ppb_flash_fullscreen.idl modified Wed Dec 14 18:08:00 2011. */ #ifndef PPAPI_C_PRIVATE_PPB_FLASH_FULLSCREEN_H_ #define PPAPI_C_PRIVATE_PPB_FLASH_FULLSCREEN_H_ @@ -27,7 +27,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_FlashFullscreen { +struct PPB_FlashFullscreen_0_1 { /** * Checks whether the plugin instance is currently in fullscreen mode. */ @@ -54,6 +54,8 @@ struct PPB_FlashFullscreen { */ PP_Bool (*GetScreenSize)(PP_Instance instance, struct PP_Size* size); }; + +typedef struct PPB_FlashFullscreen_0_1 PPB_FlashFullscreen; /** * @} */ diff --git a/ppapi/c/private/ppb_flash_menu.h b/ppapi/c/private/ppb_flash_menu.h index d7cbf4d..fbdaa12 100644 --- a/ppapi/c/private/ppb_flash_menu.h +++ b/ppapi/c/private/ppb_flash_menu.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,7 +10,8 @@ #include "ppapi/c/pp_point.h" #include "ppapi/c/pp_resource.h" -#define PPB_FLASH_MENU_INTERFACE "PPB_Flash_Menu;0.2" +#define PPB_FLASH_MENU_INTERFACE_0_2 "PPB_Flash_Menu;0.2" +#define PPB_FLASH_MENU_INTERFACE PPB_FLASH_MENU_INTERFACE_0_2 struct PP_CompletionCallback; @@ -37,7 +38,7 @@ struct PP_Flash_Menu { struct PP_Flash_MenuItem* items; }; -struct PPB_Flash_Menu { +struct PPB_Flash_Menu_0_2 { PP_Resource (*Create)(PP_Instance instance_id, const struct PP_Flash_Menu* menu_data); PP_Bool (*IsFlashMenu)(PP_Resource resource_id); @@ -52,4 +53,6 @@ struct PPB_Flash_Menu { struct PP_CompletionCallback callback); }; +typedef struct PPB_Flash_Menu_0_2 PPB_Flash_Menu; + #endif // PPAPI_C_PRIVATE_PPB_FLASH_MENU_H_ diff --git a/ppapi/c/private/ppb_flash_net_connector.h b/ppapi/c/private/ppb_flash_net_connector.h index 675f5be..012acc1 100644 --- a/ppapi/c/private/ppb_flash_net_connector.h +++ b/ppapi/c/private/ppb_flash_net_connector.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -15,7 +15,7 @@ #define PPB_FLASH_NETCONNECTOR_INTERFACE "PPB_Flash_NetConnector;0.2" -struct PPB_Flash_NetConnector { +struct PPB_Flash_NetConnector_0_2 { PP_Resource (*Create)(PP_Instance instance_id); PP_Bool (*IsFlashNetConnector)(PP_Resource resource_id); @@ -40,4 +40,6 @@ struct PPB_Flash_NetConnector { struct PP_CompletionCallback callback); }; +typedef struct PPB_Flash_NetConnector_0_2 PPB_Flash_NetConnector; + #endif // PPAPI_C_PRIVATE_PPB_FLASH_NET_CONNECTOR_H_ diff --git a/ppapi/c/private/ppb_flash_tcp_socket.h b/ppapi/c/private/ppb_flash_tcp_socket.h index 2a6bc19..ee1d620 100644 --- a/ppapi/c/private/ppb_flash_tcp_socket.h +++ b/ppapi/c/private/ppb_flash_tcp_socket.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 private/ppb_flash_tcp_socket.idl modified Wed Nov 9 12:53:35 2011. */ +/* From private/ppb_flash_tcp_socket.idl modified Thu Nov 10 10:21:43 2011. */ #ifndef PPAPI_C_PRIVATE_PPB_FLASH_TCP_SOCKET_H_ #define PPAPI_C_PRIVATE_PPB_FLASH_TCP_SOCKET_H_ @@ -33,7 +33,7 @@ * The <code>PPB_Flash_TCPSocket</code> interface provides TCP socket * operations. */ -struct PPB_Flash_TCPSocket { +struct PPB_Flash_TCPSocket_0_2 { /** * Allocates a TCP socket resource. */ @@ -121,6 +121,8 @@ struct PPB_Flash_TCPSocket { */ void (*Disconnect)(PP_Resource tcp_socket); }; + +typedef struct PPB_Flash_TCPSocket_0_2 PPB_Flash_TCPSocket; /** * @} */ diff --git a/ppapi/c/private/ppb_flash_udp_socket.h b/ppapi/c/private/ppb_flash_udp_socket.h index 504e1b6..b6d0415 100644 --- a/ppapi/c/private/ppb_flash_udp_socket.h +++ b/ppapi/c/private/ppb_flash_udp_socket.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 private/ppb_flash_udp_socket.idl modified Wed Nov 9 12:53:35 2011. */ +/* From private/ppb_flash_udp_socket.idl modified Thu Nov 10 10:21:43 2011. */ #ifndef PPAPI_C_PRIVATE_PPB_FLASH_UDP_SOCKET_H_ #define PPAPI_C_PRIVATE_PPB_FLASH_UDP_SOCKET_H_ @@ -29,7 +29,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_Flash_UDPSocket { +struct PPB_Flash_UDPSocket_0_1 { /** * Creates a UDP socket resource. */ @@ -68,6 +68,8 @@ struct PPB_Flash_UDPSocket { /* Cancels all pending reads and writes, and closes the socket. */ void (*Close)(PP_Resource udp_socket); }; + +typedef struct PPB_Flash_UDPSocket_0_1 PPB_Flash_UDPSocket; /** * @} */ diff --git a/ppapi/c/private/ppb_instance_private.h b/ppapi/c/private/ppb_instance_private.h index 730d909..c3b319db 100644 --- a/ppapi/c/private/ppb_instance_private.h +++ b/ppapi/c/private/ppb_instance_private.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ @@ -8,7 +8,8 @@ #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_var.h" -#define PPB_INSTANCE_PRIVATE_INTERFACE "PPB_Instance_Private;0.1" +#define PPB_INSTANCE_PRIVATE_INTERFACE_0_1 "PPB_Instance_Private;0.1" +#define PPB_INSTANCE_PRIVATE_INTERFACE PPB_INSTANCE_PRIVATE_INTERFACE_0_1 /** * @file @@ -25,7 +26,7 @@ * trusted plugin instances. * */ -struct PPB_Instance_Private { +struct PPB_Instance_Private_0_1 { /** * GetWindowObject is a pointer to a function that determines * the DOM window containing this module instance. @@ -66,9 +67,10 @@ struct PPB_Instance_Private { struct PP_Var script, struct PP_Var* exception); }; + +typedef struct PPB_Instance_Private_0_1 PPB_Instance_Private; /** * @} */ #endif /* PPAPI_C_PRIVATE_PPB_INSTANCE_PRIVATE_H_ */ - diff --git a/ppapi/c/private/ppb_net_address_private.h b/ppapi/c/private/ppb_net_address_private.h index 465cbd3..949cc1c 100644 --- a/ppapi/c/private/ppb_net_address_private.h +++ b/ppapi/c/private/ppb_net_address_private.h @@ -4,7 +4,7 @@ */ /* From private/ppb_net_address_private.idl, - * modified Wed Jan 4 09:10:03 2012. + * modified Wed Jan 4 11:09:00 2012. */ #ifndef PPAPI_C_PRIVATE_PPB_NET_ADDRESS_PRIVATE_H_ @@ -49,7 +49,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_NetAddress_Private, 132); * The <code>PPB_NetAddress_Private</code> interface provides operations on * network addresses. */ -struct PPB_NetAddress_Private { +struct PPB_NetAddress_Private_0_1 { /** * Returns PP_TRUE if the two addresses are equal (host and port). */ @@ -79,6 +79,8 @@ struct PPB_NetAddress_Private { */ void (*GetAnyAddress)(PP_Bool is_ipv6, struct PP_NetAddress_Private* addr); }; + +typedef struct PPB_NetAddress_Private_0_1 PPB_NetAddress_Private; /** * @} */ diff --git a/ppapi/c/private/ppb_tcp_socket_private.h b/ppapi/c/private/ppb_tcp_socket_private.h index 1515698..7cdf591 100644 --- a/ppapi/c/private/ppb_tcp_socket_private.h +++ b/ppapi/c/private/ppb_tcp_socket_private.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 private/ppb_tcp_socket_private.idl modified Wed Nov 9 12:53:35 2011. */ +/* From private/ppb_tcp_socket_private.idl modified Wed Nov 16 15:27:20 2011. */ #ifndef PPAPI_C_PRIVATE_PPB_TCP_SOCKET_PRIVATE_H_ #define PPAPI_C_PRIVATE_PPB_TCP_SOCKET_PRIVATE_H_ @@ -33,7 +33,7 @@ * The <code>PPB_TCPSocket_Private</code> interface provides TCP socket * operations. */ -struct PPB_TCPSocket_Private { +struct PPB_TCPSocket_Private_0_3 { /** * Allocates a TCP socket resource. */ @@ -121,6 +121,8 @@ struct PPB_TCPSocket_Private { */ void (*Disconnect)(PP_Resource tcp_socket); }; + +typedef struct PPB_TCPSocket_Private_0_3 PPB_TCPSocket_Private; /** * @} */ diff --git a/ppapi/c/private/ppb_udp_socket_private.h b/ppapi/c/private/ppb_udp_socket_private.h index 9e6cd48..78722e0 100644 --- a/ppapi/c/private/ppb_udp_socket_private.h +++ b/ppapi/c/private/ppb_udp_socket_private.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 private/ppb_udp_socket_private.idl modified Wed Nov 9 12:53:35 2011. */ +/* From private/ppb_udp_socket_private.idl modified Wed Nov 16 15:27:20 2011. */ #ifndef PPAPI_C_PRIVATE_PPB_UDP_SOCKET_PRIVATE_H_ #define PPAPI_C_PRIVATE_PPB_UDP_SOCKET_PRIVATE_H_ @@ -29,7 +29,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_UDPSocket_Private { +struct PPB_UDPSocket_Private_0_2 { /** * Creates a UDP socket resource. */ @@ -68,6 +68,8 @@ struct PPB_UDPSocket_Private { /* Cancels all pending reads and writes, and closes the socket. */ void (*Close)(PP_Resource udp_socket); }; + +typedef struct PPB_UDPSocket_Private_0_2 PPB_UDPSocket_Private; /** * @} */ diff --git a/ppapi/c/trusted/ppb_audio_input_trusted_dev.h b/ppapi/c/trusted/ppb_audio_input_trusted_dev.h index 9b26938..3d558ea 100644 --- a/ppapi/c/trusted/ppb_audio_input_trusted_dev.h +++ b/ppapi/c/trusted/ppb_audio_input_trusted_dev.h @@ -4,7 +4,7 @@ */ /* From trusted/ppb_audio_input_trusted_dev.idl, - * modified Wed Jan 4 09:11:42 2012. + * modified Wed Jan 4 11:09:00 2012. */ #ifndef PPAPI_C_TRUSTED_PPB_AUDIO_INPUT_TRUSTED_DEV_H_ @@ -37,7 +37,7 @@ * resource; most of the PPB_AudioInput interface is also usable on this * resource. */ -struct PPB_AudioInputTrusted_Dev { +struct PPB_AudioInputTrusted_Dev_0_1 { /** Returns an audio input resource. */ PP_Resource (*CreateTrusted)(PP_Instance instance); /** @@ -62,6 +62,8 @@ struct PPB_AudioInputTrusted_Dev { int* shm_handle, uint32_t* shm_size); }; + +typedef struct PPB_AudioInputTrusted_Dev_0_1 PPB_AudioInputTrusted_Dev; /** * @} */ diff --git a/ppapi/c/trusted/ppb_audio_trusted.h b/ppapi/c/trusted/ppb_audio_trusted.h index 152a850..72416df 100644 --- a/ppapi/c/trusted/ppb_audio_trusted.h +++ b/ppapi/c/trusted/ppb_audio_trusted.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 trusted/ppb_audio_trusted.idl modified Sat Jul 16 16:51:03 2011. */ +/* From trusted/ppb_audio_trusted.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_TRUSTED_PPB_AUDIO_TRUSTED_H_ #define PPAPI_C_TRUSTED_PPB_AUDIO_TRUSTED_H_ @@ -33,7 +33,7 @@ * resource returned is an Audio resource; most of the PPB_Audio * interface is also usable on this resource. */ -struct PPB_AudioTrusted { +struct PPB_AudioTrusted_0_6 { /** Returns an audio resource. */ PP_Resource (*CreateTrusted)(PP_Instance instance); /** @@ -59,6 +59,8 @@ struct PPB_AudioTrusted { int* shm_handle, uint32_t* shm_size); }; + +typedef struct PPB_AudioTrusted_0_6 PPB_AudioTrusted; /** * @} */ diff --git a/ppapi/c/trusted/ppb_broker_trusted.h b/ppapi/c/trusted/ppb_broker_trusted.h index 9acd9cd..44b6118 100644 --- a/ppapi/c/trusted/ppb_broker_trusted.h +++ b/ppapi/c/trusted/ppb_broker_trusted.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 trusted/ppb_broker_trusted.idl modified Sat Jul 16 16:51:03 2011. */ +/* From trusted/ppb_broker_trusted.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_TRUSTED_PPB_BROKER_TRUSTED_H_ #define PPAPI_C_TRUSTED_PPB_BROKER_TRUSTED_H_ @@ -40,7 +40,7 @@ * handle is closed. The handle should be closed before the resource is * released. */ -struct PPB_BrokerTrusted { +struct PPB_BrokerTrusted_0_2 { /** * Returns a trusted broker resource. */ @@ -75,6 +75,8 @@ struct PPB_BrokerTrusted { */ int32_t (*GetHandle)(PP_Resource broker, int32_t* handle); }; + +typedef struct PPB_BrokerTrusted_0_2 PPB_BrokerTrusted; /** * @} */ diff --git a/ppapi/c/trusted/ppb_buffer_trusted.h b/ppapi/c/trusted/ppb_buffer_trusted.h index b81f8d6..b24f340 100644 --- a/ppapi/c/trusted/ppb_buffer_trusted.h +++ b/ppapi/c/trusted/ppb_buffer_trusted.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 trusted/ppb_buffer_trusted.idl modified Fri Jul 15 13:34:45 2011. */ +/* From trusted/ppb_buffer_trusted.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_TRUSTED_PPB_BUFFER_TRUSTED_H_ #define PPAPI_C_TRUSTED_PPB_BUFFER_TRUSTED_H_ @@ -25,7 +25,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_BufferTrusted { +struct PPB_BufferTrusted_0_1 { /** * Returns the internal shared memory pointer associated with the given * Buffer resource. Used for proxying. Returns PP_OK on success, or @@ -35,6 +35,8 @@ struct PPB_BufferTrusted { */ int32_t (*GetSharedMemory)(PP_Resource buffer, int* handle); }; + +typedef struct PPB_BufferTrusted_0_1 PPB_BufferTrusted; /** * @} */ diff --git a/ppapi/c/trusted/ppb_file_chooser_trusted.h b/ppapi/c/trusted/ppb_file_chooser_trusted.h index 8c3c933..85187a7 100644 --- a/ppapi/c/trusted/ppb_file_chooser_trusted.h +++ b/ppapi/c/trusted/ppb_file_chooser_trusted.h @@ -4,7 +4,7 @@ */ /* From trusted/ppb_file_chooser_trusted.idl, - * modified Wed Jan 4 09:12:36 2012. + * modified Wed Jan 4 11:09:00 2012. */ #ifndef PPAPI_C_TRUSTED_PPB_FILE_CHOOSER_TRUSTED_H_ @@ -30,7 +30,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_FileChooserTrusted { +struct PPB_FileChooserTrusted_0_5 { /** * This function displays a previously created file chooser resource as a * dialog box, prompting the user to choose a file or files to open, or a @@ -54,6 +54,8 @@ struct PPB_FileChooserTrusted { struct PP_Var suggested_file_name, struct PP_CompletionCallback callback); }; + +typedef struct PPB_FileChooserTrusted_0_5 PPB_FileChooserTrusted; /** * @} */ diff --git a/ppapi/c/trusted/ppb_file_io_trusted.h b/ppapi/c/trusted/ppb_file_io_trusted.h index 877c157..53953fbd 100644 --- a/ppapi/c/trusted/ppb_file_io_trusted.h +++ b/ppapi/c/trusted/ppb_file_io_trusted.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 trusted/ppb_file_io_trusted.idl modified Mon Jul 18 10:45:10 2011. */ +/* From trusted/ppb_file_io_trusted.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_TRUSTED_PPB_FILE_IO_TRUSTED_H_ #define PPAPI_C_TRUSTED_PPB_FILE_IO_TRUSTED_H_ @@ -28,7 +28,7 @@ * @{ */ /* Available only to trusted implementations. */ -struct PPB_FileIOTrusted { +struct PPB_FileIOTrusted_0_4 { /** * Returns a file descriptor corresponding to the given FileIO object. On * Windows, returns a HANDLE; on all other platforms, returns a POSIX file @@ -61,6 +61,8 @@ struct PPB_FileIOTrusted { int64_t length, struct PP_CompletionCallback callback); }; + +typedef struct PPB_FileIOTrusted_0_4 PPB_FileIOTrusted; /** * @} */ diff --git a/ppapi/c/trusted/ppb_graphics_3d_trusted.h b/ppapi/c/trusted/ppb_graphics_3d_trusted.h index 353b6dd..099ffdc 100644 --- a/ppapi/c/trusted/ppb_graphics_3d_trusted.h +++ b/ppapi/c/trusted/ppb_graphics_3d_trusted.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -51,7 +51,7 @@ struct PP_Graphics3DTrustedState { uint32_t generation; }; -struct PPB_Graphics3DTrusted { +struct PPB_Graphics3DTrusted_1_0 { // Creates a raw Graphics3D resource. A raw Graphics3D is intended to be used // with the trusted interface, through the command buffer (for proxying). PP_Resource (*CreateRaw)(PP_Instance instance_id, @@ -99,5 +99,6 @@ struct PPB_Graphics3DTrusted { int32_t last_known_get); }; -#endif // PPAPI_C_TRUSTED_PPB_GRAPHICS_3D_TRUSTED_H_ +typedef struct PPB_Graphics3DTrusted_1_0 PPB_Graphics3DTrusted; +#endif // PPAPI_C_TRUSTED_PPB_GRAPHICS_3D_TRUSTED_H_ diff --git a/ppapi/c/trusted/ppb_image_data_trusted.h b/ppapi/c/trusted/ppb_image_data_trusted.h index 824fb9e..c6b266c 100644 --- a/ppapi/c/trusted/ppb_image_data_trusted.h +++ b/ppapi/c/trusted/ppb_image_data_trusted.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 trusted/ppb_image_data_trusted.idl modified Sat Jul 16 16:51:03 2011. */ +/* From trusted/ppb_image_data_trusted.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_TRUSTED_PPB_IMAGE_DATA_TRUSTED_H_ #define PPAPI_C_TRUSTED_PPB_IMAGE_DATA_TRUSTED_H_ @@ -26,7 +26,7 @@ * @{ */ /** Trusted interface */ -struct PPB_ImageDataTrusted { +struct PPB_ImageDataTrusted_0_4 { /** * Returns the internal shared memory pointer associated with the given * ImageData resource. Used for proxying. Returns PP_OK on success, or @@ -38,6 +38,8 @@ struct PPB_ImageDataTrusted { int* handle, uint32_t* byte_count); }; + +typedef struct PPB_ImageDataTrusted_0_4 PPB_ImageDataTrusted; /** * @} */ diff --git a/ppapi/c/trusted/ppb_url_loader_trusted.h b/ppapi/c/trusted/ppb_url_loader_trusted.h index 8d1a248..71b21b36 100644 --- a/ppapi/c/trusted/ppb_url_loader_trusted.h +++ b/ppapi/c/trusted/ppb_url_loader_trusted.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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 trusted/ppb_url_loader_trusted.idl modified Sat Jul 16 16:51:03 2011. */ +/* From trusted/ppb_url_loader_trusted.idl modified Wed Oct 5 14:06:02 2011. */ #ifndef PPAPI_C_TRUSTED_PPB_URL_LOADER_TRUSTED_H_ #define PPAPI_C_TRUSTED_PPB_URL_LOADER_TRUSTED_H_ @@ -45,7 +45,7 @@ typedef void (*PP_URLLoaderTrusted_StatusCallback)( * @{ */ /* Available only to trusted implementations. */ -struct PPB_URLLoaderTrusted { +struct PPB_URLLoaderTrusted_0_3 { /** * Grant this URLLoader the capability to make unrestricted cross-origin * requests. @@ -67,6 +67,8 @@ struct PPB_URLLoaderTrusted { void (*RegisterStatusCallback)(PP_Resource loader, PP_URLLoaderTrusted_StatusCallback cb); }; + +typedef struct PPB_URLLoaderTrusted_0_3 PPB_URLLoaderTrusted; /** * @} */ diff --git a/ppapi/examples/2d/graphics_2d_example.c b/ppapi/examples/2d/graphics_2d_example.c index 6a3b12d..20b1631 100644 --- a/ppapi/examples/2d/graphics_2d_example.c +++ b/ppapi/examples/2d/graphics_2d_example.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. */ @@ -22,11 +22,11 @@ PPB_GetInterface g_get_browser_interface = NULL; -const struct PPB_Core* g_core_interface; -const struct PPB_Graphics2D* g_graphics_2d_interface; -const struct PPB_ImageData* g_image_data_interface; -const struct PPB_Instance* g_instance_interface; -const struct PPB_View* g_view_interface; +const PPB_Core* g_core_interface; +const PPB_Graphics2D* g_graphics_2d_interface; +const PPB_ImageData* g_image_data_interface; +const PPB_Instance* g_instance_interface; +const PPB_View* g_view_interface; /* PPP_Instance implementation -----------------------------------------------*/ @@ -167,7 +167,7 @@ PP_Bool Instance_HandleDocumentLoad(PP_Instance pp_instance, return PP_FALSE; } -static struct PPP_Instance instance_interface = { +static PPP_Instance instance_interface = { &Instance_DidCreate, &Instance_DidDestroy, &Instance_DidChangeView, @@ -182,15 +182,15 @@ PP_EXPORT int32_t PPP_InitializeModule(PP_Module module, PPB_GetInterface get_browser_interface) { g_get_browser_interface = get_browser_interface; - g_core_interface = (const struct PPB_Core*) + g_core_interface = (const PPB_Core*) get_browser_interface(PPB_CORE_INTERFACE); - g_instance_interface = (const struct PPB_Instance*) + g_instance_interface = (const PPB_Instance*) get_browser_interface(PPB_INSTANCE_INTERFACE); - g_image_data_interface = (const struct PPB_ImageData*) + g_image_data_interface = (const PPB_ImageData*) get_browser_interface(PPB_IMAGEDATA_INTERFACE); - g_graphics_2d_interface = (const struct PPB_Graphics2D*) + g_graphics_2d_interface = (const PPB_Graphics2D*) get_browser_interface(PPB_GRAPHICS_2D_INTERFACE); - g_view_interface = (const struct PPB_View*) + g_view_interface = (const PPB_View*) get_browser_interface(PPB_VIEW_INTERFACE); if (!g_core_interface || !g_instance_interface || !g_image_data_interface || !g_graphics_2d_interface || !g_view_interface) @@ -207,4 +207,3 @@ PP_EXPORT const void* PPP_GetInterface(const char* interface_name) { return &instance_interface; return NULL; } - diff --git a/ppapi/examples/gles2/gles2.cc b/ppapi/examples/gles2/gles2.cc index 220a6f4..4a1cda1 100644 --- a/ppapi/examples/gles2/gles2.cc +++ b/ppapi/examples/gles2/gles2.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -155,9 +155,9 @@ class GLES2DemoInstance : public pp::Instance, pp::CompletionCallbackFactory<GLES2DemoInstance> callback_factory_; // Unowned pointers. - const struct PPB_Console_Dev* console_if_; - const struct PPB_Core* core_if_; - const struct PPB_OpenGLES2* gles2_if_; + const PPB_Console_Dev* console_if_; + const PPB_Core* core_if_; + const PPB_OpenGLES2* gles2_if_; // Owned data. pp::Graphics3D* context_; @@ -197,11 +197,11 @@ GLES2DemoInstance::GLES2DemoInstance(PP_Instance instance, pp::Module* module) swap_ticks_(0), callback_factory_(this), context_(NULL) { - assert((console_if_ = static_cast<const struct PPB_Console_Dev*>( + assert((console_if_ = static_cast<const PPB_Console_Dev*>( module->GetBrowserInterface(PPB_CONSOLE_DEV_INTERFACE)))); - assert((core_if_ = static_cast<const struct PPB_Core*>( + assert((core_if_ = static_cast<const PPB_Core*>( module->GetBrowserInterface(PPB_CORE_INTERFACE)))); - assert((gles2_if_ = static_cast<const struct PPB_OpenGLES2*>( + assert((gles2_if_ = static_cast<const PPB_OpenGLES2*>( module->GetBrowserInterface(PPB_OPENGLES2_INTERFACE)))); } diff --git a/ppapi/generators/idl_c_proto.py b/ppapi/generators/idl_c_proto.py index 861f86f..fa34b94 100644 --- a/ppapi/generators/idl_c_proto.py +++ b/ppapi/generators/idl_c_proto.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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. @@ -498,9 +498,20 @@ class CGen(object): out = '' build_list = node.GetUniqueReleases(releases) - # Build the most recent one with comments - out = self.DefineStructInternals(node, build_list[-1], - include_version=False, comment=True) + if node.IsA('Interface'): + # Build the most recent one versioned, with comments + out = self.DefineStructInternals(node, build_list[-1], + include_version=True, comment=True) + + # Define an unversioned typedef for the most recent version + out += '\ntypedef struct %s %s;\n' % ( + self.GetStructName(node, build_list[-1], include_version=True), + self.GetStructName(node, build_list[-1], include_version=False)) + else: + # Build the most recent one versioned, with comments + out = self.DefineStructInternals(node, build_list[-1], + include_version=False, comment=True) + # Build the rest without comments and with the version number appended for rel in build_list[0:-1]: diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.h b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.h index 20ef900..37ee753 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -15,6 +15,7 @@ #include "native_client/src/trusted/desc/nacl_desc_invalid.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/ppp.h" +#include "ppapi/c/ppp_input_event.h" #include "ppapi/c/ppp_instance.h" #include "ppapi/c/ppp_messaging.h" @@ -22,8 +23,6 @@ namespace plugin { class Plugin; } -struct PPP_InputEvent; - namespace ppapi_proxy { class BrowserPpp { diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_input_event.h b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_input_event.h index 440f5f9..63f35c6 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_input_event.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_input_event.h @@ -1,6 +1,6 @@ -// Copyright (c) 2011 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. +// Copyright (c) 2012 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. #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_INPUT_EVENT_H_ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_INPUT_EVENT_H_ @@ -12,8 +12,7 @@ #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/ppb_input_event.h" - -struct PPP_InputEvent; +#include "ppapi/c/ppp_input_event.h" namespace ppapi_proxy { diff --git a/ppapi/native_client/src/shared/ppapi_proxy/command_buffer_nacl.h b/ppapi/native_client/src/shared/ppapi_proxy/command_buffer_nacl.h index 20e3836..8806289 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/command_buffer_nacl.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/command_buffer_nacl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,10 +8,9 @@ #include "gpu/command_buffer/common/command_buffer.h" #include "ppapi/c/pp_graphics_3d.h" #include "ppapi/c/pp_resource.h" +#include "ppapi/c/ppb_core.h" #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h" -struct PPB_Core; - // A CommandBuffer proxy implementation that uses trusted PPAPI interface to // access a CommandBuffer. diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_core.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_core.h index 6da2db3..c3f1a19 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_core.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_core.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -6,8 +6,7 @@ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_CORE_H_ #include "native_client/src/include/nacl_macros.h" - -struct PPB_Core; +#include "ppapi/c/ppb_core.h" namespace ppapi_proxy { diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_memory.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_memory.h index fc77028..94db347 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_memory.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_memory.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -6,8 +6,7 @@ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_MEMORY_H_ #include "native_client/src/include/nacl_macros.h" - -struct PPB_Memory_Dev; +#include "ppapi/c/dev/ppb_memory_dev.h" namespace ppapi_proxy { @@ -24,4 +23,3 @@ class PluginMemory { } // namespace ppapi_proxy #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_MEMORY_H_ - diff --git a/ppapi/native_client/src/trusted/plugin/browser_interface.cc b/ppapi/native_client/src/trusted/plugin/browser_interface.cc index e23516d..e9f18ba 100644 --- a/ppapi/native_client/src/trusted/plugin/browser_interface.cc +++ b/ppapi/native_client/src/trusted/plugin/browser_interface.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -45,7 +45,7 @@ void BrowserInterface::AddToConsole(pp::InstancePrivate* instance, const nacl::string& text) { pp::Module* module = pp::Module::Get(); const PPB_Var* var_interface = - static_cast<const struct PPB_Var*>( + static_cast<const PPB_Var*>( module->GetBrowserInterface(PPB_VAR_INTERFACE)); nacl::string prefix_string("NativeClient"); PP_Var prefix = @@ -54,7 +54,7 @@ void BrowserInterface::AddToConsole(pp::InstancePrivate* instance, PP_Var str = var_interface->VarFromUtf8(text.c_str(), static_cast<uint32_t>(text.size())); const PPB_Console_Dev* console_interface = - static_cast<const struct PPB_Console_Dev*>( + static_cast<const PPB_Console_Dev*>( module->GetBrowserInterface(PPB_CONSOLE_DEV_INTERFACE)); console_interface->LogWithSource(instance->pp_instance(), PP_LOGLEVEL_LOG, diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h index c77fdc4..5a8e3b3 100644 --- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h +++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -23,13 +23,13 @@ #include "native_client/src/trusted/plugin/pnacl_resources.h" #include "ppapi/c/pp_file_info.h" +#include "ppapi/c/trusted/ppb_file_io_trusted.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/file_io.h" #include "ppapi/cpp/file_ref.h" #include "ppapi/cpp/file_system.h" struct NaClMutex; -struct PPB_FileIOTrusted; namespace plugin { diff --git a/ppapi/native_client/tests/earth/pepper_c.c b/ppapi/native_client/tests/earth/pepper_c.c index 44e81d9..98d347c 100644 --- a/ppapi/native_client/tests/earth/pepper_c.c +++ b/ppapi/native_client/tests/earth/pepper_c.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The Chromium Authors. All rights reserved. + * Copyright (c) 2012 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. */ @@ -43,11 +43,11 @@ PPB_GetInterface g_get_browser_interface = NULL; * Native Client. */ struct PepperState { - const struct PPB_Core* core_interface; - const struct PPB_Graphics2D* graphics_2d_interface; - const struct PPB_ImageData* image_data_interface; - const struct PPB_Instance* instance_interface; - const struct PPB_View* view_interface; + const PPB_Core* core_interface; + const PPB_Graphics2D* graphics_2d_interface; + const PPB_ImageData* image_data_interface; + const PPB_Instance* instance_interface; + const PPB_View* view_interface; PP_Resource device_context; int32_t which_image; PP_Resource image[NUMBER_OF_IMAGES]; @@ -184,7 +184,7 @@ static PP_Bool Instance_HandleDocumentLoad(PP_Instance pp_instance, return PP_FALSE; } -static struct PPP_Instance instance_interface = { +static PPP_Instance instance_interface = { &Instance_DidCreate, &Instance_DidDestroy, &Instance_DidChangeView, @@ -199,15 +199,15 @@ PP_EXPORT int32_t PPP_InitializeModule(PP_Module module, PPB_GetInterface get_browser_interface) { g_get_browser_interface = get_browser_interface; - g_MyState.core_interface = (const struct PPB_Core*) + g_MyState.core_interface = (const PPB_Core*) get_browser_interface(PPB_CORE_INTERFACE); - g_MyState.instance_interface = (const struct PPB_Instance*) + g_MyState.instance_interface = (const PPB_Instance*) get_browser_interface(PPB_INSTANCE_INTERFACE); - g_MyState.image_data_interface = (const struct PPB_ImageData*) + g_MyState.image_data_interface = (const PPB_ImageData*) get_browser_interface(PPB_IMAGEDATA_INTERFACE); - g_MyState.graphics_2d_interface = (const struct PPB_Graphics2D*) + g_MyState.graphics_2d_interface = (const PPB_Graphics2D*) get_browser_interface(PPB_GRAPHICS_2D_INTERFACE); - g_MyState.view_interface = (const struct PPB_View*) + g_MyState.view_interface = (const PPB_View*) get_browser_interface(PPB_VIEW_INTERFACE); if (!g_MyState.core_interface || !g_MyState.instance_interface || diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_event_replay_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_event_replay_crash.cc index 8d2d910..77c9591 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_event_replay_crash.cc +++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_event_replay_crash.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -47,7 +47,7 @@ PP_Bool HandleDocumentLoad(PP_Instance /*instance*/, PP_Resource /*loader*/) { return PP_FALSE; } -const struct PPP_Instance instance_interface = { +const PPP_Instance instance_interface = { DidCreate, DidDestroy, NULL, // Calling DidChangeView will cause a crash! diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.cc index be2d197..eeea6e6 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.cc +++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -51,7 +51,7 @@ PP_Bool HandleDocumentLoad(PP_Instance /*instance*/, PP_Resource /*loader*/) { return PP_FALSE; } -const struct PPP_Instance instance_interface = { +const PPP_Instance instance_interface = { DidCreate, DidDestroy, DidChangeView, diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.cc index b9f41a7..7603f36 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.cc +++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -51,7 +51,7 @@ PP_Bool HandleDocumentLoad(PP_Instance /*instance*/, PP_Resource /*loader*/) { return PP_FALSE; } -const struct PPP_Instance instance_interface = { +const PPP_Instance instance_interface = { DidCreate, DidDestroy, DidChangeView, diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.cc index 050b251..0eaa8dd 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.cc +++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -53,7 +53,7 @@ PP_Bool HandleDocumentLoad(PP_Instance /*instance*/, PP_Resource /*loader*/) { return PP_FALSE; } -const struct PPP_Instance instance_interface = { +const PPP_Instance instance_interface = { DidCreate, DidDestroy, DidChangeView, diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate.cc index 6e4d153..6d30708 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate.cc +++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -51,7 +51,7 @@ PP_Bool HandleDocumentLoad(PP_Instance /*instance*/, PP_Resource /*loader*/) { return PP_FALSE; } -const struct PPP_Instance instance_interface = { +const PPP_Instance instance_interface = { DidCreate, DidDestroy, DidChangeView, diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.cc index 43f59922..7214838 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.cc +++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -39,7 +39,7 @@ PP_Bool DidCreate(PP_Instance /*instance*/, return PP_FALSE; } -const struct PPP_Instance instance_interface = { +const PPP_Instance instance_interface = { DidCreate, // Normally one is not alowed to register NULLs for functions, but // since DidCreate is going to crash, these will never be called. diff --git a/ppapi/native_client/tests/ppapi_example_audio/audio.cc b/ppapi/native_client/tests/ppapi_example_audio/audio.cc index 3567209..8b2fe25 100644 --- a/ppapi/native_client/tests/ppapi_example_audio/audio.cc +++ b/ppapi/native_client/tests/ppapi_example_audio/audio.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. // @@ -150,11 +150,11 @@ class MyInstance : public pp::Instance { // Note: This is test code and is not normally needed for an application. PPB_GetInterface get_browser_interface = pp::Module::Get()->get_browser_interface(); - const struct PPB_AudioConfig* audio_config_interface = - static_cast<const struct PPB_AudioConfig*>( + const PPB_AudioConfig* audio_config_interface = + static_cast<const PPB_AudioConfig*>( get_browser_interface(PPB_AUDIO_CONFIG_INTERFACE)); - const struct PPB_Audio* audio_interface = - static_cast<const struct PPB_Audio*>( + const PPB_Audio* audio_interface = + static_cast<const PPB_Audio*>( get_browser_interface(PPB_AUDIO_INTERFACE)); PP_Resource audio_config_resource = config_->pp_resource(); PP_Resource audio_resource = audio_->pp_resource(); diff --git a/ppapi/native_client/tests/ppapi_messaging/ppapi_messaging.c b/ppapi/native_client/tests/ppapi_messaging/ppapi_messaging.c index fe151eb..16eef1d 100644 --- a/ppapi/native_client/tests/ppapi_messaging/ppapi_messaging.c +++ b/ppapi/native_client/tests/ppapi_messaging/ppapi_messaging.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The Chromium Authors. All rights reserved. + * Copyright (c) 2012 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. */ @@ -32,14 +32,14 @@ struct MessageInfo { struct PP_Var message; }; -static struct PPB_Var* GetPPB_Var() { - return (struct PPB_Var*)(*get_browser_interface_func)(PPB_VAR_INTERFACE); +static PPB_Var* GetPPB_Var() { + return (PPB_Var*)(*get_browser_interface_func)(PPB_VAR_INTERFACE); } static void SendOnMessageEventCallback(void* data, int32_t result) { struct MessageInfo* message_to_send = (struct MessageInfo*)data; - struct PPB_Messaging* ppb_messaging = - (struct PPB_Messaging*)(*get_browser_interface_func)( + PPB_Messaging* ppb_messaging = + (PPB_Messaging*)(*get_browser_interface_func)( PPB_MESSAGING_INTERFACE); UNREFERENCED_PARAMETER(result); @@ -53,7 +53,7 @@ static void SendOnMessageEventCallback(void* data, int32_t result) { * dereference it. */ if (message_to_send->message.type == PP_VARTYPE_STRING) { - struct PPB_Var* ppb_var = GetPPB_Var(); + PPB_Var* ppb_var = GetPPB_Var(); ppb_var->Release(message_to_send->message); } free(message_to_send); @@ -63,14 +63,14 @@ static void SendOnMessageEventCallback(void* data, int32_t result) { * HandleMessage to ensure that this is all asynchronous. */ void HandleMessage(PP_Instance instance, struct PP_Var message) { - struct PPB_Core* ppb_core = - (struct PPB_Core*)(*get_browser_interface_func)(PPB_CORE_INTERFACE); + PPB_Core* ppb_core = + (PPB_Core*)(*get_browser_interface_func)(PPB_CORE_INTERFACE); struct MessageInfo* message_to_send = malloc(sizeof(struct MessageInfo)); message_to_send->instance = instance; message_to_send->message = message; if (message.type == PP_VARTYPE_STRING) { - struct PPB_Var* ppb_var = GetPPB_Var(); + PPB_Var* ppb_var = GetPPB_Var(); /* If the message is a string, add reference to go with the copy we did * above. */ @@ -131,7 +131,7 @@ PP_EXPORT void PPP_ShutdownModule() { PP_EXPORT const void* PPP_GetInterface(const char* interface_name) { if (0 == strncmp(PPP_INSTANCE_INTERFACE, interface_name, strlen(PPP_INSTANCE_INTERFACE))) { - static struct PPP_Instance instance_interface = { + static PPP_Instance instance_interface = { DidCreate, DidDestroy, DidChangeView, @@ -141,7 +141,7 @@ PP_EXPORT const void* PPP_GetInterface(const char* interface_name) { return &instance_interface; } else if (0 == strncmp(PPP_MESSAGING_INTERFACE, interface_name, strlen(PPP_MESSAGING_INTERFACE))) { - static struct PPP_Messaging messaging_interface = { + static PPP_Messaging messaging_interface = { HandleMessage }; return &messaging_interface; diff --git a/ppapi/native_client/tests/ppapi_simple_tests/audio.cc b/ppapi/native_client/tests/ppapi_simple_tests/audio.cc index 8274f09..759a28a 100644 --- a/ppapi/native_client/tests/ppapi_simple_tests/audio.cc +++ b/ppapi/native_client/tests/ppapi_simple_tests/audio.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. // @@ -77,12 +77,12 @@ class MyInstance : public pp::Instance { PPB_GetInterface get_browser_if = pp::Module::Get()->get_browser_interface(); - const struct PPB_AudioConfig* audio_config_if = - static_cast<const struct PPB_AudioConfig*>( + const PPB_AudioConfig* audio_config_if = + static_cast<const PPB_AudioConfig*>( get_browser_if(PPB_AUDIO_CONFIG_INTERFACE)); - const struct PPB_Audio* audio_if = - static_cast<const struct PPB_Audio*>( + const PPB_Audio* audio_if = + static_cast<const PPB_Audio*>( get_browser_if(PPB_AUDIO_INTERFACE)); CHECK(NULL != audio_config_if); diff --git a/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h b/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h index 8fbf73e..8018de2 100644 --- a/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h +++ b/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. // @@ -8,36 +8,29 @@ #ifndef NATIVE_CLIENT_TESTS_PPAPI_TEST_PPB_TEMPLATE_GET_BROWSER_INTERFACE_H #define NATIVE_CLIENT_TESTS_PPAPI_TEST_PPB_TEMPLATE_GET_BROWSER_INTERFACE_H -// The definition of scrollbar depends on the interface version. -// TODO(brettw) either move all interfaces to this method, or encode all -// versions explicitly in all interfaces. +#include "ppapi/c/ppb_core.h" +#include "ppapi/c/ppb_file_io.h" +#include "ppapi/c/ppb_file_ref.h" +#include "ppapi/c/ppb_file_system.h" +#include "ppapi/c/ppb_fullscreen.h" +#include "ppapi/c/ppb_graphics_2d.h" +#include "ppapi/c/ppb_graphics_3d.h" +#include "ppapi/c/ppb_image_data.h" +#include "ppapi/c/ppb_input_event.h" +#include "ppapi/c/ppb_instance.h" +#include "ppapi/c/ppb_messaging.h" +#include "ppapi/c/ppb_opengles2.h" +#include "ppapi/c/ppb_url_loader.h" +#include "ppapi/c/ppb_url_request_info.h" +#include "ppapi/c/ppb_url_response_info.h" +#include "ppapi/c/ppb_var.h" +#include "ppapi/c/ppb_view.h" +#include "ppapi/c/dev/ppb_cursor_control_dev.h" +#include "ppapi/c/dev/ppb_font_dev.h" +#include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/c/dev/ppb_scrollbar_dev.h" - -struct PPB_Core; -struct PPB_CursorControl_Dev; -struct PPB_FileIO; -struct PPB_FileRef; -struct PPB_FileSystem; -struct PPB_Font_Dev; -struct PPB_Fullscreen; -struct PPB_Graphics2D; -struct PPB_Graphics3D; -struct PPB_ImageData; -struct PPB_InputEvent; -struct PPB_Instance; -struct PPB_KeyboardInputEvent; -struct PPB_Memory_Dev; -struct PPB_Messaging; -struct PPB_MouseInputEvent; -struct PPB_OpenGLES2; -struct PPB_Testing_Dev; -struct PPB_URLLoader; -struct PPB_URLRequestInfo; -struct PPB_URLResponseInfo; -struct PPB_Var; -struct PPB_View; -struct PPB_WheelInputEvent; -struct PPB_Widget_Dev; +#include "ppapi/c/dev/ppb_testing_dev.h" +#include "ppapi/c/dev/ppb_widget_dev.h" // Looks up the interface and returns its pointer or NULL. const void* GetBrowserInterface(const char* interface_name); diff --git a/ppapi/proxy/host_var_serialization_rules.h b/ppapi/proxy/host_var_serialization_rules.h index 70e9a7b..9c4db2e 100644 --- a/ppapi/proxy/host_var_serialization_rules.h +++ b/ppapi/proxy/host_var_serialization_rules.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,10 +9,9 @@ #include "base/basictypes.h" #include "ppapi/c/pp_module.h" +#include "ppapi/c/ppb_var.h" #include "ppapi/proxy/var_serialization_rules.h" -struct PPB_Var; - namespace ppapi { namespace proxy { diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index 436cbc5c..bbba6bb 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -165,12 +165,12 @@ InterfaceList::InterfaceList() { // proxy and the impl and there's no obvious message routing. AddProxy(API_ID_RESOURCE_CREATION, &ResourceCreationProxy::Create); AddProxy(API_ID_PPP_CLASS, &PPP_Class_Proxy::Create); - AddPPB(PPB_CORE_INTERFACE, API_ID_PPB_CORE, + AddPPB(PPB_CORE_INTERFACE_1_0, API_ID_PPB_CORE, PPB_Core_Proxy::GetPPB_Core_Interface()); - AddPPB(PPB_OPENGLES2_INTERFACE, API_ID_NONE, + AddPPB(PPB_OPENGLES2_INTERFACE_1_0, API_ID_NONE, PPB_OpenGLES2_Shared::GetInterface()); - AddPPB(PPB_VAR_INTERFACE, API_ID_NONE, - PPB_Var_Shared::GetVarInterface()); + AddPPB(PPB_VAR_INTERFACE_1_1, API_ID_NONE, + PPB_Var_Shared::GetVarInterface1_1()); AddPPB(PPB_VAR_INTERFACE_1_0, API_ID_NONE, PPB_Var_Shared::GetVarInterface1_0()); @@ -257,14 +257,14 @@ void InterfaceList::AddFlashInterfaces() { AddPPB(PPB_FLASH_INTERFACE_11_0, API_ID_PPB_FLASH, PPB_Flash_Proxy::GetInterface11()); AddPPB(PPB_FLASH_INTERFACE_12_0, API_ID_PPB_FLASH, - PPB_Flash_Proxy::GetInterface12()); + PPB_Flash_Proxy::GetInterface12_0()); AddProxy(API_ID_PPB_FLASH_CLIPBOARD, &ProxyFactory<PPB_Flash_Clipboard_Proxy>); - AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE, API_ID_PPB_FLASH_CLIPBOARD, - thunk::GetPPB_Flash_Clipboard_Thunk()); + AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE_3_0, API_ID_PPB_FLASH_CLIPBOARD, + thunk::GetPPB_Flash_Clipboard_3_0_Thunk()); AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY, API_ID_PPB_FLASH_CLIPBOARD, - thunk::GetPPB_Flash_Clipboard_Thunk()); + thunk::GetPPB_Flash_Clipboard_3_0_Thunk()); AddProxy(API_ID_PPB_FLASH_FILE_FILEREF, &ProxyFactory<PPB_Flash_File_FileRef_Proxy>); @@ -278,18 +278,18 @@ void InterfaceList::AddFlashInterfaces() { PPB_Flash_File_ModuleLocal_Proxy::GetInterface()); AddProxy(API_ID_PPB_FLASH_MENU, &ProxyFactory<PPB_Flash_Menu_Proxy>); - AddPPB(PPB_FLASH_MENU_INTERFACE, API_ID_PPB_FLASH_MENU, - thunk::GetPPB_Flash_Menu_Thunk()); + AddPPB(PPB_FLASH_MENU_INTERFACE_0_2, API_ID_PPB_FLASH_MENU, + thunk::GetPPB_Flash_Menu_0_2_Thunk()); - // Only add PPB because proxy for the this API ID was already added. - AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE, API_ID_PPB_TCPSOCKET_PRIVATE, - thunk::GetPPB_TCPSocket_Private_Thunk()); + // Only add the interface; PPB_TCPSocket_Private provides the API ID's proxy. + AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE_0_2, API_ID_PPB_TCPSOCKET_PRIVATE, + thunk::GetPPB_TCPSocket_Private_0_3_Thunk()); #ifdef ENABLE_FLAPPER_HACKS AddProxy(API_ID_PPB_FLASH_NETCONNECTOR, &ProxyFactory<PPB_Flash_NetConnector_Proxy>); - AddPPB(PPB_FLASH_NETCONNECTOR_INTERFACE, API_ID_PPB_FLASH_NETCONNECTOR, - thunk::GetPPB_Flash_NetConnector_Thunk()); + AddPPB(PPB_FLASH_NETCONNECTOR_INTERFACE_0_2, API_ID_PPB_FLASH_NETCONNECTOR, + thunk::GetPPB_Flash_NetConnector_0_2_Thunk()); #endif } diff --git a/ppapi/proxy/ppb_audio_input_proxy.h b/ppapi/proxy/ppb_audio_input_proxy.h index 6244e55..415cb14 100644 --- a/ppapi/proxy/ppb_audio_input_proxy.h +++ b/ppapi/proxy/ppb_audio_input_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -17,8 +17,6 @@ #include "ppapi/proxy/interface_proxy.h" #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h" -struct PPB_AudioInput_Dev; - namespace ppapi { class HostResource; diff --git a/ppapi/proxy/ppb_audio_proxy.h b/ppapi/proxy/ppb_audio_proxy.h index feee8dc..6ec9b44 100644 --- a/ppapi/proxy/ppb_audio_proxy.h +++ b/ppapi/proxy/ppb_audio_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,16 +12,12 @@ #include "base/sync_socket.h" #include "ipc/ipc_platform_file.h" #include "ppapi/c/pp_instance.h" -#include "ppapi/c/pp_module.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/ppb_audio.h" -#include "ppapi/c/ppb_audio_config.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h" -struct PPB_Audio; - namespace ppapi { class HostResource; diff --git a/ppapi/proxy/ppb_core_proxy.h b/ppapi/proxy/ppb_core_proxy.h index 3e1cfae..a564519 100644 --- a/ppapi/proxy/ppb_core_proxy.h +++ b/ppapi/proxy/ppb_core_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,8 +12,6 @@ #include "ppapi/proxy/interface_proxy.h" #include "ppapi/shared_impl/host_resource.h" -struct PPB_Core; - namespace ppapi { namespace proxy { diff --git a/ppapi/proxy/ppb_file_chooser_proxy.cc b/ppapi/proxy/ppb_file_chooser_proxy.cc index 734fb14..7361835 100644 --- a/ppapi/proxy/ppb_file_chooser_proxy.cc +++ b/ppapi/proxy/ppb_file_chooser_proxy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -171,8 +171,8 @@ PPB_FileChooser_Proxy::~PPB_FileChooser_Proxy() { // static const InterfaceProxy::Info* PPB_FileChooser_Proxy::GetTrustedInfo() { static const Info info = { - thunk::GetPPB_FileChooser_Trusted_Thunk(), - PPB_FILECHOOSER_TRUSTED_INTERFACE, + thunk::GetPPB_FileChooser_Trusted_0_5_Thunk(), + PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5, API_ID_NONE, // FILE_CHOOSER is the canonical one. false, &CreateFileChooserProxy diff --git a/ppapi/proxy/ppb_file_system_proxy.cc b/ppapi/proxy/ppb_file_system_proxy.cc index dea7409..32aff7c 100644 --- a/ppapi/proxy/ppb_file_system_proxy.cc +++ b/ppapi/proxy/ppb_file_system_proxy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -120,8 +120,8 @@ PPB_FileSystem_Proxy::~PPB_FileSystem_Proxy() { const InterfaceProxy::Info* PPB_FileSystem_Proxy::GetInfo() { static const Info info = { - thunk::GetPPB_FileSystem_Thunk(), - PPB_FILESYSTEM_INTERFACE, + thunk::GetPPB_FileSystem_1_0_Thunk(), + PPB_FILESYSTEM_INTERFACE_1_0, API_ID_PPB_FILE_SYSTEM, false, &CreateFileSystemProxy, diff --git a/ppapi/proxy/ppb_flash_clipboard_proxy.h b/ppapi/proxy/ppb_flash_clipboard_proxy.h index c337f82..08db677 100644 --- a/ppapi/proxy/ppb_flash_clipboard_proxy.h +++ b/ppapi/proxy/ppb_flash_clipboard_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,8 +9,6 @@ #include "ppapi/proxy/interface_proxy.h" #include "ppapi/thunk/ppb_flash_clipboard_api.h" -struct PPB_Flash_Clipboard; - namespace ppapi { namespace proxy { diff --git a/ppapi/proxy/ppb_flash_menu_proxy.h b/ppapi/proxy/ppb_flash_menu_proxy.h index 7e72fde..a404141 100644 --- a/ppapi/proxy/ppb_flash_menu_proxy.h +++ b/ppapi/proxy/ppb_flash_menu_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,7 +10,6 @@ struct PP_Flash_Menu; struct PP_Point; -struct PPB_Flash_Menu; namespace ppapi { diff --git a/ppapi/proxy/ppb_flash_net_connector_proxy.h b/ppapi/proxy/ppb_flash_net_connector_proxy.h index 0f24466..db518fa 100644 --- a/ppapi/proxy/ppb_flash_net_connector_proxy.h +++ b/ppapi/proxy/ppb_flash_net_connector_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,8 +12,6 @@ #include "ppapi/proxy/interface_proxy.h" #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h" -struct PPB_Flash_NetConnector; - namespace ppapi { class HostResource; diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc index 97f7711e..19eabcf 100644 --- a/ppapi/proxy/ppb_flash_proxy.cc +++ b/ppapi/proxy/ppb_flash_proxy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -231,7 +231,7 @@ const PPB_Flash_11* PPB_Flash_Proxy::GetInterface11() { } // static -const PPB_Flash* PPB_Flash_Proxy::GetInterface12() { +const PPB_Flash* PPB_Flash_Proxy::GetInterface12_0() { return &flash_interface_12; } diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h index 1939b22..f3453a8 100644 --- a/ppapi/proxy/ppb_flash_proxy.h +++ b/ppapi/proxy/ppb_flash_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -13,12 +13,10 @@ #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_module.h" #include "ppapi/c/pp_time.h" +#include "ppapi/c/private/ppb_flash.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/shared_impl/host_resource.h" -struct PPB_Flash; -struct PPB_Flash_11; - namespace ppapi { struct PPB_URLRequestInfo_Data; @@ -35,7 +33,7 @@ class PPB_Flash_Proxy : public InterfaceProxy { // Returns the corresponding version of the Flash interface pointer. static const PPB_Flash_11* GetInterface11(); - static const PPB_Flash* GetInterface12(); + static const PPB_Flash_12_0* GetInterface12_0(); // InterfaceProxy implementation. virtual bool OnMessageReceived(const IPC::Message& msg); diff --git a/ppapi/proxy/ppb_graphics_2d_proxy.h b/ppapi/proxy/ppb_graphics_2d_proxy.h index 2897595..f4629ba 100644 --- a/ppapi/proxy/ppb_graphics_2d_proxy.h +++ b/ppapi/proxy/ppb_graphics_2d_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,12 +12,12 @@ #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_size.h" #include "ppapi/c/pp_var.h" +#include "ppapi/c/ppb_graphics_2d.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h" #include "ppapi/shared_impl/host_resource.h" -struct PPB_Graphics2D; struct PP_Point; struct PP_Rect; diff --git a/ppapi/proxy/ppb_image_data_proxy.h b/ppapi/proxy/ppb_image_data_proxy.h index 6fd64f6..7890641 100644 --- a/ppapi/proxy/ppb_image_data_proxy.h +++ b/ppapi/proxy/ppb_image_data_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -13,13 +13,13 @@ #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_size.h" #include "ppapi/c/pp_var.h" +#include "ppapi/c/ppb_image_data.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/proxy/serialized_structs.h" #include "ppapi/shared_impl/ppb_image_data_shared.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_image_data_api.h" -struct PPB_ImageData; class TransportDIB; namespace skia { diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index c6f5c27..f8dd8a2 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -53,8 +53,8 @@ PPB_Instance_Proxy::~PPB_Instance_Proxy() { // static const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoPrivate() { static const Info info = { - ppapi::thunk::GetPPB_Instance_Private_Thunk(), - PPB_INSTANCE_PRIVATE_INTERFACE, + ppapi::thunk::GetPPB_Instance_Private_0_1_Thunk(), + PPB_INSTANCE_PRIVATE_INTERFACE_0_1, API_ID_NONE, // 1_0 is the canonical one. false, &CreateInstanceProxy, diff --git a/ppapi/proxy/ppb_testing_proxy.h b/ppapi/proxy/ppb_testing_proxy.h index ffbd73f..c6dd373 100644 --- a/ppapi/proxy/ppb_testing_proxy.h +++ b/ppapi/proxy/ppb_testing_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,11 +8,11 @@ #include "base/basictypes.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" +#include "ppapi/c/dev/ppb_testing_dev.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/shared_impl/host_resource.h" struct PP_Point; -struct PPB_Testing_Dev; namespace ppapi { diff --git a/ppapi/proxy/ppb_url_loader_proxy.cc b/ppapi/proxy/ppb_url_loader_proxy.cc index be51288..a09799b 100644 --- a/ppapi/proxy/ppb_url_loader_proxy.cc +++ b/ppapi/proxy/ppb_url_loader_proxy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -388,8 +388,8 @@ PP_Resource PPB_URLLoader_Proxy::TrackPluginResource( // static const InterfaceProxy::Info* PPB_URLLoader_Proxy::GetTrustedInfo() { static const Info info = { - thunk::GetPPB_URLLoaderTrusted_Thunk(), - PPB_URLLOADERTRUSTED_INTERFACE, + thunk::GetPPB_URLLoaderTrusted_0_3_Thunk(), + PPB_URLLOADERTRUSTED_INTERFACE_0_3, API_ID_NONE, // URL_LOADER is the canonical one. false, &CreateURLLoaderProxy diff --git a/ppapi/proxy/ppb_url_loader_proxy.h b/ppapi/proxy/ppb_url_loader_proxy.h index e13b1a3..ef57fc6 100644 --- a/ppapi/proxy/ppb_url_loader_proxy.h +++ b/ppapi/proxy/ppb_url_loader_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -11,14 +11,13 @@ #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_size.h" #include "ppapi/c/pp_var.h" +#include "ppapi/c/ppb_url_loader.h" +#include "ppapi/c/trusted/ppb_url_loader_trusted.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h" #include "ppapi/shared_impl/host_resource.h" -struct PPB_URLLoader; -struct PPB_URLLoaderTrusted; - namespace ppapi { struct PPB_URLRequestInfo_Data; diff --git a/ppapi/proxy/ppb_url_response_info_proxy.h b/ppapi/proxy/ppb_url_response_info_proxy.h index 2351715..86c27fb 100644 --- a/ppapi/proxy/ppb_url_response_info_proxy.h +++ b/ppapi/proxy/ppb_url_response_info_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,8 +12,6 @@ #include "ppapi/proxy/interface_proxy.h" #include "ppapi/shared_impl/host_resource.h" -struct PPB_URLResponseInfo; - namespace ppapi { struct PPB_FileRef_CreateInfo; diff --git a/ppapi/proxy/ppb_var_unittest.cc b/ppapi/proxy/ppb_var_unittest.cc index b573fdc..bf6147d 100644 --- a/ppapi/proxy/ppb_var_unittest.cc +++ b/ppapi/proxy/ppb_var_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -30,7 +30,7 @@ class PPB_VarTest : public PluginProxyTest { public: PPB_VarTest() : test_strings_(kNumStrings), vars_(kNumStrings), - ppb_var_(ppapi::PPB_Var_Shared::GetVarInterface()) { + ppb_var_(ppapi::PPB_Var_Shared::GetVarInterface1_1()) { // Set the value of test_strings_[i] to "i". for (size_t i = 0; i < kNumStrings; ++i) test_strings_[i] = base::IntToString(i); @@ -102,7 +102,7 @@ class CreateVarThreadDelegate : public base::PlatformThread::Delegate { } virtual ~CreateVarThreadDelegate() {} virtual void ThreadMain() { - const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface(); + const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface1_1(); for (size_t i = 0; i < size_; ++i) { vars_out_[i] = ppb_var->VarFromUtf8(strings_in_[i].c_str(), strings_in_[i].length()); @@ -125,7 +125,7 @@ class ChangeRefVarThreadDelegate : public base::PlatformThread::Delegate { } virtual ~ChangeRefVarThreadDelegate() {} virtual void ThreadMain() { - const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface(); + const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface1_1(); // Increment and decrement the reference count for each var kRefsToAdd // times. Note that we always AddRef once before doing the matching Release, // to ensure that we never accidentally release the last reference. @@ -153,7 +153,7 @@ class RemoveRefVarThreadDelegate : public base::PlatformThread::Delegate { } virtual ~RemoveRefVarThreadDelegate() {} virtual void ThreadMain() { - const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface(); + const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface1_1(); for (size_t i = 0; i < kNumStrings; ++i) { ppb_var->Release(vars_[i]); } @@ -243,4 +243,3 @@ TEST_F(PPB_VarTest, DISABLED_Threads) { } // namespace proxy } // namespace ppapi - diff --git a/ppapi/proxy/ppp_input_event_proxy.h b/ppapi/proxy/ppp_input_event_proxy.h index ffe5e868..a7cc054 100644 --- a/ppapi/proxy/ppp_input_event_proxy.h +++ b/ppapi/proxy/ppp_input_event_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -6,10 +6,9 @@ #define PPAPI_PROXY_PPP_INPUT_EVENT_PROXY_H_ #include "ppapi/c/pp_instance.h" +#include "ppapi/c/ppp_input_event.h" #include "ppapi/proxy/interface_proxy.h" -struct PPP_InputEvent; - namespace ppapi { struct InputEventData; diff --git a/ppapi/proxy/ppp_messaging_proxy.h b/ppapi/proxy/ppp_messaging_proxy.h index bc898f31..f9390a4 100644 --- a/ppapi/proxy/ppp_messaging_proxy.h +++ b/ppapi/proxy/ppp_messaging_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -6,10 +6,9 @@ #define PPAPI_PROXY_PPP_MESSAGING_PROXY_H_ #include "ppapi/c/pp_instance.h" +#include "ppapi/c/ppp_messaging.h" #include "ppapi/proxy/interface_proxy.h" -struct PPP_Messaging; - namespace ppapi { namespace proxy { diff --git a/ppapi/proxy/ppp_mouse_lock_proxy.h b/ppapi/proxy/ppp_mouse_lock_proxy.h index 75a84f7..f9b0be2 100644 --- a/ppapi/proxy/ppp_mouse_lock_proxy.h +++ b/ppapi/proxy/ppp_mouse_lock_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -6,10 +6,9 @@ #define PPAPI_PROXY_PPP_MOUSE_LOCK_PROXY_H_ #include "ppapi/c/pp_instance.h" +#include "ppapi/c/ppp_mouse_lock.h" #include "ppapi/proxy/interface_proxy.h" -struct PPP_MouseLock; - namespace ppapi { namespace proxy { diff --git a/ppapi/shared_impl/ppb_char_set_shared.cc b/ppapi/shared_impl/ppb_char_set_shared.cc index 70ecd39..e8cadab 100644 --- a/ppapi/shared_impl/ppb_char_set_shared.cc +++ b/ppapi/shared_impl/ppb_char_set_shared.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -103,13 +103,13 @@ char* PPB_CharSet_Shared::UTF16ToCharSet( // ucnv_fromUChars returns size not including terminating null. char* encoded = static_cast<char*>( - thunk::GetPPB_Memory_Dev_Thunk()->MemAlloc(encoded_max_length + 1)); + thunk::GetPPB_Memory_Dev_0_1_Thunk()->MemAlloc(encoded_max_length + 1)); int actual_size = ucnv_fromUChars(converter, encoded, encoded_max_length, reinterpret_cast<const UChar*>(utf16), utf16_len, &status); ucnv_close(converter); if (!U_SUCCESS(status)) { - thunk::GetPPB_Memory_Dev_Thunk()->MemFree(encoded); + thunk::GetPPB_Memory_Dev_0_1_Thunk()->MemFree(encoded); return NULL; } encoded[actual_size] = 0; @@ -141,7 +141,7 @@ uint16_t* PPB_CharSet_Shared::CharSetToUTF16( return NULL; uint16_t* ret_buf = static_cast<uint16_t*>( - thunk::GetPPB_Memory_Dev_Thunk()->MemAlloc( + thunk::GetPPB_Memory_Dev_0_1_Thunk()->MemAlloc( (output.size() + 1) * sizeof(uint16_t))); if (!ret_buf) return NULL; diff --git a/ppapi/shared_impl/ppb_crypto_shared.cc b/ppapi/shared_impl/ppb_crypto_shared.cc index 42694d0..02b5051 100644 --- a/ppapi/shared_impl/ppb_crypto_shared.cc +++ b/ppapi/shared_impl/ppb_crypto_shared.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -27,7 +27,7 @@ const PPB_Crypto_Dev crypto_interface = { namespace thunk { -PPAPI_THUNK_EXPORT const PPB_Crypto_Dev* GetPPB_Crypto_Dev_Thunk() { +PPAPI_THUNK_EXPORT const PPB_Crypto_Dev_0_1* GetPPB_Crypto_Dev_0_1_Thunk() { return &crypto_interface; } diff --git a/ppapi/shared_impl/ppb_memory_shared.cc b/ppapi/shared_impl/ppb_memory_shared.cc index 2cf8aa7..57d52f0 100644 --- a/ppapi/shared_impl/ppb_memory_shared.cc +++ b/ppapi/shared_impl/ppb_memory_shared.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -34,7 +34,7 @@ const PPB_Memory_Dev ppb_memory = { namespace thunk { // static -PPAPI_SHARED_EXPORT const PPB_Memory_Dev* GetPPB_Memory_Dev_Thunk() { +PPAPI_SHARED_EXPORT const PPB_Memory_Dev_0_1* GetPPB_Memory_Dev_0_1_Thunk() { return &ppb_memory; } diff --git a/ppapi/shared_impl/ppb_var_shared.cc b/ppapi/shared_impl/ppb_var_shared.cc index 5549818..7b0ffb4 100644 --- a/ppapi/shared_impl/ppb_var_shared.cc +++ b/ppapi/shared_impl/ppb_var_shared.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -75,14 +75,14 @@ PP_Var CreateArrayBufferVar(uint32_t size_in_bytes) { size_in_bytes); } -uint32_t ByteLength(struct PP_Var array) { +uint32_t ByteLength(PP_Var array) { ArrayBufferVar* buffer = ArrayBufferVar::FromPPVar(array); if (!buffer) return 0; return buffer->ByteLength(); } -void* Map(struct PP_Var array) { +void* Map(PP_Var array) { ArrayBufferVar* buffer = ArrayBufferVar::FromPPVar(array); if (!buffer) return NULL; @@ -98,7 +98,7 @@ const PPB_VarArrayBuffer_Dev var_arraybuffer_interface = { } // namespace // static -const PPB_Var* PPB_Var_Shared::GetVarInterface() { +const PPB_Var_1_1* PPB_Var_Shared::GetVarInterface1_1() { return &var_interface; } @@ -113,4 +113,3 @@ const PPB_VarArrayBuffer_Dev* PPB_Var_Shared::GetVarArrayBufferInterface() { } } // namespace ppapi - diff --git a/ppapi/shared_impl/ppb_var_shared.h b/ppapi/shared_impl/ppb_var_shared.h index 5865d46..f8b622a 100644 --- a/ppapi/shared_impl/ppb_var_shared.h +++ b/ppapi/shared_impl/ppb_var_shared.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,18 +7,17 @@ #include "ppapi/c/pp_module.h" #include "ppapi/c/pp_stdint.h" +#include "ppapi/c/ppb_var.h" +#include "ppapi/c/dev/ppb_var_array_buffer_dev.h" #include "ppapi/shared_impl/ppapi_shared_export.h" struct PP_Var; -struct PPB_Var; -struct PPB_Var_1_0; -struct PPB_VarArrayBuffer_Dev; namespace ppapi { class PPAPI_SHARED_EXPORT PPB_Var_Shared { public: - static const PPB_Var* GetVarInterface(); + static const PPB_Var_1_1* GetVarInterface1_1(); static const PPB_Var_1_0* GetVarInterface1_0(); static const PPB_VarArrayBuffer_Dev* GetVarArrayBufferInterface(); }; diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc index 0c43a2f..bf548d1 100644 --- a/ppapi/shared_impl/private/net_address_private_impl.cc +++ b/ppapi/shared_impl/private/net_address_private_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -281,8 +281,8 @@ const PPB_NetAddress_Private net_address_private_interface = { namespace thunk { -PPAPI_THUNK_EXPORT const PPB_NetAddress_Private* -GetPPB_NetAddress_Private_Thunk() { +PPAPI_THUNK_EXPORT const PPB_NetAddress_Private_0_1* +GetPPB_NetAddress_Private_0_1_Thunk() { return &net_address_private_interface; } diff --git a/ppapi/tests/arch_dependent_sizes_32.h b/ppapi/tests/arch_dependent_sizes_32.h index a6e8699..4be5ad7 100644 --- a/ppapi/tests/arch_dependent_sizes_32.h +++ b/ppapi/tests/arch_dependent_sizes_32.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. * @@ -16,7 +16,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(GLsizeiptr, 4); PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CompletionCallback_Func, 4); PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLLoaderTrusted_StatusCallback, 4); PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_CompletionCallback, 12); -PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 32); -PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 20); +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 32); +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 20); #endif /* PPAPI_TESTS_ARCH_DEPENDENT_SIZES_32_H_ */ diff --git a/ppapi/tests/arch_dependent_sizes_64.h b/ppapi/tests/arch_dependent_sizes_64.h index a675d18..68f4e05 100644 --- a/ppapi/tests/arch_dependent_sizes_64.h +++ b/ppapi/tests/arch_dependent_sizes_64.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium Authors. All rights reserved. +/* Copyright (c) 2012 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. * @@ -16,7 +16,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(GLsizeiptr, 8); PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CompletionCallback_Func, 8); PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLLoaderTrusted_StatusCallback, 8); PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_CompletionCallback, 24); -PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 64); -PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 40); +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 64); +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 40); #endif /* PPAPI_TESTS_ARCH_DEPENDENT_SIZES_64_H_ */ diff --git a/ppapi/tests/test_audio.h b/ppapi/tests/test_audio.h index 61ebc42..6f7883a 100644 --- a/ppapi/tests/test_audio.h +++ b/ppapi/tests/test_audio.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,12 +7,11 @@ #include <string> +#include "ppapi/c/ppb_audio.h" +#include "ppapi/c/ppb_audio_config.h" +#include "ppapi/c/ppb_core.h" #include "ppapi/tests/test_case.h" -struct PPB_Audio; -struct PPB_AudioConfig; -struct PPB_Core; - class TestAudio : public TestCase { public: explicit TestAudio(TestingInstance* instance) : TestCase(instance) {} diff --git a/ppapi/tests/test_audio_config.h b/ppapi/tests/test_audio_config.h index b4d6f5d..71a1ae6 100644 --- a/ppapi/tests/test_audio_config.h +++ b/ppapi/tests/test_audio_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,11 +7,10 @@ #include <string> +#include "ppapi/c/ppb_audio_config.h" +#include "ppapi/c/ppb_core.h" #include "ppapi/tests/test_case.h" -struct PPB_AudioConfig; -struct PPB_Core; - class TestAudioConfig : public TestCase { public: explicit TestAudioConfig(TestingInstance* instance) : TestCase(instance) {} diff --git a/ppapi/tests/test_broker.h b/ppapi/tests/test_broker.h index 37825da..fa7c903 100644 --- a/ppapi/tests/test_broker.h +++ b/ppapi/tests/test_broker.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,10 +8,9 @@ #include <string> #include <vector> +#include "ppapi/c/trusted/ppb_broker_trusted.h" #include "ppapi/tests/test_case.h" -struct PPB_BrokerTrusted; - class TestBroker : public TestCase { public: TestBroker(TestingInstance* instance); @@ -26,7 +25,7 @@ class TestBroker : public TestCase { std::string TestGetHandleFailure(); std::string TestConnectAndPipe(); - const struct PPB_BrokerTrusted* broker_interface_; + const PPB_BrokerTrusted* broker_interface_; }; #endif // PPAPI_TESTS_TEST_BROKER_H_ diff --git a/ppapi/tests/test_buffer.h b/ppapi/tests/test_buffer.h index 7dea017..c0d212c 100644 --- a/ppapi/tests/test_buffer.h +++ b/ppapi/tests/test_buffer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,10 +7,9 @@ #include <string> +#include "ppapi/c/dev/ppb_buffer_dev.h" #include "ppapi/tests/test_case.h" -struct PPB_Buffer_Dev; - class TestBuffer : public TestCase { public: explicit TestBuffer(TestingInstance* instance) : TestCase(instance) {} diff --git a/ppapi/tests/test_case.h b/ppapi/tests/test_case.h index 75cafda..05fbb05 100644 --- a/ppapi/tests/test_case.h +++ b/ppapi/tests/test_case.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,6 +10,7 @@ #include <string> #include "ppapi/c/pp_resource.h" +#include "ppapi/c/dev/ppb_testing_dev.h" #include "ppapi/cpp/dev/scrollbar_dev.h" #if (defined __native_client__) @@ -18,7 +19,6 @@ #include "ppapi/cpp/private/var_private.h" #endif -struct PPB_Testing_Dev; class TestingInstance; namespace pp { diff --git a/ppapi/tests/test_char_set.h b/ppapi/tests/test_char_set.h index 3183e18..f278bef 100644 --- a/ppapi/tests/test_char_set.h +++ b/ppapi/tests/test_char_set.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,10 +8,9 @@ #include <string> #include <vector> +#include "ppapi/c/dev/ppb_char_set_dev.h" #include "ppapi/tests/test_case.h" -struct PPB_CharSet_Dev; - class TestCharSet : public TestCase { public: TestCharSet(TestingInstance* instance); @@ -30,7 +29,7 @@ class TestCharSet : public TestCase { // stored in the given vector. std::vector<uint16_t> UTF8ToUTF16(const std::string& utf8); - const struct PPB_CharSet_Dev* char_set_interface_; + const PPB_CharSet_Dev* char_set_interface_; }; #endif // PPAPI_TESTS_TEST_CHAR_SET_H_ diff --git a/ppapi/tests/test_crypto.h b/ppapi/tests/test_crypto.h index 681e648..819ad77 100644 --- a/ppapi/tests/test_crypto.h +++ b/ppapi/tests/test_crypto.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,10 +8,9 @@ #include <string> #include <vector> +#include "ppapi/c/dev/ppb_crypto_dev.h" #include "ppapi/tests/test_case.h" -struct PPB_Crypto_Dev; - class TestCrypto : public TestCase { public: TestCrypto(TestingInstance* instance); @@ -23,7 +22,7 @@ class TestCrypto : public TestCase { private: std::string TestGetRandomBytes(); - const struct PPB_Crypto_Dev* crypto_interface_; + const PPB_Crypto_Dev* crypto_interface_; }; #endif // PPAPI_TESTS_TEST_CRYPTO_H_ diff --git a/ppapi/tests/test_cursor_control.h b/ppapi/tests/test_cursor_control.h index 0159660..279b65b 100644 --- a/ppapi/tests/test_cursor_control.h +++ b/ppapi/tests/test_cursor_control.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,10 +8,9 @@ #include <string> #include <vector> +#include "ppapi/c/dev/ppb_cursor_control_dev.h" #include "ppapi/tests/test_case.h" -struct PPB_CursorControl_Dev; - class TestCursorControl : public TestCase { public: TestCursorControl(TestingInstance* instance); @@ -23,7 +22,7 @@ class TestCursorControl : public TestCase { private: std::string TestSetCursor(); - const struct PPB_CursorControl_Dev* cursor_control_interface_; + const PPB_CursorControl_Dev* cursor_control_interface_; }; #endif // PPAPI_TESTS_TEST_CURSOR_CONTROL_H_ diff --git a/ppapi/tests/test_flash.h b/ppapi/tests/test_flash.h index 5dfed88..39c4598 100644 --- a/ppapi/tests/test_flash.h +++ b/ppapi/tests/test_flash.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,10 +9,9 @@ #include "ppapi/cpp/completion_callback.h" #include "ppapi/c/pp_stdint.h" +#include "ppapi/c/private/ppb_flash.h" #include "ppapi/tests/test_case.h" -struct PPB_Flash; - class TestFlash : public TestCase { public: explicit TestFlash(TestingInstance* instance); diff --git a/ppapi/tests/test_graphics_2d.h b/ppapi/tests/test_graphics_2d.h index ab3d48f..86eb9a8 100644 --- a/ppapi/tests/test_graphics_2d.h +++ b/ppapi/tests/test_graphics_2d.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,11 +8,10 @@ #include <string> #include "ppapi/c/pp_stdint.h" +#include "ppapi/c/ppb_graphics_2d.h" +#include "ppapi/c/ppb_image_data.h" #include "ppapi/tests/test_case.h" -struct PPB_Graphics2D; -struct PPB_ImageData; - namespace pp { class Graphics2D; class ImageData; diff --git a/ppapi/tests/test_image_data.h b/ppapi/tests/test_image_data.h index e6fb969c..b555d6d 100644 --- a/ppapi/tests/test_image_data.h +++ b/ppapi/tests/test_image_data.h @@ -1,14 +1,13 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. #ifndef PPAPI_TESTS_TEST_IMAGE_DATA_H_ #define PPAPI_TESTS_TEST_IMAGE_DATA_H_ +#include "ppapi/c/ppb_image_data.h" #include "ppapi/tests/test_case.h" -struct PPB_ImageData; - class TestImageData : public TestCase { public: TestImageData(TestingInstance* instance) : TestCase(instance) {} diff --git a/ppapi/tests/test_input_event.h b/ppapi/tests/test_input_event.h index 20a042f..0bf2673 100644 --- a/ppapi/tests/test_input_event.h +++ b/ppapi/tests/test_input_event.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,17 +8,13 @@ #include <string> #include <vector> +#include "ppapi/c/ppb_input_event.h" +#include "ppapi/c/dev/ppb_testing_dev.h" #include "ppapi/cpp/input_event.h" #include "ppapi/cpp/point.h" #include "ppapi/cpp/rect.h" #include "ppapi/tests/test_case.h" -struct PPB_InputEvent; -struct PPB_MouseInputEvent; -struct PPB_WheelInputEvent; -struct PPB_KeyboardInputEvent; -struct PPB_Testing_Dev; - class TestInputEvent : public TestCase { public: explicit TestInputEvent(TestingInstance* instance); @@ -45,10 +41,10 @@ class TestInputEvent : public TestCase { std::string TestEvents(); - const struct PPB_InputEvent* input_event_interface_; - const struct PPB_MouseInputEvent* mouse_input_event_interface_; - const struct PPB_WheelInputEvent* wheel_input_event_interface_; - const struct PPB_KeyboardInputEvent* keyboard_input_event_interface_; + const PPB_InputEvent* input_event_interface_; + const PPB_MouseInputEvent* mouse_input_event_interface_; + const PPB_WheelInputEvent* wheel_input_event_interface_; + const PPB_KeyboardInputEvent* keyboard_input_event_interface_; pp::Rect view_rect_; pp::InputEvent expected_input_event_; @@ -57,4 +53,3 @@ class TestInputEvent : public TestCase { }; #endif // PPAPI_TESTS_TEST_INPUT_EVENT_H_ - diff --git a/ppapi/tests/test_memory.h b/ppapi/tests/test_memory.h index 10c8d79..896f1bd 100644 --- a/ppapi/tests/test_memory.h +++ b/ppapi/tests/test_memory.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,10 +7,9 @@ #include <string> +#include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/tests/test_case.h" -struct PPB_Memory_Dev; - class TestMemory : public TestCase { public: explicit TestMemory(TestingInstance* instance) : TestCase(instance) {} @@ -28,4 +27,3 @@ class TestMemory : public TestCase { }; #endif // PPAPI_TEST_TEST_VAR_H_ - diff --git a/ppapi/tests/test_transport.h b/ppapi/tests/test_transport.h index 4377515..eee1c2d 100644 --- a/ppapi/tests/test_transport.h +++ b/ppapi/tests/test_transport.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,8 +10,6 @@ #include "ppapi/c/dev/ppb_transport_dev.h" #include "ppapi/tests/test_case.h" -struct PPB_Transport_Dev; - namespace pp { class Transport_Dev; } // namespace pp diff --git a/ppapi/tests/test_url_loader.h b/ppapi/tests/test_url_loader.h index c33d51f..8dbef70e 100644 --- a/ppapi/tests/test_url_loader.h +++ b/ppapi/tests/test_url_loader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,11 +7,10 @@ #include <string> +#include "ppapi/c/trusted/ppb_file_io_trusted.h" +#include "ppapi/c/trusted/ppb_url_loader_trusted.h" #include "ppapi/tests/test_case.h" -struct PPB_FileIOTrusted; -struct PPB_URLLoaderTrusted; - namespace pp { class FileIO; class FileRef; diff --git a/ppapi/tests/test_var.h b/ppapi/tests/test_var.h index a329c780..62cb622 100644 --- a/ppapi/tests/test_var.h +++ b/ppapi/tests/test_var.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,11 +7,10 @@ #include <string> +#include "ppapi/c/ppb_var.h" #include "ppapi/cpp/var.h" #include "ppapi/tests/test_case.h" -struct PPB_Var; - class TestVar : public TestCase { public: explicit TestVar(TestingInstance* instance) : TestCase(instance) {} @@ -35,4 +34,3 @@ class TestVar : public TestCase { }; #endif // PPAPI_TEST_TEST_VAR_H_ - diff --git a/ppapi/tests/test_var_deprecated.h b/ppapi/tests/test_var_deprecated.h index d8b86b8..26180a6 100644 --- a/ppapi/tests/test_var_deprecated.h +++ b/ppapi/tests/test_var_deprecated.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,11 +7,10 @@ #include <string> +#include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/cpp/private/var_private.h" #include "ppapi/tests/test_case.h" -struct PPB_Var_Deprecated; - class TestVarDeprecated : public TestCase { public: explicit TestVarDeprecated(TestingInstance* instance) : TestCase(instance) {} @@ -45,4 +44,3 @@ class TestVarDeprecated : public TestCase { }; #endif // PPAPI_TEST_TEST_VAR_DEPRECATED_H_ - diff --git a/ppapi/tests/test_video_decoder.h b/ppapi/tests/test_video_decoder.h index 0b494c5..e6d7e66 100644 --- a/ppapi/tests/test_video_decoder.h +++ b/ppapi/tests/test_video_decoder.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,11 +7,10 @@ #include <string> +#include "ppapi/c/dev/ppb_video_decoder_dev.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/tests/test_case.h" -struct PPB_VideoDecoder_Dev; - class TestVideoDecoder : public TestCase { public: explicit TestVideoDecoder(TestingInstance* instance) : TestCase(instance) {} diff --git a/ppapi/tests/test_websocket.h b/ppapi/tests/test_websocket.h index 1f16489..a973ead 100644 --- a/ppapi/tests/test_websocket.h +++ b/ppapi/tests/test_websocket.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,13 +7,12 @@ #include <string> +#include "ppapi/c/dev/ppb_var_array_buffer_dev.h" +#include "ppapi/c/dev/ppb_websocket_dev.h" +#include "ppapi/c/ppb_core.h" +#include "ppapi/c/ppb_var.h" #include "ppapi/tests/test_case.h" -struct PPB_Core; -struct PPB_Var; -struct PPB_VarArrayBuffer_Dev; -struct PPB_WebSocket_Dev; - class TestWebSocket : public TestCase { public: explicit TestWebSocket(TestingInstance* instance) : TestCase(instance) {} diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h index c6770f8..6513e0d 100644 --- a/ppapi/thunk/interfaces_ppb_private.h +++ b/ppapi/thunk/interfaces_ppb_private.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -11,16 +11,20 @@ PROXIED_API(PPB_Broker) PROXIED_API(PPB_TCPSocket_Private) PROXIED_API(PPB_UDPSocket_Private) -PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2, PPB_BrokerTrusted) -PROXIED_IFACE(PPB_FileRef, PPB_FILEREFPRIVATE_INTERFACE_0_1, PPB_FileRefPrivate) +PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2, + PPB_BrokerTrusted_0_2) +PROXIED_IFACE(PPB_FileRef, PPB_FILEREFPRIVATE_INTERFACE_0_1, + PPB_FileRefPrivate_0_1) // This uses the FileIO API which is declared in the public stable file. -PROXIED_IFACE(PPB_FileIO, PPB_FILEIOTRUSTED_INTERFACE_0_4, PPB_FileIOTrusted) -PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE, PPB_FlashFullscreen) -PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE, - PPB_NetAddress_Private) -PROXIED_IFACE(PPB_TCPSocket_Private, PPB_TCPSOCKET_PRIVATE_INTERFACE, - PPB_TCPSocket_Private) -PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE, - PPB_UDPSocket_Private) +PROXIED_IFACE(PPB_FileIO, PPB_FILEIOTRUSTED_INTERFACE_0_4, + PPB_FileIOTrusted_0_4) +PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_0_1, + PPB_FlashFullscreen_0_1) +PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE_0_1, + PPB_NetAddress_Private_0_1) +PROXIED_IFACE(PPB_TCPSocket_Private, PPB_TCPSOCKET_PRIVATE_INTERFACE_0_3, + PPB_TCPSocket_Private_0_3) +PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2, + PPB_UDPSocket_Private_0_2) #include "ppapi/thunk/interfaces_postamble.h" diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h index 2aa7ea4..7161449 100644 --- a/ppapi/thunk/interfaces_ppb_public_dev.h +++ b/ppapi/thunk/interfaces_ppb_public_dev.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -25,42 +25,43 @@ UNPROXIED_API(PPB_WebSocket) UNPROXIED_API(PPB_Widget) PROXIED_IFACE(PPB_AudioInput, PPB_AUDIO_INPUT_DEV_INTERFACE_0_1, - PPB_AudioInput_Dev) + PPB_AudioInput_Dev_0_1) PROXIED_IFACE(NoAPIName, PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1, - PPB_IMEInputEvent_Dev) -PROXIED_IFACE(PPB_Buffer, PPB_BUFFER_DEV_INTERFACE_0_4, PPB_Buffer_Dev) -PROXIED_IFACE(PPB_Graphics3D, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE, - PPB_GLESChromiumTextureMapping_Dev) -PROXIED_IFACE(NoAPIName, PPB_CRYPTO_DEV_INTERFACE, PPB_Crypto_Dev) + PPB_IMEInputEvent_Dev_0_1) +PROXIED_IFACE(PPB_Buffer, PPB_BUFFER_DEV_INTERFACE_0_4, PPB_Buffer_Dev_0_4) +PROXIED_IFACE(PPB_Graphics3D, + PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1, + PPB_GLESChromiumTextureMapping_Dev_0_1) +PROXIED_IFACE(NoAPIName, PPB_CRYPTO_DEV_INTERFACE_0_1, PPB_Crypto_Dev_0_1) PROXIED_IFACE(PPB_CursorControl, PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4, - PPB_CursorControl_Dev) + PPB_CursorControl_Dev_0_4) UNPROXIED_IFACE(PPB_DirectoryReader, PPB_DIRECTORYREADER_DEV_INTERFACE_0_5, - PPB_DirectoryReader_Dev) -UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev) + PPB_DirectoryReader_Dev_0_5) +UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev_0_3) PROXIED_IFACE(PPB_FileChooser, PPB_FILECHOOSER_DEV_INTERFACE_0_5, - PPB_FileChooser_Dev) -PROXIED_IFACE(PPB_Font, PPB_FONT_DEV_INTERFACE_0_6, PPB_Font_Dev) -PROXIED_IFACE(PPB_Instance, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev) -PROXIED_IFACE(PPB_Instance, PPB_CONSOLE_DEV_INTERFACE, PPB_Console_Dev) -PROXIED_IFACE(PPB_Instance, PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev) -UNPROXIED_IFACE(PPB_Instance, PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev) + PPB_FileChooser_Dev_0_5) +PROXIED_IFACE(PPB_Font, PPB_FONT_DEV_INTERFACE_0_6, PPB_Font_Dev_0_6) +PROXIED_IFACE(PPB_Instance, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev_0_4) +PROXIED_IFACE(PPB_Instance, PPB_CONSOLE_DEV_INTERFACE_0_1, PPB_Console_Dev_0_1) +PROXIED_IFACE(PPB_Instance, PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev_0_6) +UNPROXIED_IFACE(PPB_Instance, PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev_0_2) UNPROXIED_IFACE(PPB_LayerCompositor, PPB_LAYER_COMPOSITOR_DEV_INTERFACE_0_2, - PPB_LayerCompositor_Dev) -PROXIED_IFACE(NoAPIName, PPB_MEMORY_DEV_INTERFACE, PPB_Memory_Dev) + PPB_LayerCompositor_Dev_0_2) +PROXIED_IFACE(NoAPIName, PPB_MEMORY_DEV_INTERFACE_0_1, PPB_Memory_Dev_0_1) UNPROXIED_IFACE(PPB_Scrollbar, PPB_SCROLLBAR_DEV_INTERFACE_0_5, - PPB_Scrollbar_Dev) + PPB_Scrollbar_Dev_0_5) PROXIED_IFACE(PPB_TextInput, PPB_TEXTINPUT_DEV_INTERFACE_0_1, - PPB_TextInput_Dev) + PPB_TextInput_Dev_0_1) UNPROXIED_IFACE(PPB_Transport, PPB_TRANSPORT_DEV_INTERFACE_0_7, - PPB_Transport_Dev) + PPB_Transport_Dev_0_7) PROXIED_IFACE(PPB_VideoCapture, PPB_VIDEOCAPTURE_DEV_INTERFACE_0_1, - PPB_VideoCapture_Dev) + PPB_VideoCapture_Dev_0_1) PROXIED_IFACE(PPB_VideoDecoder, PPB_VIDEODECODER_DEV_INTERFACE_0_16, - PPB_VideoDecoder_Dev) -UNPROXIED_IFACE(PPB_VideoLayer, PPB_VIDEOLAYER_DEV_INTERFACE, - PPB_VideoLayer_Dev) + PPB_VideoDecoder_Dev_0_16) +UNPROXIED_IFACE(PPB_VideoLayer, PPB_VIDEOLAYER_DEV_INTERFACE_0_1, + PPB_VideoLayer_Dev_0_1) UNPROXIED_IFACE(PPB_WebSocket, PPB_WEBSOCKET_DEV_INTERFACE_0_1, - PPB_WebSocket_Dev) -UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev) + PPB_WebSocket_Dev_0_1) +UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev_0_3) #include "ppapi/thunk/interfaces_postamble.h" diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h index 56498d8..6556cf4 100644 --- a/ppapi/thunk/interfaces_ppb_public_stable.h +++ b/ppapi/thunk/interfaces_ppb_public_stable.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -46,34 +46,35 @@ PROXIED_API(PPB_URLResponseInfo) // // The interface_struct is the typename of the struct corresponding to the // interface string. -PROXIED_IFACE(PPB_Audio, PPB_AUDIO_INTERFACE_1_0, PPB_Audio) +PROXIED_IFACE(PPB_Audio, PPB_AUDIO_INTERFACE_1_0, PPB_Audio_1_0) // This has no corresponding _Proxy object since it does no IPC. -PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_0, PPB_AudioConfig) +PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_0, PPB_AudioConfig_1_0) // Note: Core is special and is registered manually. -PROXIED_IFACE(PPB_FileIO, PPB_FILEIO_INTERFACE_1_0, PPB_FileIO) -PROXIED_IFACE(PPB_FileRef, PPB_FILEREF_INTERFACE_1_0, PPB_FileRef) -PROXIED_IFACE(PPB_FileSystem, PPB_FILESYSTEM_INTERFACE_1_0, PPB_FileSystem) -PROXIED_IFACE(PPB_Graphics2D, PPB_GRAPHICS_2D_INTERFACE_1_0, PPB_Graphics2D) -PROXIED_IFACE(PPB_Graphics3D, PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D) -PROXIED_IFACE(PPB_ImageData, PPB_IMAGEDATA_INTERFACE_1_0, PPB_ImageData) -PROXIED_IFACE(PPB_Instance, PPB_INSTANCE_INTERFACE_1_0, PPB_Instance) -PROXIED_IFACE(NoAPIName, PPB_INPUT_EVENT_INTERFACE_1_0, PPB_InputEvent) +PROXIED_IFACE(PPB_FileIO, PPB_FILEIO_INTERFACE_1_0, PPB_FileIO_1_0) +PROXIED_IFACE(PPB_FileRef, PPB_FILEREF_INTERFACE_1_0, PPB_FileRef_1_0) +PROXIED_IFACE(PPB_FileSystem, PPB_FILESYSTEM_INTERFACE_1_0, PPB_FileSystem_1_0) +PROXIED_IFACE(PPB_Graphics2D, PPB_GRAPHICS_2D_INTERFACE_1_0, PPB_Graphics2D_1_0) +PROXIED_IFACE(PPB_Graphics3D, PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D_1_0) +PROXIED_IFACE(PPB_ImageData, PPB_IMAGEDATA_INTERFACE_1_0, PPB_ImageData_1_0) +PROXIED_IFACE(PPB_Instance, PPB_INSTANCE_INTERFACE_1_0, PPB_Instance_1_0) +PROXIED_IFACE(NoAPIName, PPB_INPUT_EVENT_INTERFACE_1_0, PPB_InputEvent_1_0) PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_0, - PPB_KeyboardInputEvent) + PPB_KeyboardInputEvent_1_0) PROXIED_IFACE(NoAPIName, PPB_MOUSE_INPUT_EVENT_INTERFACE_1_0, PPB_MouseInputEvent_1_0) PROXIED_IFACE(NoAPIName, PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1, - PPB_MouseInputEvent) + PPB_MouseInputEvent_1_1) PROXIED_IFACE(NoAPIName, PPB_WHEEL_INPUT_EVENT_INTERFACE_1_0, - PPB_WheelInputEvent) -PROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_INTERFACE_1_0, PPB_Fullscreen) -PROXIED_IFACE(PPB_Instance, PPB_MESSAGING_INTERFACE_1_0, PPB_Messaging) -PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_INTERFACE_1_0, PPB_MouseLock) -PROXIED_IFACE(PPB_URLLoader, PPB_URLLOADER_INTERFACE_1_0, PPB_URLLoader) -PROXIED_IFACE(NoAPIName, PPB_URLREQUESTINFO_INTERFACE_1_0, PPB_URLRequestInfo) + PPB_WheelInputEvent_1_0) +PROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_INTERFACE_1_0, PPB_Fullscreen_1_0) +PROXIED_IFACE(PPB_Instance, PPB_MESSAGING_INTERFACE_1_0, PPB_Messaging_1_0) +PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_INTERFACE_1_0, PPB_MouseLock_1_0) +PROXIED_IFACE(PPB_URLLoader, PPB_URLLOADER_INTERFACE_1_0, PPB_URLLoader_1_0) +PROXIED_IFACE(NoAPIName, PPB_URLREQUESTINFO_INTERFACE_1_0, + PPB_URLRequestInfo_1_0) PROXIED_IFACE(PPB_URLResponseInfo, PPB_URLRESPONSEINFO_INTERFACE_1_0, - PPB_URLResponseInfo) + PPB_URLResponseInfo_1_0) // Note: PPB_Var is special and registered manually. -PROXIED_IFACE(NoAPIName, PPB_VIEW_INTERFACE_1_0, PPB_View) +PROXIED_IFACE(NoAPIName, PPB_VIEW_INTERFACE_1_0, PPB_View_1_0) #include "ppapi/thunk/interfaces_postamble.h" diff --git a/ppapi/thunk/ppb_audio_config_thunk.cc b/ppapi/thunk/ppb_audio_config_thunk.cc index ca3d589..2cc82a3 100644 --- a/ppapi/thunk/ppb_audio_config_thunk.cc +++ b/ppapi/thunk/ppb_audio_config_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -62,7 +62,7 @@ const PPB_AudioConfig g_ppb_audio_config_thunk = { } // namespace -const PPB_AudioConfig* GetPPB_AudioConfig_Thunk() { +const PPB_AudioConfig_1_0* GetPPB_AudioConfig_1_0_Thunk() { return &g_ppb_audio_config_thunk; } diff --git a/ppapi/thunk/ppb_audio_input_thunk.cc b/ppapi/thunk/ppb_audio_input_thunk.cc index 7b6f31c..dbc697f 100644 --- a/ppapi/thunk/ppb_audio_input_thunk.cc +++ b/ppapi/thunk/ppb_audio_input_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -66,7 +66,7 @@ const PPB_AudioInput_Dev g_ppb_audioinput_thunk = { } // namespace -const PPB_AudioInput_Dev* GetPPB_AudioInput_Dev_Thunk() { +const PPB_AudioInput_Dev_0_1* GetPPB_AudioInput_Dev_0_1_Thunk() { return &g_ppb_audioinput_thunk; } diff --git a/ppapi/thunk/ppb_audio_input_trusted_thunk.cc b/ppapi/thunk/ppb_audio_input_trusted_thunk.cc index 1de878c..3a44a30 100644 --- a/ppapi/thunk/ppb_audio_input_trusted_thunk.cc +++ b/ppapi/thunk/ppb_audio_input_trusted_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -59,7 +59,7 @@ const PPB_AudioInputTrusted_Dev g_ppb_audioinput_trusted_thunk = { } // namespace -const PPB_AudioInputTrusted_Dev* GetPPB_AudioInputTrusted_Thunk() { +const PPB_AudioInputTrusted_Dev_0_1* GetPPB_AudioInputTrusted_0_1_Thunk() { return &g_ppb_audioinput_trusted_thunk; } diff --git a/ppapi/thunk/ppb_audio_thunk.cc b/ppapi/thunk/ppb_audio_thunk.cc index 18b70b6..33ddacd 100644 --- a/ppapi/thunk/ppb_audio_thunk.cc +++ b/ppapi/thunk/ppb_audio_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -61,7 +61,7 @@ const PPB_Audio g_ppb_audio_thunk = { } // namespace -const PPB_Audio* GetPPB_Audio_Thunk() { +const PPB_Audio_1_0* GetPPB_Audio_1_0_Thunk() { return &g_ppb_audio_thunk; } diff --git a/ppapi/thunk/ppb_audio_trusted_thunk.cc b/ppapi/thunk/ppb_audio_trusted_thunk.cc index 97f8978..da49425 100644 --- a/ppapi/thunk/ppb_audio_trusted_thunk.cc +++ b/ppapi/thunk/ppb_audio_trusted_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -59,7 +59,7 @@ const PPB_AudioTrusted g_ppb_audio_trusted_thunk = { } // namespace -const PPB_AudioTrusted* GetPPB_AudioTrusted_Thunk() { +const PPB_AudioTrusted_0_6* GetPPB_AudioTrusted_0_6_Thunk() { return &g_ppb_audio_trusted_thunk; } diff --git a/ppapi/thunk/ppb_broker_thunk.cc b/ppapi/thunk/ppb_broker_thunk.cc index c6c1cd1..6b3f936 100644 --- a/ppapi/thunk/ppb_broker_thunk.cc +++ b/ppapi/thunk/ppb_broker_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -52,7 +52,7 @@ const PPB_BrokerTrusted g_ppb_broker_thunk = { } // namespace -const PPB_BrokerTrusted* GetPPB_BrokerTrusted_Thunk() { +const PPB_BrokerTrusted_0_2* GetPPB_BrokerTrusted_0_2_Thunk() { return &g_ppb_broker_thunk; } diff --git a/ppapi/thunk/ppb_buffer_thunk.cc b/ppapi/thunk/ppb_buffer_thunk.cc index 1772048..177a342 100644 --- a/ppapi/thunk/ppb_buffer_thunk.cc +++ b/ppapi/thunk/ppb_buffer_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -57,7 +57,7 @@ const PPB_Buffer_Dev g_ppb_buffer_thunk = { } // namespace -const PPB_Buffer_Dev* GetPPB_Buffer_Dev_Thunk() { +const PPB_Buffer_Dev_0_4* GetPPB_Buffer_Dev_0_4_Thunk() { return &g_ppb_buffer_thunk; } diff --git a/ppapi/thunk/ppb_buffer_trusted_thunk.cc b/ppapi/thunk/ppb_buffer_trusted_thunk.cc index f20d6d5..19506db 100644 --- a/ppapi/thunk/ppb_buffer_trusted_thunk.cc +++ b/ppapi/thunk/ppb_buffer_trusted_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -26,7 +26,7 @@ const PPB_BufferTrusted g_ppb_buffer_trusted_thunk = { } // namespace -const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk() { +const PPB_BufferTrusted_0_1* GetPPB_BufferTrusted_0_1_Thunk() { return &g_ppb_buffer_trusted_thunk; } diff --git a/ppapi/thunk/ppb_char_set_thunk.cc b/ppapi/thunk/ppb_char_set_thunk.cc index 27419b4..c5cb1de 100644 --- a/ppapi/thunk/ppb_char_set_thunk.cc +++ b/ppapi/thunk/ppb_char_set_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -68,7 +68,7 @@ const PPB_CharSet_Dev g_ppb_char_set_thunk = { } // namespace -const PPB_CharSet_Dev* GetPPB_CharSet_Dev_Thunk() { +const PPB_CharSet_Dev_0_4* GetPPB_CharSet_Dev_0_4_Thunk() { return &g_ppb_char_set_thunk; } diff --git a/ppapi/thunk/ppb_console_thunk.cc b/ppapi/thunk/ppb_console_thunk.cc index 509c128..1a14164 100644 --- a/ppapi/thunk/ppb_console_thunk.cc +++ b/ppapi/thunk/ppb_console_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -34,7 +34,7 @@ const PPB_Console_Dev g_ppb_console_thunk = { } // namespace -const PPB_Console_Dev* GetPPB_Console_Dev_Thunk() { +const PPB_Console_Dev_0_1* GetPPB_Console_Dev_0_1_Thunk() { return &g_ppb_console_thunk; } diff --git a/ppapi/thunk/ppb_cursor_control_thunk.cc b/ppapi/thunk/ppb_cursor_control_thunk.cc index b1f5409..b1b2077 100644 --- a/ppapi/thunk/ppb_cursor_control_thunk.cc +++ b/ppapi/thunk/ppb_cursor_control_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -59,7 +59,7 @@ const PPB_CursorControl_Dev g_ppb_cursor_control_thunk = { } // namespace -const PPB_CursorControl_Dev* GetPPB_CursorControl_Dev_Thunk() { +const PPB_CursorControl_Dev_0_4* GetPPB_CursorControl_Dev_0_4_Thunk() { return &g_ppb_cursor_control_thunk; } diff --git a/ppapi/thunk/ppb_directory_reader_thunk.cc b/ppapi/thunk/ppb_directory_reader_thunk.cc index f8e95537..f03b165 100644 --- a/ppapi/thunk/ppb_directory_reader_thunk.cc +++ b/ppapi/thunk/ppb_directory_reader_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -46,7 +46,7 @@ const PPB_DirectoryReader_Dev g_ppb_directory_reader_thunk = { } // namespace -const PPB_DirectoryReader_Dev* GetPPB_DirectoryReader_Dev_Thunk() { +const PPB_DirectoryReader_Dev_0_5* GetPPB_DirectoryReader_Dev_0_5_Thunk() { return &g_ppb_directory_reader_thunk; } diff --git a/ppapi/thunk/ppb_file_chooser_thunk.cc b/ppapi/thunk/ppb_file_chooser_thunk.cc index e5cbc5d..1e783f9 100644 --- a/ppapi/thunk/ppb_file_chooser_thunk.cc +++ b/ppapi/thunk/ppb_file_chooser_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -78,11 +78,11 @@ const PPB_FileChooserTrusted g_ppb_file_chooser_trusted_thunk = { } // namespace -const PPB_FileChooser_Dev* GetPPB_FileChooser_Dev_Thunk() { +const PPB_FileChooser_Dev_0_5* GetPPB_FileChooser_Dev_0_5_Thunk() { return &g_ppb_file_chooser_thunk; } -const PPB_FileChooserTrusted* GetPPB_FileChooser_Trusted_Thunk() { +const PPB_FileChooserTrusted_0_5* GetPPB_FileChooser_Trusted_0_5_Thunk() { return &g_ppb_file_chooser_trusted_thunk; } diff --git a/ppapi/thunk/ppb_file_io_thunk.cc b/ppapi/thunk/ppb_file_io_thunk.cc index 4882bdf..52d4ea6 100644 --- a/ppapi/thunk/ppb_file_io_thunk.cc +++ b/ppapi/thunk/ppb_file_io_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -126,7 +126,7 @@ const PPB_FileIO g_ppb_file_io_thunk = { } // namespace -const PPB_FileIO* GetPPB_FileIO_Thunk() { +const PPB_FileIO_1_0* GetPPB_FileIO_1_0_Thunk() { return &g_ppb_file_io_thunk; } diff --git a/ppapi/thunk/ppb_file_io_trusted_thunk.cc b/ppapi/thunk/ppb_file_io_trusted_thunk.cc index e1789bd..709af437 100644 --- a/ppapi/thunk/ppb_file_io_trusted_thunk.cc +++ b/ppapi/thunk/ppb_file_io_trusted_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -52,7 +52,7 @@ const PPB_FileIOTrusted g_ppb_file_io_trusted_thunk = { } // namespace -const PPB_FileIOTrusted* GetPPB_FileIOTrusted_Thunk() { +const PPB_FileIOTrusted_0_4* GetPPB_FileIOTrusted_0_4_Thunk() { return &g_ppb_file_io_trusted_thunk; } diff --git a/ppapi/thunk/ppb_file_ref_thunk.cc b/ppapi/thunk/ppb_file_ref_thunk.cc index 5041c55..7fdb8ac 100644 --- a/ppapi/thunk/ppb_file_ref_thunk.cc +++ b/ppapi/thunk/ppb_file_ref_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -125,11 +125,11 @@ const PPB_FileRefPrivate g_ppb_file_ref_private_thunk = { } // namespace -const PPB_FileRef* GetPPB_FileRef_Thunk() { +const PPB_FileRef_1_0* GetPPB_FileRef_1_0_Thunk() { return &g_ppb_file_ref_thunk; } -const PPB_FileRefPrivate* GetPPB_FileRefPrivate_Thunk() { +const PPB_FileRefPrivate_0_1* GetPPB_FileRefPrivate_0_1_Thunk() { return &g_ppb_file_ref_private_thunk; } diff --git a/ppapi/thunk/ppb_file_system_thunk.cc b/ppapi/thunk/ppb_file_system_thunk.cc index ad2c8db..1e82c91 100644 --- a/ppapi/thunk/ppb_file_system_thunk.cc +++ b/ppapi/thunk/ppb_file_system_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -54,7 +54,7 @@ const PPB_FileSystem g_ppb_file_system_thunk = { } // namespace -const PPB_FileSystem* GetPPB_FileSystem_Thunk() { +const PPB_FileSystem_1_0* GetPPB_FileSystem_1_0_Thunk() { return &g_ppb_file_system_thunk; } diff --git a/ppapi/thunk/ppb_find_thunk.cc b/ppapi/thunk/ppb_find_thunk.cc index 82faa3c..53911e4 100644 --- a/ppapi/thunk/ppb_find_thunk.cc +++ b/ppapi/thunk/ppb_find_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -32,7 +32,7 @@ const PPB_Find_Dev g_ppb_find_thunk = { } // namespace -const PPB_Find_Dev* GetPPB_Find_Dev_Thunk() { +const PPB_Find_Dev_0_3* GetPPB_Find_Dev_0_3_Thunk() { return &g_ppb_find_thunk; } diff --git a/ppapi/thunk/ppb_flash_clipboard_thunk.cc b/ppapi/thunk/ppb_flash_clipboard_thunk.cc index 010aa2f..ffecb34 100644 --- a/ppapi/thunk/ppb_flash_clipboard_thunk.cc +++ b/ppapi/thunk/ppb_flash_clipboard_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -49,7 +49,7 @@ const PPB_Flash_Clipboard g_ppb_flash_clipboard_thunk = { } // namespace -const PPB_Flash_Clipboard* GetPPB_Flash_Clipboard_Thunk() { +const PPB_Flash_Clipboard_3_0* GetPPB_Flash_Clipboard_3_0_Thunk() { return &g_ppb_flash_clipboard_thunk; } diff --git a/ppapi/thunk/ppb_flash_fullscreen_thunk.cc b/ppapi/thunk/ppb_flash_fullscreen_thunk.cc index 594089e..ecaea96 100644 --- a/ppapi/thunk/ppb_flash_fullscreen_thunk.cc +++ b/ppapi/thunk/ppb_flash_fullscreen_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -43,7 +43,7 @@ const PPB_FlashFullscreen g_ppb_flash_fullscreen_thunk = { } // namespace -const PPB_FlashFullscreen* GetPPB_FlashFullscreen_Thunk() { +const PPB_FlashFullscreen_0_1* GetPPB_FlashFullscreen_0_1_Thunk() { return &g_ppb_flash_fullscreen_thunk; } diff --git a/ppapi/thunk/ppb_flash_menu_thunk.cc b/ppapi/thunk/ppb_flash_menu_thunk.cc index 3641e1e..9426aa9 100644 --- a/ppapi/thunk/ppb_flash_menu_thunk.cc +++ b/ppapi/thunk/ppb_flash_menu_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -47,7 +47,7 @@ const PPB_Flash_Menu g_ppb_flash_menu_thunk = { } // namespace -const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk() { +const PPB_Flash_Menu_0_2* GetPPB_Flash_Menu_0_2_Thunk() { return &g_ppb_flash_menu_thunk; } diff --git a/ppapi/thunk/ppb_font_thunk.cc b/ppapi/thunk/ppb_font_thunk.cc index 841170a..23e21cd 100644 --- a/ppapi/thunk/ppb_font_thunk.cc +++ b/ppapi/thunk/ppb_font_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -93,7 +93,7 @@ const PPB_Font_Dev g_ppb_font_thunk = { } // namespace -const PPB_Font_Dev* GetPPB_Font_Dev_Thunk() { +const PPB_Font_Dev_0_6* GetPPB_Font_Dev_0_6_Thunk() { return &g_ppb_font_thunk; } diff --git a/ppapi/thunk/ppb_fullscreen_thunk.cc b/ppapi/thunk/ppb_fullscreen_thunk.cc index 5f2a0e0..b241938 100644 --- a/ppapi/thunk/ppb_fullscreen_thunk.cc +++ b/ppapi/thunk/ppb_fullscreen_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -46,7 +46,7 @@ const PPB_Fullscreen g_ppb_fullscreen_thunk = { } // namespace -const PPB_Fullscreen* GetPPB_Fullscreen_Thunk() { +const PPB_Fullscreen_1_0* GetPPB_Fullscreen_1_0_Thunk() { return &g_ppb_fullscreen_thunk; } diff --git a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc index 0963631f7..a9ecd05 100644 --- a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc +++ b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -46,8 +46,8 @@ g_ppb_gles_chromium_texture_mapping_thunk = { } // namespace -const PPB_GLESChromiumTextureMapping_Dev* -GetPPB_GLESChromiumTextureMapping_Dev_Thunk() { +const PPB_GLESChromiumTextureMapping_Dev_0_1* +GetPPB_GLESChromiumTextureMapping_Dev_0_1_Thunk() { return &g_ppb_gles_chromium_texture_mapping_thunk; } diff --git a/ppapi/thunk/ppb_graphics_2d_thunk.cc b/ppapi/thunk/ppb_graphics_2d_thunk.cc index df6d569..e42d002 100644 --- a/ppapi/thunk/ppb_graphics_2d_thunk.cc +++ b/ppapi/thunk/ppb_graphics_2d_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -90,7 +90,7 @@ const PPB_Graphics2D g_ppb_graphics_2d_thunk = { } // namespace -const PPB_Graphics2D* GetPPB_Graphics2D_Thunk() { +const PPB_Graphics2D_1_0* GetPPB_Graphics2D_1_0_Thunk() { return &g_ppb_graphics_2d_thunk; } diff --git a/ppapi/thunk/ppb_graphics_3d_thunk.cc b/ppapi/thunk/ppb_graphics_3d_thunk.cc index f0e516c..490561b 100644 --- a/ppapi/thunk/ppb_graphics_3d_thunk.cc +++ b/ppapi/thunk/ppb_graphics_3d_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -89,7 +89,7 @@ const PPB_Graphics3D g_ppb_graphics_3d_thunk = { } // namespace -const PPB_Graphics3D* GetPPB_Graphics3D_Thunk() { +const PPB_Graphics3D_1_0* GetPPB_Graphics3D_1_0_Thunk() { return &g_ppb_graphics_3d_thunk; } diff --git a/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc b/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc index bea32ab..8933d12 100644 --- a/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc +++ b/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -113,10 +113,9 @@ const PPB_Graphics3DTrusted g_ppb_graphics_3d_trusted_thunk = { } // namespace -const PPB_Graphics3DTrusted* GetPPB_Graphics3DTrusted_Thunk() { +const PPB_Graphics3DTrusted_1_0* GetPPB_Graphics3DTrusted_1_0_Thunk() { return &g_ppb_graphics_3d_trusted_thunk; } } // namespace thunk } // namespace ppapi - diff --git a/ppapi/thunk/ppb_image_data_thunk.cc b/ppapi/thunk/ppb_image_data_thunk.cc index 00d9184..71c94f7 100644 --- a/ppapi/thunk/ppb_image_data_thunk.cc +++ b/ppapi/thunk/ppb_image_data_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -76,7 +76,7 @@ const PPB_ImageData g_ppb_image_data_thunk = { } // namespace -const PPB_ImageData* GetPPB_ImageData_Thunk() { +const PPB_ImageData_1_0* GetPPB_ImageData_1_0_Thunk() { return &g_ppb_image_data_thunk; } diff --git a/ppapi/thunk/ppb_image_data_trusted_thunk.cc b/ppapi/thunk/ppb_image_data_trusted_thunk.cc index db53aa2..8cf6789 100644 --- a/ppapi/thunk/ppb_image_data_trusted_thunk.cc +++ b/ppapi/thunk/ppb_image_data_trusted_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -28,7 +28,7 @@ const PPB_ImageDataTrusted g_ppb_image_data_trusted_thunk = { } // namespace -const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk() { +const PPB_ImageDataTrusted_0_4* GetPPB_ImageDataTrusted_0_4_Thunk() { return &g_ppb_image_data_trusted_thunk; } diff --git a/ppapi/thunk/ppb_input_event_thunk.cc b/ppapi/thunk/ppb_input_event_thunk.cc index 7c8820a..5023461 100644 --- a/ppapi/thunk/ppb_input_event_thunk.cc +++ b/ppapi/thunk/ppb_input_event_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -331,7 +331,7 @@ const PPB_IMEInputEvent_Dev g_ppb_ime_input_event_thunk = { } // namespace -const PPB_InputEvent* GetPPB_InputEvent_Thunk() { +const PPB_InputEvent_1_0* GetPPB_InputEvent_1_0_Thunk() { return &g_ppb_input_event_thunk; } @@ -339,19 +339,19 @@ const PPB_MouseInputEvent_1_0* GetPPB_MouseInputEvent_1_0_Thunk() { return &g_ppb_mouse_input_event_1_0_thunk; } -const PPB_MouseInputEvent* GetPPB_MouseInputEvent_Thunk() { +const PPB_MouseInputEvent_1_1* GetPPB_MouseInputEvent_1_1_Thunk() { return &g_ppb_mouse_input_event_1_1_thunk; } -const PPB_KeyboardInputEvent* GetPPB_KeyboardInputEvent_Thunk() { +const PPB_KeyboardInputEvent_1_0* GetPPB_KeyboardInputEvent_1_0_Thunk() { return &g_ppb_keyboard_input_event_thunk; } -const PPB_WheelInputEvent* GetPPB_WheelInputEvent_Thunk() { +const PPB_WheelInputEvent_1_0* GetPPB_WheelInputEvent_1_0_Thunk() { return &g_ppb_wheel_input_event_thunk; } -const PPB_IMEInputEvent_Dev* GetPPB_IMEInputEvent_Dev_Thunk() { +const PPB_IMEInputEvent_Dev_0_1* GetPPB_IMEInputEvent_Dev_0_1_Thunk() { return &g_ppb_ime_input_event_thunk; } diff --git a/ppapi/thunk/ppb_instance_thunk.cc b/ppapi/thunk/ppb_instance_thunk.cc index 07951bc..d8117fa1a 100644 --- a/ppapi/thunk/ppb_instance_thunk.cc +++ b/ppapi/thunk/ppb_instance_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -62,10 +62,10 @@ const PPB_Instance_Private g_ppb_instance_private_thunk = { } // namespace -const PPB_Instance* GetPPB_Instance_Thunk() { +const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk() { return &g_ppb_instance_thunk; } -const PPB_Instance_Private* GetPPB_Instance_Private_Thunk() { +const PPB_Instance_Private_0_1* GetPPB_Instance_Private_0_1_Thunk() { return &g_ppb_instance_private_thunk; } diff --git a/ppapi/thunk/ppb_layer_compositor_thunk.cc b/ppapi/thunk/ppb_layer_compositor_thunk.cc index 44a95eb..df03a43 100644 --- a/ppapi/thunk/ppb_layer_compositor_thunk.cc +++ b/ppapi/thunk/ppb_layer_compositor_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -63,7 +63,7 @@ const PPB_LayerCompositor_Dev g_ppb_layer_compositor_thunk = { } // namespace -const PPB_LayerCompositor_Dev* GetPPB_LayerCompositor_Dev_Thunk() { +const PPB_LayerCompositor_Dev_0_2* GetPPB_LayerCompositor_Dev_0_2_Thunk() { return &g_ppb_layer_compositor_thunk; } diff --git a/ppapi/thunk/ppb_messaging_thunk.cc b/ppapi/thunk/ppb_messaging_thunk.cc index 8b534e0..6880d3e 100644 --- a/ppapi/thunk/ppb_messaging_thunk.cc +++ b/ppapi/thunk/ppb_messaging_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -24,7 +24,7 @@ const PPB_Messaging g_ppb_messaging_thunk = { } // namespace -const PPB_Messaging* GetPPB_Messaging_Thunk() { +const PPB_Messaging_1_0* GetPPB_Messaging_1_0_Thunk() { return &g_ppb_messaging_thunk; } diff --git a/ppapi/thunk/ppb_mouse_lock_thunk.cc b/ppapi/thunk/ppb_mouse_lock_thunk.cc index a26e789..167a537 100644 --- a/ppapi/thunk/ppb_mouse_lock_thunk.cc +++ b/ppapi/thunk/ppb_mouse_lock_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -36,7 +36,7 @@ const PPB_MouseLock g_ppb_mouse_lock_thunk = { } // namespace -const PPB_MouseLock* GetPPB_MouseLock_Thunk() { +const PPB_MouseLock_1_0* GetPPB_MouseLock_1_0_Thunk() { return &g_ppb_mouse_lock_thunk; } diff --git a/ppapi/thunk/ppb_scrollbar_thunk.cc b/ppapi/thunk/ppb_scrollbar_thunk.cc index c0ab39ce..5eb040f 100644 --- a/ppapi/thunk/ppb_scrollbar_thunk.cc +++ b/ppapi/thunk/ppb_scrollbar_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -87,7 +87,7 @@ const PPB_Scrollbar_Dev g_ppb_scrollbar_thunk = { } // namespace -const PPB_Scrollbar_Dev* GetPPB_Scrollbar_Dev_Thunk() { +const PPB_Scrollbar_Dev_0_5* GetPPB_Scrollbar_Dev_0_5_Thunk() { return &g_ppb_scrollbar_thunk; } diff --git a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc b/ppapi/thunk/ppb_tcp_socket_private_thunk.cc index 245654d..9085e9b 100644 --- a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc +++ b/ppapi/thunk/ppb_tcp_socket_private_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -120,10 +120,9 @@ const PPB_TCPSocket_Private g_ppb_tcp_socket_thunk = { } // namespace -const PPB_TCPSocket_Private* GetPPB_TCPSocket_Private_Thunk() { +const PPB_TCPSocket_Private_0_3* GetPPB_TCPSocket_Private_0_3_Thunk() { return &g_ppb_tcp_socket_thunk; } } // namespace thunk } // namespace ppapi - diff --git a/ppapi/thunk/ppb_text_input_thunk.cc b/ppapi/thunk/ppb_text_input_thunk.cc index c0aba99..dda6864 100644 --- a/ppapi/thunk/ppb_text_input_thunk.cc +++ b/ppapi/thunk/ppb_text_input_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -39,7 +39,7 @@ const PPB_TextInput_Dev g_ppb_textinput_thunk = { } // namespace -const PPB_TextInput_Dev* GetPPB_TextInput_Dev_Thunk() { +const PPB_TextInput_Dev_0_1* GetPPB_TextInput_Dev_0_1_Thunk() { return &g_ppb_textinput_thunk; } diff --git a/ppapi/thunk/ppb_transport_thunk.cc b/ppapi/thunk/ppb_transport_thunk.cc index b0caae1..0e6e7d7 100644 --- a/ppapi/thunk/ppb_transport_thunk.cc +++ b/ppapi/thunk/ppb_transport_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -109,7 +109,7 @@ const PPB_Transport_Dev g_ppb_transport_thunk = { } // namespace -const PPB_Transport_Dev* GetPPB_Transport_Dev_Thunk() { +const PPB_Transport_Dev_0_7* GetPPB_Transport_Dev_0_7_Thunk() { return &g_ppb_transport_thunk; } diff --git a/ppapi/thunk/ppb_udp_socket_private_thunk.cc b/ppapi/thunk/ppb_udp_socket_private_thunk.cc index c2c4b5f..60e95fe 100644 --- a/ppapi/thunk/ppb_udp_socket_private_thunk.cc +++ b/ppapi/thunk/ppb_udp_socket_private_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -89,10 +89,9 @@ const PPB_UDPSocket_Private g_ppb_udp_socket_thunk = { } // namespace -const PPB_UDPSocket_Private* GetPPB_UDPSocket_Private_Thunk() { +const PPB_UDPSocket_Private_0_2* GetPPB_UDPSocket_Private_0_2_Thunk() { return &g_ppb_udp_socket_thunk; } } // namespace thunk } // namespace ppapi - diff --git a/ppapi/thunk/ppb_url_loader_thunk.cc b/ppapi/thunk/ppb_url_loader_thunk.cc index 236144f..719d443 100644 --- a/ppapi/thunk/ppb_url_loader_thunk.cc +++ b/ppapi/thunk/ppb_url_loader_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -139,11 +139,11 @@ const PPB_URLLoaderTrusted g_ppb_urlloader_trusted_thunk = { } // namespace -const PPB_URLLoader* GetPPB_URLLoader_Thunk() { +const PPB_URLLoader_1_0* GetPPB_URLLoader_1_0_Thunk() { return &g_ppb_urlloader_thunk; } -const PPB_URLLoaderTrusted* GetPPB_URLLoaderTrusted_Thunk() { +const PPB_URLLoaderTrusted_0_3* GetPPB_URLLoaderTrusted_0_3_Thunk() { return &g_ppb_urlloader_trusted_thunk; } diff --git a/ppapi/thunk/ppb_url_request_info_thunk.cc b/ppapi/thunk/ppb_url_request_info_thunk.cc index a5cca10..536753d 100644 --- a/ppapi/thunk/ppb_url_request_info_thunk.cc +++ b/ppapi/thunk/ppb_url_request_info_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -66,7 +66,7 @@ const PPB_URLRequestInfo g_ppb_url_request_info_thunk = { } // namespace -const PPB_URLRequestInfo* GetPPB_URLRequestInfo_Thunk() { +const PPB_URLRequestInfo_1_0* GetPPB_URLRequestInfo_1_0_Thunk() { return &g_ppb_url_request_info_thunk; } diff --git a/ppapi/thunk/ppb_url_response_info_thunk.cc b/ppapi/thunk/ppb_url_response_info_thunk.cc index 3fecb936..c0b36ff 100644 --- a/ppapi/thunk/ppb_url_response_info_thunk.cc +++ b/ppapi/thunk/ppb_url_response_info_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -39,7 +39,7 @@ const PPB_URLResponseInfo g_ppb_url_response_info_thunk = { } // namespace -const PPB_URLResponseInfo* GetPPB_URLResponseInfo_Thunk() { +const PPB_URLResponseInfo_1_0* GetPPB_URLResponseInfo_1_0_Thunk() { return &g_ppb_url_response_info_thunk; } diff --git a/ppapi/thunk/ppb_url_util_thunk.cc b/ppapi/thunk/ppb_url_util_thunk.cc index f1dbc27..3dc9f3a 100644 --- a/ppapi/thunk/ppb_url_util_thunk.cc +++ b/ppapi/thunk/ppb_url_util_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -66,7 +66,7 @@ const PPB_URLUtil_Dev g_ppb_url_util = { } // namespace -const PPB_URLUtil_Dev* GetPPB_URLUtil_Dev_Thunk() { +const PPB_URLUtil_Dev_0_6* GetPPB_URLUtil_Dev_0_6_Thunk() { return &g_ppb_url_util; } diff --git a/ppapi/thunk/ppb_video_capture_thunk.cc b/ppapi/thunk/ppb_video_capture_thunk.cc index f8704d0..fbd1f2b 100644 --- a/ppapi/thunk/ppb_video_capture_thunk.cc +++ b/ppapi/thunk/ppb_video_capture_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -65,7 +65,7 @@ const PPB_VideoCapture_Dev g_ppb_videocapture_thunk = { } // namespace -const PPB_VideoCapture_Dev* GetPPB_VideoCapture_Dev_Thunk() { +const PPB_VideoCapture_Dev_0_1* GetPPB_VideoCapture_Dev_0_1_Thunk() { return &g_ppb_videocapture_thunk; } diff --git a/ppapi/thunk/ppb_video_decoder_thunk.cc b/ppapi/thunk/ppb_video_decoder_thunk.cc index e1962cd..5ff707c 100644 --- a/ppapi/thunk/ppb_video_decoder_thunk.cc +++ b/ppapi/thunk/ppb_video_decoder_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -90,7 +90,7 @@ const PPB_VideoDecoder_Dev g_ppb_videodecoder_thunk = { } // namespace -const PPB_VideoDecoder_Dev* GetPPB_VideoDecoder_Dev_Thunk() { +const PPB_VideoDecoder_Dev_0_16* GetPPB_VideoDecoder_Dev_0_16_Thunk() { return &g_ppb_videodecoder_thunk; } diff --git a/ppapi/thunk/ppb_video_layer_thunk.cc b/ppapi/thunk/ppb_video_layer_thunk.cc index ea31b9f..dc1e842 100644 --- a/ppapi/thunk/ppb_video_layer_thunk.cc +++ b/ppapi/thunk/ppb_video_layer_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -73,7 +73,7 @@ const PPB_VideoLayer_Dev g_ppb_videolayer_thunk = { } // namespace -const PPB_VideoLayer_Dev* GetPPB_VideoLayer_Dev_Thunk() { +const PPB_VideoLayer_Dev_0_1* GetPPB_VideoLayer_Dev_0_1_Thunk() { return &g_ppb_videolayer_thunk; } diff --git a/ppapi/thunk/ppb_view_thunk.cc b/ppapi/thunk/ppb_view_thunk.cc index 04246c5..874513b 100644 --- a/ppapi/thunk/ppb_view_thunk.cc +++ b/ppapi/thunk/ppb_view_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -88,7 +88,7 @@ const PPB_View g_ppb_view_thunk = { } // namespace -const PPB_View* GetPPB_View_Thunk() { +const PPB_View* GetPPB_View_1_0_Thunk() { return &g_ppb_view_thunk; } diff --git a/ppapi/thunk/ppb_websocket_thunk.cc b/ppapi/thunk/ppb_websocket_thunk.cc index 87cb8c7..da93901 100644 --- a/ppapi/thunk/ppb_websocket_thunk.cc +++ b/ppapi/thunk/ppb_websocket_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -144,7 +144,7 @@ const PPB_WebSocket_Dev g_ppb_websocket_thunk = { } // namespace -const PPB_WebSocket_Dev* GetPPB_WebSocket_Dev_Thunk() { +const PPB_WebSocket_Dev_0_1* GetPPB_WebSocket_Dev_0_1_Thunk() { return &g_ppb_websocket_thunk; } diff --git a/ppapi/thunk/ppb_widget_thunk.cc b/ppapi/thunk/ppb_widget_thunk.cc index ec77352..94833eb 100644 --- a/ppapi/thunk/ppb_widget_thunk.cc +++ b/ppapi/thunk/ppb_widget_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -54,7 +54,7 @@ const PPB_Widget_Dev g_ppb_widget_thunk = { } // namespace -const PPB_Widget_Dev* GetPPB_Widget_Dev_Thunk() { +const PPB_Widget_Dev_0_3* GetPPB_Widget_Dev_0_3_Thunk() { return &g_ppb_widget_thunk; } diff --git a/ppapi/thunk/ppb_zoom_thunk.cc b/ppapi/thunk/ppb_zoom_thunk.cc index 699ad80..7ea903c 100644 --- a/ppapi/thunk/ppb_zoom_thunk.cc +++ b/ppapi/thunk/ppb_zoom_thunk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -35,7 +35,7 @@ const PPB_Zoom_Dev g_ppb_zoom_thunk = { } // namespace -const PPB_Zoom_Dev* GetPPB_Zoom_Dev_Thunk() { +const PPB_Zoom_Dev_0_2* GetPPB_Zoom_Dev_0_2_Thunk() { return &g_ppb_zoom_thunk; } diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h index a6a6ebb..c2394f2 100644 --- a/ppapi/thunk/thunk.h +++ b/ppapi/thunk/thunk.h @@ -1,10 +1,26 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. #ifndef PPAPI_THUNK_THUNK_H_ #define PPAPI_THUNK_THUNK_H_ +#include "ppapi/c/ppb_graphics_3d.h" +#include "ppapi/c/private/ppb_flash_clipboard.h" +#include "ppapi/c/private/ppb_flash_menu.h" +#include "ppapi/c/private/ppb_flash_net_connector.h" +#include "ppapi/c/private/ppb_flash_fullscreen.h" +#include "ppapi/c/private/ppb_instance_private.h" +#include "ppapi/c/private/ppb_tcp_socket_private.h" +#include "ppapi/c/private/ppb_udp_socket_private.h" +#include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h" +#include "ppapi/c/trusted/ppb_audio_trusted.h" +#include "ppapi/c/trusted/ppb_broker_trusted.h" +#include "ppapi/c/trusted/ppb_buffer_trusted.h" +#include "ppapi/c/trusted/ppb_file_chooser_trusted.h" +#include "ppapi/c/trusted/ppb_graphics_3d_trusted.h" +#include "ppapi/c/trusted/ppb_image_data_trusted.h" +#include "ppapi/c/trusted/ppb_url_loader_trusted.h" #include "ppapi/thunk/ppapi_thunk_export.h" // Declares a getter for the interface thunk of the form: @@ -27,48 +43,37 @@ #undef PROXIED_IFACE #undef IFACE -struct PPB_AudioInputTrusted_Dev; -struct PPB_AudioTrusted; -struct PPB_BrokerTrusted; -struct PPB_BufferTrusted; -struct PPB_FileChooserTrusted; -struct PPB_Flash_Clipboard; -struct PPB_Flash_Menu; -struct PPB_Flash_NetConnector; -struct PPB_Graphics3D; -struct PPB_Graphics3DTrusted; -struct PPB_ImageDataTrusted; -struct PPB_Instance_Private; -struct PPB_TCPSocket_Private; -struct PPB_UDPSocket_Private; -struct PPB_URLLoaderTrusted; - namespace ppapi { namespace thunk { // Old-style thunk getters. Only put trusted/private stuff here (it hasn't // yet been converted to the new system). Otherwise, add the declaration to // the appropriate interfaces_*.h file. -PPAPI_THUNK_EXPORT const PPB_AudioInputTrusted_Dev* - GetPPB_AudioInputTrusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_AudioTrusted* GetPPB_AudioTrusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_BrokerTrusted* GetPPB_Broker_Thunk(); -PPAPI_THUNK_EXPORT const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted* - GetPPB_FileChooser_Trusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard* GetPPB_Flash_Clipboard_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector* - GetPPB_Flash_NetConnector_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted* - GetPPB_Graphics3DTrusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk(); -PPAPI_THUNK_EXPORT const PPB_Instance_Private* GetPPB_Instance_Private_Thunk(); -PPAPI_THUNK_EXPORT const PPB_TCPSocket_Private* - GetPPB_TCPSocket_Private_Thunk(); -PPAPI_THUNK_EXPORT const PPB_UDPSocket_Private* - GetPPB_UDPSocket_Private_Thunk(); -PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted* GetPPB_URLLoaderTrusted_Thunk(); +PPAPI_THUNK_EXPORT const PPB_AudioInputTrusted_Dev_0_1* + GetPPB_AudioInputTrusted_0_1_Thunk(); +PPAPI_THUNK_EXPORT const PPB_AudioTrusted_0_6* GetPPB_AudioTrusted_0_6_Thunk(); +PPAPI_THUNK_EXPORT const PPB_BrokerTrusted_0_2* GetPPB_Broker_0_2_Thunk(); +PPAPI_THUNK_EXPORT const PPB_BufferTrusted_0_1* + GetPPB_BufferTrusted_0_1_Thunk(); +PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted_0_5* + GetPPB_FileChooser_Trusted_0_5_Thunk(); +PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard_3_0* + GetPPB_Flash_Clipboard_3_0_Thunk(); +PPAPI_THUNK_EXPORT const PPB_Flash_Menu_0_2* GetPPB_Flash_Menu_0_2_Thunk(); +PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector_0_2* + GetPPB_Flash_NetConnector_0_2_Thunk(); +PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted_1_0* + GetPPB_Graphics3DTrusted_1_0_Thunk(); +PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted_0_4* + GetPPB_ImageDataTrusted_0_4_Thunk(); +PPAPI_THUNK_EXPORT const PPB_Instance_Private_0_1* + GetPPB_Instance_Private_0_1_Thunk(); +PPAPI_THUNK_EXPORT const PPB_TCPSocket_Private_0_3* + GetPPB_TCPSocket_Private_0_3_Thunk(); +PPAPI_THUNK_EXPORT const PPB_UDPSocket_Private_0_2* + GetPPB_UDPSocket_Private_0_2_Thunk(); +PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted_0_3* + GetPPB_URLLoaderTrusted_0_3_Thunk(); } // namespace thunk } // namespace ppapi diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index 8b90fa8..55397c8 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -296,58 +296,58 @@ const void* GetInterface(const char* name) { // Please keep alphabetized by interface macro name with "special" stuff at // the bottom. - if (strcmp(name, PPB_AUDIO_INPUT_TRUSTED_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_AudioInputTrusted_Thunk(); - if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_AudioTrusted_Thunk(); - if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_BufferTrusted_Thunk(); - if (strcmp(name, PPB_CORE_INTERFACE) == 0) + if (strcmp(name, PPB_AUDIO_INPUT_TRUSTED_DEV_INTERFACE_0_1) == 0) + return ::ppapi::thunk::GetPPB_AudioInputTrusted_0_1_Thunk(); + if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE_0_6) == 0) + return ::ppapi::thunk::GetPPB_AudioTrusted_0_6_Thunk(); + if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE_0_1) == 0) + return ::ppapi::thunk::GetPPB_BufferTrusted_0_1_Thunk(); + if (strcmp(name, PPB_CORE_INTERFACE_1_0) == 0) return &core_interface; - if (strcmp(name, PPB_FILECHOOSER_TRUSTED_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_FileChooser_Trusted_Thunk(); + if (strcmp(name, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5) == 0) + return ::ppapi::thunk::GetPPB_FileChooser_Trusted_0_5_Thunk(); if (strcmp(name, PPB_FLASH_INTERFACE_11_0) == 0) return PPB_Flash_Impl::GetInterface11(); if (strcmp(name, PPB_FLASH_INTERFACE_12_0) == 0) - return PPB_Flash_Impl::GetInterface12(); - if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Flash_Clipboard_Thunk(); + return PPB_Flash_Impl::GetInterface12_0(); + if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE_3_0) == 0) + return ::ppapi::thunk::GetPPB_Flash_Clipboard_3_0_Thunk(); if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY) == 0) - return ::ppapi::thunk::GetPPB_Flash_Clipboard_Thunk(); + return ::ppapi::thunk::GetPPB_Flash_Clipboard_3_0_Thunk(); if (strcmp(name, PPB_FLASH_FILE_FILEREF_INTERFACE) == 0) return PPB_Flash_File_FileRef_Impl::GetInterface(); if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0) return PPB_Flash_File_ModuleLocal_Impl::GetInterface(); - if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk(); - if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_TCPSocket_Private_Thunk(); - if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Fullscreen_Thunk(); + if (strcmp(name, PPB_FLASH_MENU_INTERFACE_0_2) == 0) + return ::ppapi::thunk::GetPPB_Flash_Menu_0_2_Thunk(); + if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE_0_2) == 0) + return ::ppapi::thunk::GetPPB_TCPSocket_Private_0_3_Thunk(); + if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE_0_5) == 0) + return ::ppapi::thunk::GetPPB_Fullscreen_1_0_Thunk(); if (strcmp(name, PPB_GPU_BLACKLIST_INTERFACE) == 0) return PPB_GpuBlacklist_Private_Impl::GetInterface(); - if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk(); - if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk(); + if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE_1_0) == 0) + return ::ppapi::thunk::GetPPB_Graphics3DTrusted_1_0_Thunk(); + if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE_0_4) == 0) + return ::ppapi::thunk::GetPPB_ImageDataTrusted_0_4_Thunk(); if (strcmp(name, PPB_INPUT_EVENT_INTERFACE_1_0) == 0) - return ::ppapi::thunk::GetPPB_InputEvent_Thunk(); - if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_Instance_Private_Thunk(); + return ::ppapi::thunk::GetPPB_InputEvent_1_0_Thunk(); + if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE_0_1) == 0) + return ::ppapi::thunk::GetPPB_Instance_Private_0_1_Thunk(); if (strcmp(name, PPB_OPENGLES2_INTERFACE) == 0) return ::ppapi::PPB_OpenGLES2_Shared::GetInterface(); if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0) return PPB_Proxy_Impl::GetInterface(); if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0) return PPB_UMA_Private_Impl::GetInterface(); - if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0) - return ::ppapi::thunk::GetPPB_URLLoaderTrusted_Thunk(); + if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE_0_3) == 0) + return ::ppapi::thunk::GetPPB_URLLoaderTrusted_0_3_Thunk(); if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0) return PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface(); if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0) return ::ppapi::PPB_Var_Shared::GetVarInterface1_0(); if (strcmp(name, PPB_VAR_INTERFACE_1_1) == 0) - return ::ppapi::PPB_Var_Shared::GetVarInterface(); + return ::ppapi::PPB_Var_Shared::GetVarInterface1_1(); if (strcmp(name, PPB_VAR_ARRAY_BUFFER_DEV_INTERFACE) == 0) return ::ppapi::PPB_Var_Shared::GetVarArrayBufferInterface(); diff --git a/webkit/plugins/ppapi/plugin_module.h b/webkit/plugins/ppapi/plugin_module.h index c1e1c02..7634268 100644 --- a/webkit/plugins/ppapi/plugin_module.h +++ b/webkit/plugins/ppapi/plugin_module.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -20,11 +20,11 @@ #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_module.h" #include "ppapi/c/ppb.h" +#include "ppapi/c/ppb_core.h" #include "webkit/plugins/ppapi/plugin_delegate.h" #include "webkit/plugins/webkit_plugins_export.h" class FilePath; -struct PPB_Core; typedef void* NPIdentifier; namespace ppapi { diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 8f1ff5d..63536bc 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -956,7 +956,7 @@ bool PluginInstance::LoadMessagingInterface() { checked_for_plugin_messaging_interface_ = true; plugin_messaging_interface_ = static_cast<const PPP_Messaging*>(module_->GetPluginInterface( - PPP_MESSAGING_INTERFACE_1_0)); + PPP_MESSAGING_INTERFACE)); } return !!plugin_messaging_interface_; } @@ -974,8 +974,8 @@ bool PluginInstance::LoadMouseLockInterface() { bool PluginInstance::LoadPdfInterface() { if (!plugin_pdf_interface_) { plugin_pdf_interface_ = - static_cast<const PPP_Pdf*>(module_->GetPluginInterface( - PPP_PDF_INTERFACE)); + static_cast<const PPP_Pdf_1*>(module_->GetPluginInterface( + PPP_PDF_INTERFACE_1)); } return !!plugin_pdf_interface_; diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index 3e7f179..cbafec1 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -17,11 +17,19 @@ #include "googleurl/src/gurl.h" #include "ppapi/c/dev/pp_cursor_type_dev.h" #include "ppapi/c/dev/ppp_printing_dev.h" +#include "ppapi/c/dev/ppp_find_dev.h" +#include "ppapi/c/dev/ppp_selection_dev.h" +#include "ppapi/c/dev/ppp_zoom_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_input_event.h" +#include "ppapi/c/ppp_graphics_3d.h" +#include "ppapi/c/ppp_input_event.h" +#include "ppapi/c/ppp_messaging.h" +#include "ppapi/c/ppp_mouse_lock.h" +#include "ppapi/c/private/ppp_instance_private.h" #include "ppapi/shared_impl/function_group_base.h" #include "ppapi/shared_impl/ppb_instance_shared.h" #include "ppapi/shared_impl/ppb_view_shared.h" @@ -32,18 +40,10 @@ #include "ui/base/ime/text_input_type.h" #include "ui/gfx/rect.h" #include "webkit/plugins/ppapi/plugin_delegate.h" +#include "webkit/plugins/ppapi/ppp_pdf.h" #include "webkit/plugins/webkit_plugins_export.h" struct PP_Point; -struct PPP_Find_Dev; -struct PPP_Graphics3D; -struct PPP_InputEvent; -struct PPP_Instance_Private; -struct PPP_Messaging; -struct PPP_MouseLock; -struct PPP_Pdf; -struct PPP_Selection_Dev; -struct PPP_Zoom_Dev; class SkBitmap; class TransportDIB; diff --git a/webkit/plugins/ppapi/ppb_file_io_impl.h b/webkit/plugins/ppapi/ppb_file_io_impl.h index c57430b..27353c6 100644 --- a/webkit/plugins/ppapi/ppb_file_io_impl.h +++ b/webkit/plugins/ppapi/ppb_file_io_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,7 +14,6 @@ #include "webkit/plugins/ppapi/plugin_delegate.h" struct PP_CompletionCallback; -struct PPB_FileIO; namespace webkit { namespace ppapi { diff --git a/webkit/plugins/ppapi/ppb_file_system_impl.h b/webkit/plugins/ppapi/ppb_file_system_impl.h index 0f41561..c963ce3 100644 --- a/webkit/plugins/ppapi/ppb_file_system_impl.h +++ b/webkit/plugins/ppapi/ppb_file_system_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,11 +9,10 @@ #include "base/compiler_specific.h" #include "googleurl/src/gurl.h" #include "ppapi/c/pp_file_info.h" +#include "ppapi/c/ppb_file_system.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_file_system_api.h" -struct PPB_FileSystem; - namespace webkit { namespace ppapi { diff --git a/webkit/plugins/ppapi/ppb_flash_clipboard_impl.h b/webkit/plugins/ppapi/ppb_flash_clipboard_impl.h index 1c168fe..1d6fc47 100644 --- a/webkit/plugins/ppapi/ppb_flash_clipboard_impl.h +++ b/webkit/plugins/ppapi/ppb_flash_clipboard_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,8 +10,6 @@ #include "ppapi/shared_impl/function_group_base.h" #include "ppapi/thunk/ppb_flash_clipboard_api.h" -struct PPB_Flash_Clipboard; - namespace webkit { namespace ppapi { diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc index 40b8b96..c65fbcc 100644 --- a/webkit/plugins/ppapi/ppb_flash_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -275,7 +275,7 @@ const PPB_Flash_11* PPB_Flash_Impl::GetInterface11() { } // static -const PPB_Flash* PPB_Flash_Impl::GetInterface12() { +const PPB_Flash_12_0* PPB_Flash_Impl::GetInterface12_0() { return &ppb_flash_12; } diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h index b9b00aa..b1156c8 100644 --- a/webkit/plugins/ppapi/ppb_flash_impl.h +++ b/webkit/plugins/ppapi/ppb_flash_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -19,7 +19,7 @@ class PPB_Flash_Impl { // Returns a pointer to the interface implementing PPB_Flash that is // exposed to the plugin. static const PPB_Flash_11* GetInterface11(); - static const PPB_Flash* GetInterface12(); + static const PPB_Flash_12_0* GetInterface12_0(); private: DISALLOW_COPY_AND_ASSIGN(PPB_Flash_Impl); diff --git a/webkit/plugins/ppapi/ppb_graphics_2d_impl.h b/webkit/plugins/ppapi/ppb_graphics_2d_impl.h index 0257e4c..2cce83b 100644 --- a/webkit/plugins/ppapi/ppb_graphics_2d_impl.h +++ b/webkit/plugins/ppapi/ppb_graphics_2d_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -15,8 +15,6 @@ #include "ppapi/thunk/ppb_graphics_2d_api.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h" -struct PPB_Graphics2D; - namespace gfx { class Rect; } diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.h b/webkit/plugins/ppapi/ppb_video_decoder_impl.h index ac17497..3d5c9bb 100644 --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.h +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -11,6 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ppapi/c/dev/pp_video_dev.h" +#include "ppapi/c/dev/ppp_video_decoder_dev.h" #include "ppapi/c/pp_var.h" #include "ppapi/shared_impl/ppb_video_decoder_shared.h" #include "ppapi/shared_impl/resource.h" @@ -19,8 +20,6 @@ struct PP_PictureBuffer_Dev; struct PP_VideoBitstreamBuffer_Dev; -struct PPB_VideoDecoder_Dev; -struct PPP_VideoDecoder_Dev; namespace gpu { namespace gles2 { diff --git a/webkit/plugins/ppapi/ppb_websocket_impl.h b/webkit/plugins/ppapi/ppb_websocket_impl.h index 7ac9acd..c33df7f 100644 --- a/webkit/plugins/ppapi/ppb_websocket_impl.h +++ b/webkit/plugins/ppapi/ppb_websocket_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,8 +12,6 @@ #include "ppapi/thunk/ppb_websocket_api.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSocketClient.h" -struct PPB_Var; - namespace ppapi { class StringVar; } diff --git a/webkit/plugins/ppapi/ppp_pdf.h b/webkit/plugins/ppapi/ppp_pdf.h index 6405225..de491190 100644 --- a/webkit/plugins/ppapi/ppp_pdf.h +++ b/webkit/plugins/ppapi/ppp_pdf.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,12 +9,14 @@ #include "ppapi/c/pp_point.h" #include "ppapi/c/pp_var.h" -#define PPP_PDF_INTERFACE "PPP_Pdf;1" +#define PPP_PDF_INTERFACE_1 "PPP_Pdf;1" -struct PPP_Pdf { +struct PPP_Pdf_1 { // Returns an absolute URL if the position is over a link. PP_Var (*GetLinkAtPosition)(PP_Instance instance, PP_Point point); }; +typedef PPP_Pdf_1 PPP_Pdf; + #endif // WEBKIT_PLUGINS_PPAPI_PPP_PDF_H_ diff --git a/webkit/plugins/ppapi/url_request_info_unittest.cc b/webkit/plugins/ppapi/url_request_info_unittest.cc index c7f1720..21fd92c 100644 --- a/webkit/plugins/ppapi/url_request_info_unittest.cc +++ b/webkit/plugins/ppapi/url_request_info_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -123,7 +123,7 @@ WebFrame* URLRequestInfoTest::frame_; TEST_F(URLRequestInfoTest, GetInterface) { const PPB_URLRequestInfo* request_info = - ::ppapi::thunk::GetPPB_URLRequestInfo_Thunk(); + ::ppapi::thunk::GetPPB_URLRequestInfo_1_0_Thunk(); EXPECT_TRUE(request_info); EXPECT_TRUE(request_info->Create); EXPECT_TRUE(request_info->IsURLRequestInfo); @@ -257,4 +257,3 @@ TEST_F(URLRequestInfoTest, SetHeaders) { } // namespace ppapi } // namespace webkit - |