diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 00:09:28 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 00:09:28 +0000 |
| commit | 9b37f48059bebc7fbc7ce51203ebb1eaea873548 (patch) | |
| tree | 90b6d2bbb47f14fc502c50efd7bb386a5790fe9d /ppapi/c | |
| parent | 5eef288b86b805e5d0d18d9a83a1d5416655a330 (diff) | |
| download | chromium_src-9b37f48059bebc7fbc7ce51203ebb1eaea873548.zip chromium_src-9b37f48059bebc7fbc7ce51203ebb1eaea873548.tar.gz chromium_src-9b37f48059bebc7fbc7ce51203ebb1eaea873548.tar.bz2 | |
More trivial cleanupi of ppapi/c headers
These headers were autogenerated from ppapi/api/*.idl
BUG= http://code.google.com/p/chromium/issues/detail?id=76271^M
TEST= run try
Review URL: http://codereview.chromium.org/7399016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c')
34 files changed, 376 insertions, 476 deletions
diff --git a/ppapi/c/pp_bool.h b/ppapi/c/pp_bool.h index acd7ce1..6b356aa 100644 --- a/ppapi/c/pp_bool.h +++ b/ppapi/c/pp_bool.h @@ -2,6 +2,9 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + +/* From pp_bool.idl modified Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_BOOL_H_ #define PPAPI_C_PP_BOOL_H_ @@ -13,12 +16,11 @@ * headers. */ + /** - * * @addtogroup Enums * @{ */ - /** * The <code>PP_Bool</code> enum is a boolean value for use in PPAPI C headers. * The standard bool type is not available to pre-C99 compilers, and is not @@ -48,6 +50,7 @@ inline PP_Bool PP_FromBool(bool b) { inline bool PP_ToBool(PP_Bool b) { return (b != PP_FALSE); } + #endif // __cplusplus #endif /* PPAPI_C_PP_BOOL_H_ */ diff --git a/ppapi/c/pp_completion_callback.h b/ppapi/c/pp_completion_callback.h index 2b1cfe7..37d3674 100644 --- a/ppapi/c/pp_completion_callback.h +++ b/ppapi/c/pp_completion_callback.h @@ -2,24 +2,25 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_COMPLETION_CALLBACK_H_ #define PPAPI_C_PP_COMPLETION_CALLBACK_H_ +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_stdint.h" + /** * @file * This file defines the API to create and run a callback. */ -#include <stdlib.h> - -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_stdint.h" /** * @addtogroup Typedefs * @{ */ - /** * PP_CompletionCallback_Func defines the function signature that you implement * to receive callbacks on asynchronous completion of an operation. @@ -37,11 +38,9 @@ typedef void (*PP_CompletionCallback_Func)(void* user_data, int32_t result); */ /** - * * @addtogroup Enums * @{ */ - /** * This enumeration contains flags used to control how non-NULL callbacks are * scheduled by asynchronous methods. @@ -72,7 +71,6 @@ typedef enum { PP_COMPLETIONCALLBACK_FLAG_OPTIONAL = 1 << 0 } PP_CompletionCallback_Flag; PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CompletionCallback_Flag, 4); - /** * @} */ @@ -81,7 +79,6 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CompletionCallback_Flag, 4); * @addtogroup Structs * @{ */ - /** * Any method that takes a PP_CompletionCallback can complete asynchronously. * Refer to PP_CompletionCallback_Flag for more information. @@ -100,6 +97,8 @@ struct PP_CompletionCallback { * @} */ +#include <stdlib.h> + /** * @addtogroup Functions * @{ @@ -219,3 +218,4 @@ PP_INLINE void PP_RunAndClearCompletionCallback( */ #endif /* PPAPI_C_PP_COMPLETION_CALLBACK_H_ */ + diff --git a/ppapi/c/pp_errors.h b/ppapi/c/pp_errors.h index 055584e..13ed316 100644 --- a/ppapi/c/pp_errors.h +++ b/ppapi/c/pp_errors.h @@ -2,20 +2,24 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + +/* From pp_errors.idl modified Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_ERRORS_H_ #define PPAPI_C_PP_ERRORS_H_ +#include "ppapi/c/pp_macros.h" + /** * @file * This file defines an enumeration of all PPAPI error codes. */ + /** - * * @addtogroup Enums * @{ */ - /** * This enumeration contains enumerators of all PPAPI error codes. * Errors are negative valued. @@ -27,7 +31,6 @@ enum { * asynchronous completion. */ PP_OK = 0, - /** * This value is returned by a function that accepts a PP_CompletionCallback * and cannot complete synchronously. This code indicates that the given @@ -35,75 +38,58 @@ enum { * available. */ PP_OK_COMPLETIONPENDING = -1, - /** This value indicates failure for unspecified reasons. */ PP_ERROR_FAILED = -2, - /** * This value indicates failure due to an asynchronous operation being * interrupted, typically as a result of user action. */ PP_ERROR_ABORTED = -3, - /** This value indicates failure due to an invalid argument. */ PP_ERROR_BADARGUMENT = -4, - /** This value indicates failure due to an invalid PP_Resource. */ PP_ERROR_BADRESOURCE = -5, - /** This value indicates failure due to an unavailable PPAPI interface. */ PP_ERROR_NOINTERFACE = -6, - /** This value indicates failure due to insufficient privileges. */ PP_ERROR_NOACCESS = -7, - /** This value indicates failure due to insufficient memory. */ PP_ERROR_NOMEMORY = -8, - /** This value indicates failure due to insufficient storage space. */ PP_ERROR_NOSPACE = -9, - /** This value indicates failure due to insufficient storage quota. */ PP_ERROR_NOQUOTA = -10, - /** * This value indicates failure due to an action already being in * progress. */ PP_ERROR_INPROGRESS = -11, - + /** This value indicates failure due to a file that does not exist. */ /** * The requested command is not supported by the browser. */ PP_ERROR_NOTSUPPORTED = -12, - - /** This value indicates failure due to a file that does not exist. */ PP_ERROR_FILENOTFOUND = -20, - /** This value indicates failure due to a file that already exists. */ PP_ERROR_FILEEXISTS = -21, - /** This value indicates failure due to a file that is too big. */ PP_ERROR_FILETOOBIG = -22, - /** * This value indicates failure due to a file having been modified * unexpectedly. */ PP_ERROR_FILECHANGED = -23, - /** This value indicates failure due to a time limit being exceeded. */ PP_ERROR_TIMEDOUT = -30, - /** * This value indicates that the user cancelled rather than providing * expected input. */ PP_ERROR_USERCANCEL = -40 }; - /** * @} */ #endif /* PPAPI_C_PP_ERRORS_H_ */ + diff --git a/ppapi/c/pp_file_info.h b/ppapi/c/pp_file_info.h index e433b5d..8df6076 100644 --- a/ppapi/c/pp_file_info.h +++ b/ppapi/c/pp_file_info.h @@ -2,6 +2,9 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_FILE_INFO_H_ #define PPAPI_C_PP_FILE_INFO_H_ @@ -14,11 +17,11 @@ * This file defines three enumerations for use in the PPAPI C file IO APIs. */ + /** * @addtogroup Enums * @{ */ - /** * The <code>PP_FileType</code> enum contains file type constants. */ @@ -61,29 +64,24 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileSystemType, 4); struct PP_FileInfo { /** This value represents the size of the file measured in bytes */ int64_t size; - /** * This value represents the type of file as defined by the * <code>PP_FileType</code> enum */ PP_FileType type; - /** * This value represents the file system type of the file as defined by the * <code>PP_FileSystemType</code> enum. */ PP_FileSystemType system_type; - /** * This value represents the creation time of the file. */ PP_Time creation_time; - /** * This value represents the last time the file was accessed. */ PP_Time last_access_time; - /** * This value represents the last time the file was modified. */ @@ -95,3 +93,4 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_FileInfo, 40); */ #endif /* PPAPI_C_PP_FILE_INFO_H_ */ + diff --git a/ppapi/c/pp_input_event.h b/ppapi/c/pp_input_event.h index 8b60783..0c7854c 100644 --- a/ppapi/c/pp_input_event.h +++ b/ppapi/c/pp_input_event.h @@ -2,14 +2,12 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_INPUT_EVENT_H_ #define PPAPI_C_PP_INPUT_EVENT_H_ -/** - * @file - * This file defines the API used to handle mouse and keyboard input events. - */ - #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_stdint.h" @@ -17,10 +15,15 @@ #include "ppapi/c/ppb_input_event.h" /** + * @file + * This file defines the API used to handle mouse and keyboard input events. + */ + + +/** * @addtogroup Structs * @{ */ - /** * The <code>PP_InputEvent_Key</code> struct represents a key up or key down * event. @@ -41,23 +44,13 @@ struct PP_InputEvent_Key { /** This value is a bit field combination of the EVENT_MODIFIER flags. */ uint32_t modifier; - /** * This value reflects the DOM KeyboardEvent <code>keyCode</code> field. * Chrome populates this with the Windows-style Virtual Key code of the key. */ - uint32_t key_code; }; PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent_Key, 8); -/** - * @} - */ - -/** - * @addtogroup Structs - * @{ - */ /** * The <code>PP_InputEvent_Character</code> struct represents a typed character @@ -83,7 +76,6 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent_Key, 8); struct PP_InputEvent_Character { /** A combination of the <code>PP_InputEvent_Modifier</code> flags. */ uint32_t modifier; - /** * This value represents the typed character as a single null-terminated UTF-8 * character. Any unused bytes will be filled with null bytes. Since the @@ -93,14 +85,6 @@ struct PP_InputEvent_Character { char text[5]; }; PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent_Character, 12); -/** - * @} - */ - -/** - * @addtogroup Structs - * @{ - */ /** * The <code>PP_InputEvent_Mouse</code> struct represents all mouse events @@ -112,14 +96,12 @@ struct PP_InputEvent_Mouse { * <code>PP_InputEvent_Modifier</code> flags. */ uint32_t modifier; - /** * This value represents the button that changed for mouse down or up events. * This value will be <code>PP_EVENT_MOUSEBUTTON_NONE</code> for mouse move, * enter, and leave events. */ PP_InputEvent_MouseButton button; - /** * This values represents the x coordinate of the mouse when the event * occurred. @@ -140,19 +122,10 @@ struct PP_InputEvent_Mouse { * plugin will give non-integer values. */ float y; - - // TODO(brettw) figure out exactly what this means. + /* TODO(brettw) figure out exactly what this means. */ int32_t click_count; }; PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent_Mouse, 20); -/** - * @} - */ - -/** - * @addtogroup Structs - * @{ - */ /** * The <code>PP_InputEvent_Wheel</code> struct represents all mouse wheel @@ -164,7 +137,6 @@ struct PP_InputEvent_Wheel { * flags. */ uint32_t modifier; - /** * Indicates the amount vertically and horizontally the user has requested * to scroll by with their mouse wheel. A scroll down or to the right (where @@ -187,10 +159,8 @@ struct PP_InputEvent_Wheel { * "clicks". */ float delta_x; - /** This value represents */ float delta_y; - /** * The number of "clicks" of the scroll wheel that have produced the * event. The value may have system-specific acceleration applied to it, @@ -210,10 +180,8 @@ struct PP_InputEvent_Wheel { * of scrolling as for a mouse that has a discrete mouse wheel. */ float wheel_ticks_x; - /** This value represents */ float wheel_ticks_y; - /** * Indicates if the scroll <code>delta_x</code>/<code>delta_y</code> * indicates pages or lines to scroll by. When true, the user is requesting @@ -222,15 +190,6 @@ struct PP_InputEvent_Wheel { PP_Bool scroll_by_page; }; PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent_Wheel, 24); -/** - * @} - */ - -/** - * - * @addtogroup Structs - * @{ - */ /** * The PP_InputEventData union represents all input event data types. @@ -240,22 +199,12 @@ union PP_InputEventData { struct PP_InputEvent_Character character; struct PP_InputEvent_Mouse mouse; struct PP_InputEvent_Wheel wheel; - /** * This value allows new events to be added without changing the size of * this struct. */ char padding[64]; }; -/** - * @} - */ - -/** - * - * @addtogroup Structs - * @{ - */ /** * The PP_InputEvent struct represents all input events. @@ -263,25 +212,21 @@ union PP_InputEventData { struct PP_InputEvent { /** This value represents the type of the event. */ PP_InputEvent_Type type; - /** This value ensure the time_stamp is aligned on an 8-byte boundary * relative to the start of the struct. Some compilers align doubles * on 8-byte boundaries for 32-bit x86, and some align on 4-byte boundaries. */ int32_t padding; - /** * This value represents the time that this event was generated. This value * is not relative to any particular epoch; the most you can do is compare * time stamps. */ PP_TimeTicks time_stamp; - /** * This value represents the event type and its specific data. */ union PP_InputEventData u; - }; PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent, 80); /** @@ -289,3 +234,4 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent, 80); */ #endif /* PPAPI_C_PP_INPUT_EVENT_H_ */ + diff --git a/ppapi/c/pp_instance.h b/ppapi/c/pp_instance.h index 458c92b..bd6b7ab 100644 --- a/ppapi/c/pp_instance.h +++ b/ppapi/c/pp_instance.h @@ -1,24 +1,27 @@ -/* Copyright (c) 2010 The Chromium Authors. All rights reserved. +/* 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. */ + +/* From pp_instance.idl modified Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_INSTANCE_H_ #define PPAPI_C_PP_INSTANCE_H_ +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_stdint.h" + /** * @file * This file defines the PP_Instance type which uniquely identifies one module * instance. */ -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_stdint.h" /** * @addtogroup Typedefs * @{ */ - /** * The <code>PP_Instance</code> value uniquely identifies one instance of a * module (.nexe/PP_Module). There will be one module instance for every diff --git a/ppapi/c/pp_macros.h b/ppapi/c/pp_macros.h index 0cda905..e5cd7dd 100644 --- a/ppapi/c/pp_macros.h +++ b/ppapi/c/pp_macros.h @@ -1,14 +1,22 @@ -/* Copyright (c) 2010 The Chromium Authors. All rights reserved. +/* 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. */ + +/* From pp_macros.idl modified Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_MACROS_H_ #define PPAPI_C_PP_MACROS_H_ + /** * @file * Defines the API ... - * + */ + + + +/* * @addtogroup PP * @{ */ diff --git a/ppapi/c/pp_module.h b/ppapi/c/pp_module.h index ffd24a5..1607190 100644 --- a/ppapi/c/pp_module.h +++ b/ppapi/c/pp_module.h @@ -1,25 +1,27 @@ -/* Copyright (c) 2010 The Chromium Authors. All rights reserved. +/* 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. */ + +/* From pp_module.idl modified Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_MODULE_H_ #define PPAPI_C_PP_MODULE_H_ +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_stdint.h" + /** * @file * This file defines the PP_Module type which uniquely identifies the module * or .nexe. */ -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_stdint.h" /** - * * @addtogroup Typedefs * @{ */ - /** * The PP_Module value uniquely identifies the module or .nexe. * diff --git a/ppapi/c/pp_point.h b/ppapi/c/pp_point.h index ed5f3d3..a6678a6 100644 --- a/ppapi/c/pp_point.h +++ b/ppapi/c/pp_point.h @@ -2,24 +2,26 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_POINT_H_ #define PPAPI_C_PP_POINT_H_ +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_stdint.h" + /** * @file * This file defines the API to create a 2 dimensional point. * 0,0 is the upper-left starting coordinate. */ -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_stdint.h" /** - * * @addtogroup Structs * @{ */ - /** * The PP_Point structure defines the integer x and y coordinates of a point. */ @@ -29,7 +31,6 @@ struct PP_Point { * as the left-most coordinate. */ int32_t x; - /** * This value represents the vertical coordinate of a point, starting with 0 * as the top-most coordinate. diff --git a/ppapi/c/pp_rect.h b/ppapi/c/pp_rect.h index b528b24..7aa42c1 100644 --- a/ppapi/c/pp_rect.h +++ b/ppapi/c/pp_rect.h @@ -2,36 +2,37 @@ * 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. */ + #ifndef PPAPI_C_PP_RECT_H_ #define PPAPI_C_PP_RECT_H_ +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_point.h" +#include "ppapi/c/pp_size.h" +#include "ppapi/c/pp_stdint.h" + /** * @file * This file defines the APIs for creating a 2 dimensional rectangle. */ -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_point.h" -#include "ppapi/c/pp_size.h" -#include "ppapi/c/pp_stdint.h" /** * @addtogroup Structs * @{ */ - /** * The <code>PP_Rect</code> struct contains the size and location of a 2D * rectangle. */ struct PP_Rect { - /** * This value represents the x and y coordinates of the upper-left corner of * the rectangle. */ struct PP_Point point; - /** This value represents the width and height of the rectangle. */ struct PP_Size size; }; @@ -40,6 +41,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_Rect, 16); * @} */ + /** * @addtogroup Functions * @{ @@ -70,5 +72,6 @@ PP_INLINE struct PP_Rect PP_MakeRectFromXYWH(int32_t x, int32_t y, /** * @} */ + #endif /* PPAPI_C_PP_RECT_H_ */ diff --git a/ppapi/c/pp_resource.h b/ppapi/c/pp_resource.h index e9ea9c5..2ea82bc 100644 --- a/ppapi/c/pp_resource.h +++ b/ppapi/c/pp_resource.h @@ -2,6 +2,9 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + +/* From pp_resource.idl modified Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PP_RESOURCE_H_ #define PPAPI_C_PP_RESOURCE_H_ @@ -14,11 +17,11 @@ * associated with the module. */ + /** * @addtogroup Typedefs * @{ */ - /** * This typdef represents an opaque handle assigned by the browser to the * resource. The handle is guaranteed never to be 0 for a valid resource, so a diff --git a/ppapi/c/pp_size.h b/ppapi/c/pp_size.h index 8c43451..a1d2a01 100644 --- a/ppapi/c/pp_size.h +++ b/ppapi/c/pp_size.h @@ -2,22 +2,25 @@ * 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. */ + #ifndef PPAPI_C_PP_SIZE_H_ #define PPAPI_C_PP_SIZE_H_ +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_stdint.h" + /** * @file * This file defines the width and height of a 2D rectangle. */ -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_stdint.h" /** * @addtogroup Structs * @{ */ - /** * The <code>PP_Size</code> struct contains the size of a 2D rectangle. */ diff --git a/ppapi/c/pp_time.h b/ppapi/c/pp_time.h index 717507b..103e405 100644 --- a/ppapi/c/pp_time.h +++ b/ppapi/c/pp_time.h @@ -2,15 +2,20 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + +/* From pp_time.idl modified Tue Jul 5 16:02:03 2011. */ + #ifndef PPAPI_C_PP_TIME_H_ #define PPAPI_C_PP_TIME_H_ +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_stdint.h" + /** * @file * This file defines time and time ticks types. */ -#include "ppapi/c/pp_macros.h" /** * @addtogroup Typedefs @@ -23,15 +28,8 @@ */ typedef double PP_Time; PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Time, 8); -/** - * @} - */ /** - * @addtogroup Typedefs - * @{ - */ -/** * A <code>PP_TimeTicks</code> value represents time ticks which are measured * in seconds and are used for indicating the time that certain messages were * received. In contrast to <code>PP_Time</code>, <code>PP_TimeTicks</code> diff --git a/ppapi/c/pp_var.h b/ppapi/c/pp_var.h index 34b364a..b496739 100644 --- a/ppapi/c/pp_var.h +++ b/ppapi/c/pp_var.h @@ -2,6 +2,9 @@ * 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 Tue Jul 12 15:26:30 2011. */ + #ifndef PPAPI_C_PP_VAR_H_ #define PPAPI_C_PP_VAR_H_ @@ -15,12 +18,11 @@ * your module and the page. */ + /** - * * @addtogroup Enums * @{ */ - /** * The <code>PP_VarType</code> is an enumeration of the different types that * can be contained within a <code>PP_Var</code> structure. @@ -30,42 +32,35 @@ typedef enum { * An undefined value. */ PP_VARTYPE_UNDEFINED, - /** * A NULL value. This is similar to undefined, but JavaScript differentiates * the two so it is exposed here as well. */ PP_VARTYPE_NULL, - /** * A boolean value, use the <code>as_bool</code> member of the var. */ PP_VARTYPE_BOOL, - /** * A 32-bit integer value. Use the <code>as_int</code> member of the var. */ PP_VARTYPE_INT32, - /** * A double-precision floating point value. Use the <code>as_double</code> * member of the var. */ PP_VARTYPE_DOUBLE, - /** * The Var represents a string. The <code>as_id</code> field is used to * identify the string, which may be created and retrieved from the * <code>PPB_Var</code> interface. */ PP_VARTYPE_STRING, - /** * Represents a JavaScript object. This vartype is not currently usable * from modules, although it is used internally for some tasks. */ PP_VARTYPE_OBJECT, - /** * Arrays and dictionaries are not currently supported but will be added * in future revisions. These objects are reference counted so be sure @@ -80,12 +75,10 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VarType, 4); * @} */ - /** * @addtogroup Structs * @{ */ - /** * The PP_VarValue union stores the data for any one of the types listed * in the PP_VarType enum. @@ -97,21 +90,18 @@ union PP_VarValue { * <code>PP_Bool</code>. */ PP_Bool as_bool; - /** * If <code>type</code> is <code>PP_VARTYPE_INT32</code>, * <code>as_int</code> represents the value of this <code>PP_Var</code> as * <code>int32_t</code>. */ int32_t as_int; - /** * If <code>type</code> is <code>PP_VARTYPE_DOUBLE</code>, * <code>as_double</code> represents the value of this <code>PP_Var</code> * as <code>double</code>. */ double as_double; - /** * If <code>type</code> is <code>PP_VARTYPE_STRING</code>, * <code>PP_VARTYPE_OBJECT</code>, <code>PP_VARTYPE_ARRAY</code>, or @@ -123,15 +113,6 @@ union PP_VarValue { */ int64_t as_id; }; -/** - * @} - */ - - -/** - * @addtogroup Structs - * @{ - */ /** * The <code>PP_VAR</code> struct is a variant data type and can contain any @@ -149,7 +130,6 @@ union PP_VarValue { */ struct PP_Var { PP_VarType type; - /** * The <code>padding</code> ensures <code>value</code> is aligned on an * 8-byte boundary relative to the start of the struct. Some compilers @@ -157,7 +137,6 @@ struct PP_Var { * 4-byte boundaries. */ int32_t padding; - /** * This <code>value</code> represents the contents of the PP_Var. Only one of * the fields of <code>value</code> is valid at a time based upon diff --git a/ppapi/c/ppb.h b/ppapi/c/ppb.h index 52a35f0..c3109d9 100644 --- a/ppapi/c/ppb.h +++ b/ppapi/c/ppb.h @@ -2,20 +2,26 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + +/* From ppb.idl modified Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_H_ #define PPAPI_C_PPB_H_ +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_stdint.h" + /** * @file * This file defines a function pointer type for the * <code>PPB_GetInterface</code> function. */ + /** * @addtogroup Typedefs * @{ */ - /** * This function pointer type defines the signature for the * <code>PPB_GetInterface</code> function. A generic @@ -37,5 +43,6 @@ typedef const void* (*PPB_GetInterface)(const char* interface_name); /** * @} */ + #endif /* PPAPI_C_PPB_H_ */ diff --git a/ppapi/c/ppb_audio.h b/ppapi/c/ppb_audio.h index 564a2b0..58f5f91 100644 --- a/ppapi/c/ppb_audio.h +++ b/ppapi/c/ppb_audio.h @@ -2,29 +2,29 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_AUDIO_H_ #define PPAPI_C_PPB_AUDIO_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" -#define PPB_AUDIO_INTERFACE_0_6 "PPB_Audio;0.6" -#define PPB_AUDIO_INTERFACE_1_0 "PPB_Audio;1.0" -#define PPB_AUDIO_INTERFACE PPB_AUDIO_INTERFACE_1_0 - /** * @file * This file defines the <code>PPB_Audio</code> interface, which provides * realtime stereo audio streaming capabilities. */ + /** * @addtogroup Typedefs * @{ */ - /** * <code>PPB_Audio_Callback</code> defines the type of an audio callback * function used to fill the audio buffer with data. Please see the @@ -71,6 +71,10 @@ typedef void (*PPB_Audio_Callback)(void* sample_buffer, * * ...audio_callback() will now be periodically invoked on a seperate thread... */ +#define PPB_AUDIO_INTERFACE_0_6 "PPB_Audio;0.6" +#define PPB_AUDIO_INTERFACE_1_0 "PPB_Audio;1.0" +#define PPB_AUDIO_INTERFACE PPB_AUDIO_INTERFACE_1_0 + struct PPB_Audio { /** * Create is a pointer to a function that creates an audio resource. @@ -107,7 +111,6 @@ struct PPB_Audio { * an Audio resource, otherwise PP_FALSE. */ PP_Bool (*IsAudio)(PP_Resource resource); - /** * GetCurrrentConfig is a pointer to a function that returns an audio config * resource for the given audio resource. @@ -117,7 +120,6 @@ struct PPB_Audio { * @return A PP_Resource containing the audio config resource if successful. */ PP_Resource (*GetCurrentConfig)(PP_Resource audio); - /** * StartPlayback is a pointer to a function that starts the playback of * the audio resource and begins periodically calling the callback. @@ -129,7 +131,6 @@ struct PPB_Audio { * in progress. */ PP_Bool (*StartPlayback)(PP_Resource audio); - /** * StopPlayback is a pointer to a function that stops the playback of * the audio resource. diff --git a/ppapi/c/ppb_audio_config.h b/ppapi/c/ppb_audio_config.h index 71d486d..f1425b8 100644 --- a/ppapi/c/ppb_audio_config.h +++ b/ppapi/c/ppb_audio_config.h @@ -2,6 +2,9 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_AUDIO_CONFIG_H_ #define PPAPI_C_PPB_AUDIO_CONFIG_H_ @@ -11,22 +14,17 @@ #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" -#define PPB_AUDIO_CONFIG_INTERFACE_0_5 "PPB_AudioConfig;0.5" -#define PPB_AUDIO_CONFIG_INTERFACE_1_0 "PPB_AudioConfig;1.0" -#define PPB_AUDIO_CONFIG_INTERFACE PPB_AUDIO_CONFIG_INTERFACE_1_0 - /** * @file * This file defines the PPB_AudioConfig interface for establishing an * audio configuration resource within the browser. */ + /** - * * @addtogroup Enums * @{ */ - /** * This enumeration contains audio frame count constants. * <code>PP_AUDIOMINSAMPLEFRAMECOUNT</code> is the minimum possible frame @@ -37,15 +35,6 @@ enum { PP_AUDIOMINSAMPLEFRAMECOUNT = 64, PP_AUDIOMAXSAMPLEFRAMECOUNT = 32768 }; -/** - * @} - */ - -/** - * - * @addtogroup Enums - * @{ - */ /** * PP_AudioSampleRate is an enumeration of the different audio sampling rates. @@ -67,7 +56,6 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_AudioSampleRate, 4); * @addtogroup Interfaces * @{ */ - /** * The <code>PPB_AudioConfig</code> interface contains pointers to several * functions for establishing your audio configuration within the browser. @@ -77,6 +65,10 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_AudioSampleRate, 4); * <a href="/chrome/nativeclient/docs/audio.html">Pepper * Audio API Code Walkthrough</a> for information on using this interface. */ +#define PPB_AUDIO_CONFIG_INTERFACE_0_5 "PPB_AudioConfig;0.5" +#define PPB_AUDIO_CONFIG_INTERFACE_1_0 "PPB_AudioConfig;1.0" +#define PPB_AUDIO_CONFIG_INTERFACE PPB_AUDIO_CONFIG_INTERFACE_1_0 + struct PPB_AudioConfig { /** * CreateStereo16bit() creates a 16 bit audio configuration resource. The @@ -107,7 +99,6 @@ struct PPB_AudioConfig { * <code>PP_AUDIOSAMPLERATE_48000</code>. * @param[in] sample_frame_count A <code>uint32_t</code> frame count returned * from the <code>RecommendSampleFrameCount</code> function. - * * @return A <code>PP_Resource</code> containing the * <code>PPB_Audio_Config</code> if successful or a null resource if the * sample frame count or bit rate are not supported. @@ -115,7 +106,6 @@ struct PPB_AudioConfig { PP_Resource (*CreateStereo16Bit)(PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count); - /** * RecommendSampleFrameCount() returns the supported sample frame count * closest to the requested count. The sample frame count determines the @@ -135,45 +125,39 @@ struct PPB_AudioConfig { * <code>PP_AUDIOSAMPLERATE_48000.</code> * @param[in] requested_sample_frame_count A <code>uint_32t</code> requested * frame count. - * * @return A <code>uint32_t</code> containing the recommended sample frame * count if successful. */ - uint32_t (*RecommendSampleFrameCount)(PP_AudioSampleRate sample_rate, - uint32_t requested_sample_frame_count); - + uint32_t (*RecommendSampleFrameCount)( + PP_AudioSampleRate sample_rate, + uint32_t requested_sample_frame_count); /** * IsAudioConfig() determines if the given resource is a * <code>PPB_Audio_Config</code>. * * @param[in] resource A <code>PP_Resource</code> containing the audio config * resource. - * * @return A <code>PP_BOOL</code> containing <code>PP_TRUE</code> if the given * resource is an <code>AudioConfig</code> resource, otherwise * <code>PP_FALSE</code>. */ PP_Bool (*IsAudioConfig)(PP_Resource resource); - /** * GetSampleRate() returns the sample rate for the given * <code>PPB_Audio_Config</code>. * * @param[in] config A <code>PP_Resource</code> containing the * <code>PPB_Audio_Config</code>. - * * @return A <code>PP_AudioSampleRate</code> containing sample rate or * <code>PP_AUDIOSAMPLERATE_NONE</code> if the resource is invalid. */ PP_AudioSampleRate (*GetSampleRate)(PP_Resource config); - /** * GetSampleFrameCount() returns the sample frame count for the given * <code>PPB_Audio_Config</code>. * * @param[in] config A <code>PP_Resource</code> containing the audio config * resource. - * * @return A <code>uint32_t</code> containing sample frame count or * 0 if the resource is invalid. See <code>RecommendSampleFrameCount</code> * for more on sample frame counts. diff --git a/ppapi/c/ppb_core.h b/ppapi/c/ppb_core.h index 964d442..ca8b6a7 100644 --- a/ppapi/c/ppb_core.h +++ b/ppapi/c/ppb_core.h @@ -2,19 +2,19 @@ * 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 Mon Jul 18 12:14:19 2011. */ + #ifndef PPAPI_C_PPB_CORE_H_ #define PPAPI_C_PPB_CORE_H_ #include "ppapi/c/pp_bool.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_time.h" -struct PP_CompletionCallback; - -#define PPB_CORE_INTERFACE_1_0 "PPB_Core;1.0" -#define PPB_CORE_INTERFACE PPB_CORE_INTERFACE_1_0 - /** * @file * This file defines the <code>PPB_Core</code> interface defined by the browser @@ -22,16 +22,19 @@ struct PP_CompletionCallback; * threads. */ + /** * @addtogroup Interfaces * @{ */ - /** * The <code>PPB_Core</code> interface contains pointers to functions related * to memory management, time, and threads on the browser. * */ +#define PPB_CORE_INTERFACE_1_0 "PPB_Core;1.0" +#define PPB_CORE_INTERFACE PPB_CORE_INTERFACE_1_0 + struct PPB_Core { /** * @@ -40,14 +43,12 @@ struct PPB_Core { * @param[in] config A <code>PP_Resource</code> containing the resource. */ void (*AddRefResource)(PP_Resource resource); - /** * ReleaseResource() removes a reference from a resource. * * @param[in] config A <code>PP_Resource</code> containing the resource. */ void (*ReleaseResource)(PP_Resource resource); - /** * GetTime() returns the "wall clock time" according to the * browser. @@ -56,7 +57,6 @@ struct PPB_Core { * to the browser. */ PP_Time (*GetTime)(); - /** * GetTimeTicks() returns the "tick time" according to the browser. * This clock is used by the browser when passing some event times to the @@ -68,12 +68,10 @@ struct PPB_Core { * @return A <code>PP_TimeTicks</code> containing the "tick time" according * to the browser. */ - -// TODO(brettw) http://code.google.com/p/chromium/issues/detail?id=57448 -// This currently does change with wall clock time, but will be fixed in -// a future release. + /* TODO(brettw) http://code.google.com/p/chromium/issues/detail?id=57448 + * This currently does change with wall clock time, but will be fixed in + * a future release. */ PP_TimeTicks (*GetTimeTicks)(); - /** * CallOnMainThread() schedules work to be executed on the main module thread * after the specified delay. The delay may be 0 to specify a call back as @@ -100,7 +98,6 @@ struct PPB_Core { void (*CallOnMainThread)(int32_t delay_in_milliseconds, struct PP_CompletionCallback callback, int32_t result); - /** * IsMainThread() returns true if the current thread is the main pepper * thread. @@ -117,5 +114,5 @@ struct PPB_Core { * @} */ - #endif /* PPAPI_C_PPB_CORE_H_ */ + diff --git a/ppapi/c/ppb_file_io.h b/ppapi/c/ppb_file_io.h index 7f8b130..821766d 100644 --- a/ppapi/c/ppb_file_io.h +++ b/ppapi/c/ppb_file_io.h @@ -2,10 +2,15 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + +/* From ppb_file_io.idl modified Wed Jul 13 16:41:25 2011. */ + #ifndef PPAPI_C_PPB_FILE_IO_H_ #define PPAPI_C_PPB_FILE_IO_H_ #include "ppapi/c/pp_bool.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_file_info.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" @@ -17,8 +22,6 @@ * This file defines the API to create a file i/o object. */ -struct PP_CompletionCallback; -struct PP_FileInfo; /** * @addtogroup Enums @@ -29,28 +32,24 @@ struct PP_FileInfo; */ typedef enum { /** Requests read access to a file. */ - PP_FILEOPENFLAG_READ = 1 << 0, - + PP_FILEOPENFLAG_READ = 1 << 0, /** * Requests write access to a file. May be combined with * <code>PP_FILEOPENFLAG_READ</code> to request read and write access. */ - PP_FILEOPENFLAG_WRITE = 1 << 1, - + PP_FILEOPENFLAG_WRITE = 1 << 1, /** * Requests that the file be created if it does not exist. If the file * already exists, then this flag is ignored unless * <code>PP_FILEOPENFLAG_EXCLUSIVE</code> was also specified, in which case * FileIO::Open() will fail. */ - PP_FILEOPENFLAG_CREATE = 1 << 2, - + PP_FILEOPENFLAG_CREATE = 1 << 2, /** * Requests that the file be truncated to length 0 if it exists and is a * regular file. <code>PP_FILEOPENFLAG_WRITE</code> must also be specified. */ - PP_FILEOPENFLAG_TRUNCATE = 1 << 3, - + PP_FILEOPENFLAG_TRUNCATE = 1 << 3, /** * Requests that the file is created when this flag is combined with * <code>PP_FILEOPENFLAG_CREATE</code>. If this flag is specified, and the @@ -63,10 +62,6 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileOpenFlags, 4); * @} */ -#define PPB_FILEIO_INTERFACE_0_5 "PPB_FileIO;0.5" -#define PPB_FILEIO_INTERFACE_1_0 "PPB_FileIO;1.0" -#define PPB_FILEIO_INTERFACE PPB_FILEIO_INTERFACE_1_0 - /** * @addtogroup Interfaces * @{ @@ -75,6 +70,10 @@ 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). */ +#define PPB_FILEIO_INTERFACE_0_5 "PPB_FileIO;0.5" +#define PPB_FILEIO_INTERFACE_1_0 "PPB_FileIO;1.0" +#define PPB_FILEIO_INTERFACE PPB_FILEIO_INTERFACE_1_0 + struct PPB_FileIO { /** * Create() creates a new FileIO object. @@ -96,7 +95,6 @@ struct PPB_FileIO { * invalid or some type other than <code>PPB_FileIO</code>. */ PP_Bool (*IsFileIO)(PP_Resource resource); - /** * Open() opens the specified regular file for I/O according to the given * open flags, which is a bit-mask of the <code>PP_FileOpenFlags</code> @@ -119,7 +117,6 @@ struct PPB_FileIO { PP_Resource file_ref, int32_t open_flags, struct PP_CompletionCallback callback); - /** * Query() queries info about the file opened by this FileIO object. This * function will fail if the FileIO object has not been opened. @@ -136,7 +133,6 @@ struct PPB_FileIO { int32_t (*Query)(PP_Resource file_io, struct PP_FileInfo* info, struct PP_CompletionCallback callback); - /** * Touch() Updates time stamps for the file opened by this FileIO object. * This function will fail if the FileIO object has not been opened. @@ -154,7 +150,6 @@ struct PPB_FileIO { PP_Time last_access_time, PP_Time last_modified_time, struct PP_CompletionCallback callback); - /** * Read() reads from an offset in the file. The size of the buffer must be * large enough to hold the specified number of bytes to read. This function @@ -179,7 +174,6 @@ struct PPB_FileIO { char* buffer, int32_t bytes_to_read, struct PP_CompletionCallback callback); - /** * Write() writes to an offset in the file. This function might perform a * partial write. The FileIO object must have been opened with write access. @@ -219,7 +213,6 @@ struct PPB_FileIO { int32_t (*SetLength)(PP_Resource file_io, int64_t length, struct PP_CompletionCallback callback); - /** * Flush() flushes changes to disk. This call can be very expensive! * @@ -230,9 +223,7 @@ struct PPB_FileIO { * * @return An int32_t containing an error code from <code>pp_errors.h</code>. */ - int32_t (*Flush)(PP_Resource file_io, - struct PP_CompletionCallback callback); - + int32_t (*Flush)(PP_Resource file_io, struct PP_CompletionCallback callback); /** * Close() cancels any IO that may be pending, and closes the FileIO object. * Any pending callbacks will still run, reporting diff --git a/ppapi/c/ppb_file_ref.h b/ppapi/c/ppb_file_ref.h index f3dd432..98c181e 100644 --- a/ppapi/c/ppb_file_ref.h +++ b/ppapi/c/ppb_file_ref.h @@ -2,13 +2,19 @@ * 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 Jul 13 16:43:20 2011. */ + #ifndef PPAPI_C_PPB_FILE_REF_H_ #define PPAPI_C_PPB_FILE_REF_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_file_info.h" +#include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" +#include "ppapi/c/pp_stdint.h" +#include "ppapi/c/pp_time.h" #include "ppapi/c/pp_var.h" /** @@ -17,9 +23,6 @@ * file in a file system. */ -#define PPB_FILEREF_INTERFACE_0_9 "PPB_FileRef;0.9" -#define PPB_FILEREF_INTERFACE_1_0 "PPB_FileRef;1.0" -#define PPB_FILEREF_INTERFACE PPB_FILEREF_INTERFACE_1_0 /** * @addtogroup Interfaces @@ -30,6 +33,10 @@ * a file system. This struct contains a <code>PP_FileSystemType</code> * identifier and a file path string. */ +#define PPB_FILEREF_INTERFACE_0_9 "PPB_FileRef;0.9" +#define PPB_FILEREF_INTERFACE_1_0 "PPB_FileRef;1.0" +#define PPB_FILEREF_INTERFACE PPB_FILEREF_INTERFACE_1_0 + struct PPB_FileRef { /** * Create() creates a weak pointer to a file in the given file system. File @@ -54,7 +61,6 @@ struct PPB_FileRef { * invalid or some type other than <code>PPB_FileRef</code>. */ PP_Bool (*IsFileRef)(PP_Resource resource); - /** * GetFileSystemType() returns the type of the file system. * @@ -66,7 +72,6 @@ struct PPB_FileRef { * is not a valid file reference. */ PP_FileSystemType (*GetFileSystemType)(PP_Resource file_ref); - /** * GetName() returns the name of the file. * @@ -79,7 +84,6 @@ struct PPB_FileRef { * file. Use GetPath() to get the full file path. */ struct PP_Var (*GetName)(PP_Resource file_ref); - /** * GetPath() returns the absolute path of the file. * @@ -91,7 +95,6 @@ struct PPB_FileRef { * <code>PP_FileSystemType_External</code>. */ struct PP_Var (*GetPath)(PP_Resource file_ref); - /** * GetParent() returns the parent directory of this file. If * <code>file_ref</code> points to the root of the filesystem, then the root @@ -105,7 +108,6 @@ struct PPB_FileRef { * <code>PP_FileSystemType_External</code>. */ PP_Resource (*GetParent)(PP_Resource file_ref); - /** * MakeDirectory() makes a new directory in the file system as well as any * parent directories if the <code>make_ancestors</code> argument is @@ -126,7 +128,6 @@ struct PPB_FileRef { int32_t (*MakeDirectory)(PP_Resource directory_ref, PP_Bool make_ancestors, struct PP_CompletionCallback callback); - /** * Touch() Updates time stamps for a file. You must have write access to the * file if it exists in the external filesystem. @@ -144,7 +145,6 @@ struct PPB_FileRef { PP_Time last_access_time, PP_Time last_modified_time, struct PP_CompletionCallback callback); - /** * Delete() deletes a file or directory. If <code>file_ref</code> refers to * a directory, then the directory must be empty. It is an error to delete a @@ -160,7 +160,6 @@ struct PPB_FileRef { */ int32_t (*Delete)(PP_Resource file_ref, struct PP_CompletionCallback callback); - /** * Rename() renames a file or directory. Arguments <code>file_ref</code> and * <code>new_file_ref</code> must both refer to files in the same file diff --git a/ppapi/c/ppb_file_system.h b/ppapi/c/ppb_file_system.h index 59b3d51..b7baf75 100644 --- a/ppapi/c/ppb_file_system.h +++ b/ppapi/c/ppb_file_system.h @@ -2,36 +2,38 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_FILE_SYSTEM_H_ #define PPAPI_C_PPB_FILE_SYSTEM_H_ #include "ppapi/c/pp_bool.h" +#include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_file_info.h" #include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" -#include "ppapi/c/pp_time.h" /** * @file * This file defines the API to create a file system associated with a file. */ -struct PP_CompletionCallback; - -#define PPB_FILESYSTEM_INTERFACE_0_7 "PPB_FileSystem;0.7" -#define PPB_FILESYSTEM_INTERFACE_1_0 "PPB_FileSystem;1.0" -#define PPB_FILESYSTEM_INTERFACE PPB_FILESYSTEM_INTERFACE_1_0 /** - * @addtogroup Structs + * @addtogroup Interfaces * @{ */ - /** * The <code>PPB_FileSystem</code> struct identifies the file system type * associated with a file. */ +#define PPB_FILESYSTEM_INTERFACE_0_7 "PPB_FileSystem;0.7" +#define PPB_FILESYSTEM_INTERFACE_1_0 "PPB_FileSystem;1.0" +#define PPB_FILESYSTEM_INTERFACE PPB_FILESYSTEM_INTERFACE_1_0 + struct PPB_FileSystem { /** Create() creates a file system object of the given type. * @@ -44,7 +46,6 @@ struct PPB_FileSystem { * successful. */ PP_Resource (*Create)(PP_Instance instance, PP_FileSystemType type); - /** * IsFileSystem() determines if the provided resource is a file system. * @@ -56,7 +57,6 @@ struct PPB_FileSystem { * invalid or some type other than <code>PPB_FileSystem</code>. */ PP_Bool (*IsFileSystem)(PP_Resource resource); - /** * Open() opens the file system. A file system must be opened before running * any other operation on it. @@ -75,7 +75,6 @@ struct PPB_FileSystem { int32_t (*Open)(PP_Resource file_system, int64_t expected_size, struct PP_CompletionCallback callback); - /** * GetType() returns the type of the provided file system. * @@ -94,3 +93,4 @@ struct PPB_FileSystem { */ #endif /* PPAPI_C_PPB_FILE_SYSTEM_H_ */ + diff --git a/ppapi/c/ppb_graphics_2d.h b/ppapi/c/ppb_graphics_2d.h index c0024f1..068a720 100644 --- a/ppapi/c/ppb_graphics_2d.h +++ b/ppapi/c/ppb_graphics_2d.h @@ -2,37 +2,40 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_GRAPHICS_2D_H_ #define PPAPI_C_PPB_GRAPHICS_2D_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_point.h" #include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_size.h" #include "ppapi/c/pp_stdint.h" - -#define PPB_GRAPHICS_2D_INTERFACE_0_4 "PPB_Graphics2D;0.4" -#define PPB_GRAPHICS_2D_INTERFACE_1_0 "PPB_Graphics2D;1.0" -#define PPB_GRAPHICS_2D_INTERFACE PPB_GRAPHICS_2D_INTERFACE_1_0 - /** * @file * Defines the <code>PPB_Graphics2D</code> struct representing a 2D graphics * context within the browser. */ + /** * @addtogroup Interfaces * @{ */ - /** * <code>PPB_Graphics2D</code> defines the interface for a 2D graphics context. */ +#define PPB_GRAPHICS_2D_INTERFACE_0_4 "PPB_Graphics2D;0.4" +#define PPB_GRAPHICS_2D_INTERFACE_1_0 "PPB_Graphics2D;1.0" +#define PPB_GRAPHICS_2D_INTERFACE PPB_GRAPHICS_2D_INTERFACE_1_0 + struct PPB_Graphics2D { /** * Create() creates a 2D graphics context. The returned graphics context will @@ -59,7 +62,6 @@ struct PPB_Graphics2D { PP_Resource (*Create)(PP_Instance instance, const struct PP_Size* size, PP_Bool is_always_opaque); - /** * IsGraphics2D() determines if the given resource is a valid * <code>Graphics2D</code>. @@ -71,7 +73,6 @@ struct PPB_Graphics2D { * another type. */ PP_Bool (*IsGraphics2D)(PP_Resource resource); - /** * Describe() retrieves the configuration for the given graphics context, * filling the given values (which must not be <code>NULL</code>). @@ -88,7 +89,6 @@ struct PPB_Graphics2D { PP_Bool (*Describe)(PP_Resource graphics_2d, struct PP_Size* size, PP_Bool* is_always_opqaue); - /** * PaintImageData() enqueues a paint of the given image into the context. * This function has no effect until you call Flush() As a result, what @@ -132,7 +132,6 @@ struct PPB_Graphics2D { PP_Resource image_data, const struct PP_Point* top_left, const struct PP_Rect* src_rect); - /** * Scroll() enqueues a scroll of the context's backing store. This * function has no effect until you call Flush(). The data within the @@ -154,7 +153,6 @@ struct PPB_Graphics2D { void (*Scroll)(PP_Resource graphics_2d, const struct PP_Rect* clip_rect, const struct PP_Point* amount); - /** * ReplaceContents() provides a slightly more efficient way to paint the * entire module's image. Normally, calling PaintImageData() requires that @@ -188,7 +186,6 @@ struct PPB_Graphics2D { * @param[in] image The <code>ImageData</code> to be painted. */ void (*ReplaceContents)(PP_Resource graphics_2d, PP_Resource image_data); - /** * Flush() flushes any enqueued paint, scroll, and replace commands to the * backing store. This function actually executes the updates, and causes a @@ -249,22 +246,20 @@ struct PPB_Graphics2D { * not issued its callback yet. In the failure case, nothing will be updated * and no callback will be scheduled. */ - /* * TODO(darin): We should ensure that the completion callback always runs, so * that it is easier for consumers to manage memory referenced by a callback. */ - /* * TODO(): Add back in the synchronous mode description once we have support * for it. */ int32_t (*Flush)(PP_Resource graphics_2d, struct PP_CompletionCallback callback); - }; - /** * @} */ + #endif /* PPAPI_C_PPB_GRAPHICS_2D_H_ */ + diff --git a/ppapi/c/ppb_image_data.h b/ppapi/c/ppb_image_data.h index c63148b..e4469e6 100644 --- a/ppapi/c/ppb_image_data.h +++ b/ppapi/c/ppb_image_data.h @@ -2,13 +2,15 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_IMAGE_DATA_H_ #define PPAPI_C_PPB_IMAGE_DATA_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_module.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_size.h" #include "ppapi/c/pp_stdint.h" @@ -19,11 +21,11 @@ * a browser handles image data. */ + /** * @addtogroup Enums * @{ */ - /** * <code>PP_ImageDataFormat</code> is an enumeration of the different types of * image data formats. @@ -69,22 +71,18 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_ImageDataFormat, 4); * @addtogroup Structs * @{ */ - /** * The <code>PP_ImageDataDesc</code> structure represents a description of * image data. */ struct PP_ImageDataDesc { - /** * This value represents one of the image data types in the * <code>PP_ImageDataFormat</code> enum. */ PP_ImageDataFormat format; - /** This value represents the size of the bitmap in pixels. */ struct PP_Size size; - /** * This value represents the row width in bytes. This may be different than * width * 4 since there may be padding at the end of the lines. @@ -96,19 +94,18 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ImageDataDesc, 16); * @} */ -#define PPB_IMAGEDATA_INTERFACE_0_3 "PPB_ImageData;0.3" -#define PPB_IMAGEDATA_INTERFACE_1_0 "PPB_ImageData;1.0" -#define PPB_IMAGEDATA_INTERFACE PPB_IMAGEDATA_INTERFACE_1_0 - /** * @addtogroup Interfaces * @{ */ - /** * The <code>PPB_ImageData</code> interface contains pointers to several * functions for determining the browser's treatment of image data. */ +#define PPB_IMAGEDATA_INTERFACE_0_3 "PPB_ImageData;0.3" +#define PPB_IMAGEDATA_INTERFACE_1_0 "PPB_ImageData;1.0" +#define PPB_IMAGEDATA_INTERFACE PPB_IMAGEDATA_INTERFACE_1_0 + struct PPB_ImageData { /** * GetNativeImageDataFormat() returns the browser's preferred format for @@ -119,7 +116,6 @@ struct PPB_ImageData { * @return A <code>PP_ImageDataFormat</code> containing the preferred format. */ PP_ImageDataFormat (*GetNativeImageDataFormat)(); - /** * IsImageDataFormatSupported() determines if the given image data format is * supported by the browser. @@ -130,7 +126,6 @@ struct PPB_ImageData { * image data format is supported by the browser. */ PP_Bool (*IsImageDataFormatSupported)(PP_ImageDataFormat format); - /** * Create() allocates an image data resource with the given format and size. * @@ -157,7 +152,6 @@ struct PPB_ImageData { PP_ImageDataFormat format, const struct PP_Size* size, PP_Bool init_to_zero); - /** * IsImageData() determiens if a given resource is image data. * @@ -169,7 +163,6 @@ struct PPB_ImageData { * invalid or some type other than image data. */ PP_Bool (*IsImageData)(PP_Resource image_data); - /** * Describe() computes the description of the * image data. @@ -184,9 +177,7 @@ struct PPB_ImageData { * <code>PP_FALSE</code>, the <code>desc</code> structure will be filled * with 0. */ - PP_Bool (*Describe)(PP_Resource image_data, - struct PP_ImageDataDesc* desc); - + PP_Bool (*Describe)(PP_Resource image_data, struct PP_ImageDataDesc* desc); /** * Map() maps an image data into the module address space. * @@ -196,7 +187,6 @@ struct PPB_ImageData { * @return A pointer to the beginning of the data. */ void* (*Map)(PP_Resource image_data); - /** * Unmap is a pointer to a function that unmaps an image data from the module * address space. @@ -211,3 +201,4 @@ struct PPB_ImageData { */ #endif /* PPAPI_C_PPB_IMAGE_DATA_H_ */ + diff --git a/ppapi/c/ppb_input_event.h b/ppapi/c/ppb_input_event.h index ddd3ac5..c208a3e 100644 --- a/ppapi/c/ppb_input_event.h +++ b/ppapi/c/ppb_input_event.h @@ -3,9 +3,12 @@ * found in the LICENSE file. */ +/* From ppb_input_event.idl modified Tue Jul 12 15:22:36 2011. */ + #ifndef PPAPI_C_PPB_INPUT_EVENT_H_ #define PPAPI_C_PPB_INPUT_EVENT_H_ +#include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_point.h" @@ -14,81 +17,65 @@ #include "ppapi/c/pp_time.h" #include "ppapi/c/pp_var.h" -#define PPB_INPUT_EVENT_INTERFACE_0_1 "PPB_InputEvent;0.1" -#define PPB_INPUT_EVENT_INTERFACE PPB_INPUT_EVENT_INTERFACE_0_1 - -#define PPB_MOUSE_INPUT_EVENT_INTERFACE_0_1 "PPB_MouseInputEvent;0.1" -#define PPB_MOUSE_INPUT_EVENT_INTERFACE PPB_MOUSE_INPUT_EVENT_INTERFACE_0_1 - -#define PPB_WHEEL_INPUT_EVENT_INTERFACE_0_1 "PPB_WheelInputEvent;0.1" -#define PPB_WHEEL_INPUT_EVENT_INTERFACE PPB_WHEEL_INPUT_EVENT_INTERFACE_0_1 +/** + * @file + * This file defines the Input Event interfaces. + */ -#define PPB_KEYBOARD_INPUT_EVENT_INTERFACE_0_1 "PPB_KeyboardInputEvent;0.1" -#define PPB_KEYBOARD_INPUT_EVENT_INTERFACE \ - PPB_KEYBOARD_INPUT_EVENT_INTERFACE_0_1 /** * @addtogroup Enums * @{ */ - /** * This enumeration contains the types of input events. */ typedef enum { - PP_INPUTEVENT_TYPE_UNDEFINED = -1, - + PP_INPUTEVENT_TYPE_UNDEFINED = -1, /** * Notification that a mouse button was pressed. * * Register for this event using the PP_INPUTEVENT_CLASS_MOUSE class. */ - PP_INPUTEVENT_TYPE_MOUSEDOWN = 0, - + PP_INPUTEVENT_TYPE_MOUSEDOWN = 0, /** * Notification that a mouse button was released. * * Register for this event using the PP_INPUTEVENT_CLASS_MOUSE class. */ - PP_INPUTEVENT_TYPE_MOUSEUP = 1, - + PP_INPUTEVENT_TYPE_MOUSEUP = 1, /** * Notification that a mouse button was moved when it is over the instance * or dragged out of it. * * Register for this event using the PP_INPUTEVENT_CLASS_MOUSE class. */ - PP_INPUTEVENT_TYPE_MOUSEMOVE = 2, - + PP_INPUTEVENT_TYPE_MOUSEMOVE = 2, /** * Notification that the mouse entered the instance's bounds. * * Register for this event using the PP_INPUTEVENT_CLASS_MOUSE class. */ - PP_INPUTEVENT_TYPE_MOUSEENTER = 3, - + PP_INPUTEVENT_TYPE_MOUSEENTER = 3, /** * Notification that a mouse left the instance's bounds. * * Register for this event using the PP_INPUTEVENT_CLASS_MOUSE class. */ - PP_INPUTEVENT_TYPE_MOUSELEAVE = 4, - + PP_INPUTEVENT_TYPE_MOUSELEAVE = 4, /** * Notification that the scroll wheel was used. * * Register for this event using the PP_INPUTEVENT_CLASS_WHEEL class. */ - PP_INPUTEVENT_TYPE_MOUSEWHEEL = 5, - + PP_INPUTEVENT_TYPE_MOUSEWHEEL = 5, /** * Notification that a key transitioned from "up" to "down". * TODO(brettw) differentiate from KEYDOWN. * * Register for this event using the PP_INPUTEVENT_CLASS_KEYBOARD class. */ - PP_INPUTEVENT_TYPE_RAWKEYDOWN = 6, - + PP_INPUTEVENT_TYPE_RAWKEYDOWN = 6, /** * Notification that a key was pressed. This does not necessarily correspond * to a character depending on the key and language. Use the @@ -96,15 +83,13 @@ typedef enum { * * Register for this event using the PP_INPUTEVENT_CLASS_KEYBOARD class. */ - PP_INPUTEVENT_TYPE_KEYDOWN = 7, - + PP_INPUTEVENT_TYPE_KEYDOWN = 7, /** * Notification that a key was released. * * Register for this event using the PP_INPUTEVENT_CLASS_KEYBOARD class. */ - PP_INPUTEVENT_TYPE_KEYUP = 8, - + PP_INPUTEVENT_TYPE_KEYUP = 8, /** * Notification that a character was typed. Use this for text input. Key * down events may generate 0, 1, or more than one character event depending @@ -112,8 +97,7 @@ typedef enum { * * Register for this event using the PP_INPUTEVENT_CLASS_KEYBOARD class. */ - PP_INPUTEVENT_TYPE_CHAR = 9, - + PP_INPUTEVENT_TYPE_CHAR = 9, /** * TODO(brettw) when is this used? * @@ -129,17 +113,17 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_Type, 4); * function on PPB_InputEvent. */ typedef enum { - PP_INPUTEVENT_MODIFIER_SHIFTKEY = 1 << 0, - PP_INPUTEVENT_MODIFIER_CONTROLKEY = 1 << 1, - PP_INPUTEVENT_MODIFIER_ALTKEY = 1 << 2, - PP_INPUTEVENT_MODIFIER_METAKEY = 1 << 3, - PP_INPUTEVENT_MODIFIER_ISKEYPAD = 1 << 4, - PP_INPUTEVENT_MODIFIER_ISAUTOREPEAT = 1 << 5, - PP_INPUTEVENT_MODIFIER_LEFTBUTTONDOWN = 1 << 6, + PP_INPUTEVENT_MODIFIER_SHIFTKEY = 1 << 0, + PP_INPUTEVENT_MODIFIER_CONTROLKEY = 1 << 1, + PP_INPUTEVENT_MODIFIER_ALTKEY = 1 << 2, + PP_INPUTEVENT_MODIFIER_METAKEY = 1 << 3, + PP_INPUTEVENT_MODIFIER_ISKEYPAD = 1 << 4, + PP_INPUTEVENT_MODIFIER_ISAUTOREPEAT = 1 << 5, + PP_INPUTEVENT_MODIFIER_LEFTBUTTONDOWN = 1 << 6, PP_INPUTEVENT_MODIFIER_MIDDLEBUTTONDOWN = 1 << 7, - PP_INPUTEVENT_MODIFIER_RIGHTBUTTONDOWN = 1 << 8, - PP_INPUTEVENT_MODIFIER_CAPSLOCKKEY = 1 << 9, - PP_INPUTEVENT_MODIFIER_NUMLOCKKEY = 1 << 10 + PP_INPUTEVENT_MODIFIER_RIGHTBUTTONDOWN = 1 << 8, + PP_INPUTEVENT_MODIFIER_CAPSLOCKKEY = 1 << 9, + PP_INPUTEVENT_MODIFIER_NUMLOCKKEY = 1 << 10 } PP_InputEvent_Modifier; PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_Modifier, 4); @@ -149,17 +133,13 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_Modifier, 4); * PPB_InputEvent. */ typedef enum { - PP_INPUTEVENT_MOUSEBUTTON_NONE = -1, - PP_INPUTEVENT_MOUSEBUTTON_LEFT = 0, + PP_INPUTEVENT_MOUSEBUTTON_NONE = -1, + PP_INPUTEVENT_MOUSEBUTTON_LEFT = 0, PP_INPUTEVENT_MOUSEBUTTON_MIDDLE = 1, - PP_INPUTEVENT_MOUSEBUTTON_RIGHT = 2 + PP_INPUTEVENT_MOUSEBUTTON_RIGHT = 2 } PP_InputEvent_MouseButton; PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_MouseButton, 4); -/** - * @} - */ - typedef enum { /** * Request mouse input events. @@ -171,7 +151,6 @@ typedef enum { * lead to higher performance. */ PP_INPUTEVENT_CLASS_MOUSE = 1 << 0, - /** * Requests keyboard events. Keyboard events must be requested in filtering * mode via RequestFilteringInputEvents(). This is because many commands @@ -182,7 +161,6 @@ typedef enum { * would allow pages to trap users on a page. */ PP_INPUTEVENT_CLASS_KEYBOARD = 1 << 1, - /** * Identifies scroll wheel input event. Wheel events must be requested in * filtering mode via RequestFilteringInputEvents(). This is because many @@ -202,7 +180,6 @@ typedef enum { * frames in a page. */ PP_INPUTEVENT_CLASS_WHEEL = 1 << 2, - /** * Identifies touch input events. * @@ -211,7 +188,6 @@ typedef enum { * higher level and achieve higher performance. */ PP_INPUTEVENT_CLASS_TOUCH = 1 << 3, - /** * Identifies IME composition input events. * @@ -220,6 +196,16 @@ typedef enum { PP_INPUTEVENT_CLASS_IME = 1 << 4 } PP_InputEvent_Class; PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_Class, 4); +/** + * @} + */ + +/** + * @addtogroup Interfaces + * @{ + */ +#define PPB_INPUT_EVENT_INTERFACE_0_1 "PPB_InputEvent;0.1" +#define PPB_INPUT_EVENT_INTERFACE PPB_INPUT_EVENT_INTERFACE_0_1 struct PPB_InputEvent { /** @@ -269,9 +255,7 @@ struct PPB_InputEvent { * PP_ERROR_NOTSUPPORTED return value is requesting keyboard events, these * must use RequestFilteringInputEvents(). */ - int32_t (*RequestInputEvents)(PP_Instance instance, - uint32_t event_classes); - + int32_t (*RequestInputEvents)(PP_Instance instance, uint32_t event_classes); /** * Request that input events corresponding to the given input events are * delivered to the instance for filtering. @@ -302,7 +286,6 @@ struct PPB_InputEvent { */ int32_t (*RequestFilteringInputEvents)(PP_Instance instance, uint32_t event_classes); - /** * Request that input events corresponding to the given input classes no * longer be delivered to the instance. @@ -325,21 +308,17 @@ struct PPB_InputEvent { * @param event_classes A combination of flags from PP_InputEvent_Class that * identifies the classes of events the instance is no longer interested in. */ - void (*ClearInputEventRequest)(PP_Instance instance, - uint32_t event_classes); - + void (*ClearInputEventRequest)(PP_Instance instance, uint32_t event_classes); /** * Returns true if the given resource is a valid input event resource. */ PP_Bool (*IsInputEvent)(PP_Resource resource); - /** * Returns the type of input event for the given input event resource. * This is valid for all input events. Returns PP_INPUTEVENT_TYPE_UNDEFINED * if the resource is invalid. */ PP_InputEvent_Type (*GetType)(PP_Resource event); - /** * Returns the time that the event was generated. This will be before the * current time since processing and dispatching the event has some overhead. @@ -353,7 +332,6 @@ struct PPB_InputEvent { * event times to a particular time of day on the system clock. */ PP_TimeTicks (*GetTimeStamp)(PP_Resource event); - /** * Returns a bitfield indicating which modifiers were down at the time of * the event. This is a combination of the flags in the @@ -365,6 +343,9 @@ struct PPB_InputEvent { uint32_t (*GetModifiers)(PP_Resource event); }; +#define PPB_MOUSE_INPUT_EVENT_INTERFACE_0_1 "PPB_MouseInputEvent;0.1" +#define PPB_MOUSE_INPUT_EVENT_INTERFACE PPB_MOUSE_INPUT_EVENT_INTERFACE_0_1 + struct PPB_MouseInputEvent { /** * Determines if a resource is a mouse event. @@ -372,7 +353,6 @@ struct PPB_MouseInputEvent { * @return PP_TRUE if the given resource is a valid mouse input event. */ PP_Bool (*IsMouseInputEvent)(PP_Resource resource); - /** * Returns which mouse button generated a mouse down or up event. * @@ -381,7 +361,6 @@ struct PPB_MouseInputEvent { * events, and for all non-mouse events. */ PP_InputEvent_MouseButton (*GetMouseButton)(PP_Resource mouse_event); - /** * Returns the pixel location of a mouse input event. * @@ -390,13 +369,15 @@ struct PPB_MouseInputEvent { * mouse drags. The return value will be (0, 0) for non-mouse events. */ struct PP_Point (*GetMousePosition)(PP_Resource mouse_event); - /** * TODO(brettw) figure out exactly what this means. */ int32_t (*GetMouseClickCount)(PP_Resource mouse_event); }; +#define PPB_WHEEL_INPUT_EVENT_INTERFACE_0_1 "PPB_WheelInputEvent;0.1" +#define PPB_WHEEL_INPUT_EVENT_INTERFACE PPB_WHEEL_INPUT_EVENT_INTERFACE_0_1 + struct PPB_WheelInputEvent { /** * Determines if a resource is a wheel event. @@ -404,7 +385,6 @@ struct PPB_WheelInputEvent { * @return PP_TRUE if the given resource is a valid wheel input event. */ PP_Bool (*IsWheelInputEvent)(PP_Resource resource); - /** * Indicates the amount vertically and horizontally the user has requested * to scroll by with their mouse wheel. A scroll down or to the right (where @@ -427,7 +407,6 @@ struct PPB_WheelInputEvent { * "clicks". */ struct PP_FloatPoint (*GetWheelDelta)(PP_Resource wheel_event); - /** * The number of "clicks" of the scroll wheel that have produced the * event. The value may have system-specific acceleration applied to it, @@ -447,7 +426,6 @@ struct PPB_WheelInputEvent { * of scrolling as for a mouse that has a discrete mouse wheel. */ struct PP_FloatPoint (*GetWheelTicks)(PP_Resource wheel_event); - /** * Indicates if the scroll delta x/y indicates pages or lines to * scroll by. @@ -458,6 +436,10 @@ struct PPB_WheelInputEvent { PP_Bool (*GetScrollByPage)(PP_Resource wheel_event); }; +#define PPB_KEYBOARD_INPUT_EVENT_INTERFACE_0_1 "PPB_KeyboardInputEvent;0.1" +#define PPB_KEYBOARD_INPUT_EVENT_INTERFACE \ + PPB_KEYBOARD_INPUT_EVENT_INTERFACE_0_1 + struct PPB_KeyboardInputEvent { /** * Determines if a resource is a keyboard event. @@ -465,13 +447,11 @@ struct PPB_KeyboardInputEvent { * @return PP_TRUE if the given resource is a valid mouse input event. */ PP_Bool (*IsKeyboardInputEvent)(PP_Resource resource); - /** * Returns the DOM |keyCode| field for the keyboard event. * Chrome populates this with the Windows-style Virtual Key code of the key. */ uint32_t (*GetKeyCode)(PP_Resource key_event); - /** * Returns the typed character for the given character event. * @@ -481,5 +461,9 @@ struct PPB_KeyboardInputEvent { */ struct PP_Var (*GetCharacterText)(PP_Resource character_event); }; +/** + * @} + */ #endif /* PPAPI_C_PPB_INPUT_EVENT_H_ */ + diff --git a/ppapi/c/ppb_instance.h b/ppapi/c/ppb_instance.h index b2fa404..cff11b6 100644 --- a/ppapi/c/ppb_instance.h +++ b/ppapi/c/ppb_instance.h @@ -2,32 +2,38 @@ * 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 Mon Jul 18 12:54:08 2011. */ + #ifndef PPAPI_C_PPB_INSTANCE_H_ #define PPAPI_C_PPB_INSTANCE_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" - -#define PPB_INSTANCE_INTERFACE_0_5 "PPB_Instance;0.5" -#define PPB_INSTANCE_INTERFACE_1_0 "PPB_Instance;1.0" -#define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_1_0 +#include "ppapi/c/pp_stdint.h" +#include "ppapi/c/pp_var.h" /** * @file * This file defines the PPB_Instance interface implemented by the * browser and containing pointers to functions related to * the module instance on a web page. - * + */ + + +/** * @addtogroup Interfaces * @{ */ - /** * The PPB_Instance interface contains pointers to functions * related to the module instance on a web page. - * */ +#define PPB_INSTANCE_INTERFACE_0_5 "PPB_Instance;0.5" +#define PPB_INSTANCE_INTERFACE_1_0 "PPB_Instance;1.0" +#define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_1_0 struct PPB_Instance { /** @@ -58,7 +64,6 @@ struct PPB_Instance { * instance, so the caller can release its reference if it chooses. */ PP_Bool (*BindGraphics)(PP_Instance instance, PP_Resource device); - /** * IsFullFrame() determines if the module instance is full-frame (repr). * Such a module represents the entire document in a frame rather than an @@ -73,11 +78,7 @@ struct PPB_Instance { * instance is full-frame. */ PP_Bool (*IsFullFrame)(PP_Instance instance); - }; - -typedef struct PPB_Instance PPB_Instance_1_0; - /** * @} */ diff --git a/ppapi/c/ppb_messaging.h b/ppapi/c/ppb_messaging.h index 92cb09b..e98cf46 100644 --- a/ppapi/c/ppb_messaging.h +++ b/ppapi/c/ppb_messaging.h @@ -2,16 +2,18 @@ * 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 Wed Jul 13 16:51:56 2011. */ + #ifndef PPAPI_C_PPB_MESSAGING_H_ #define PPAPI_C_PPB_MESSAGING_H_ +#include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_var.h" -#define PPB_MESSAGING_INTERFACE_0_1 "PPB_Messaging;0.1" -#define PPB_MESSAGING_INTERFACE_1_0 "PPB_Messaging;1.0" -#define PPB_MESSAGING_INTERFACE PPB_MESSAGING_INTERFACE_1_0 - /** * @file * This file defines the <code>PPB_Messaging</code> interface implemented @@ -19,16 +21,20 @@ * specific module instance. */ + /** * @addtogroup Interfaces * @{ */ - /** * The <code>PPB_Messaging</code> interface is implemented by the browser * and is related to sending messages to JavaScript message event listeners on * the DOM element associated with specific module instance. */ +#define PPB_MESSAGING_INTERFACE_0_1 "PPB_Messaging;0.1" +#define PPB_MESSAGING_INTERFACE_1_0 "PPB_Messaging;1.0" +#define PPB_MESSAGING_INTERFACE PPB_MESSAGING_INTERFACE_1_0 + struct PPB_Messaging { /** * PostMessage() asynchronously invokes any listeners for message events on @@ -93,3 +99,4 @@ struct PPB_Messaging { */ #endif /* PPAPI_C_PPB_MESSAGING_H_ */ + diff --git a/ppapi/c/ppb_url_loader.h b/ppapi/c/ppb_url_loader.h index 3949f20..ce60c91 100644 --- a/ppapi/c/ppb_url_loader.h +++ b/ppapi/c/ppb_url_loader.h @@ -2,30 +2,30 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_URL_LOADER_H_ #define PPAPI_C_PPB_URL_LOADER_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" -#define PPB_URLLOADER_INTERFACE_0_2 "PPB_URLLoader;0.2" -#define PPB_URLLOADER_INTERFACE_1_0 "PPB_URLLoader;1.0" -#define PPB_URLLOADER_INTERFACE PPB_URLLOADER_INTERFACE_1_0 - /** * @file * This file defines the <strong>PPB_URLLoader</strong> interface for loading * URLs. */ + /** * @addtogroup Interfaces * @{ */ - /** * The <strong>PPB_URLLoader</strong> interface contains pointers to functions * for loading URLs. The typical steps for loading a URL are: @@ -45,6 +45,10 @@ * - Then, access the downloaded file using the GetBodyAsFileRef() function of * the <code>URLResponseInfo</code> returned in step #4. */ +#define PPB_URLLOADER_INTERFACE_0_2 "PPB_URLLoader;0.2" +#define PPB_URLLOADER_INTERFACE_1_0 "PPB_URLLoader;1.0" +#define PPB_URLLOADER_INTERFACE PPB_URLLOADER_INTERFACE_1_0 + struct PPB_URLLoader { /** * Create() creates a new <code>URLLoader</code> object. The @@ -59,19 +63,17 @@ struct PPB_URLLoader { * successful, 0 if the instance is invalid. */ PP_Resource (*Create)(PP_Instance instance); - /** * IsURLLoader() determines if a resource is an <code>URLLoader</code>. * * @param[in] resource A <code>PP_Resource</code> corresponding to a * <code>URLLoader</code>. * - * @return <code>PP_TRUE</code> if the resource is a <code>URLLoader</code>, + * @return <code>PP_TRUE</code> if the resource is a <code>URLLoader</code>, * <code>PP_FALSE</code> if the resource is invalid or some type other * than <code>URLLoader</code>. */ PP_Bool (*IsURLLoader)(PP_Resource resource); - /** * Open() begins loading the <code>URLRequestInfo</code>. The operation * completes when response headers are received or when an error occurs. Use @@ -91,7 +93,6 @@ struct PPB_URLLoader { int32_t (*Open)(PP_Resource loader, PP_Resource request_info, struct PP_CompletionCallback callback); - /** * FollowRedirect()can be invoked to follow a redirect after Open() completed * on receiving redirect headers. @@ -108,14 +109,13 @@ struct PPB_URLLoader { */ int32_t (*FollowRedirect)(PP_Resource loader, struct PP_CompletionCallback callback); - /** * GetUploadProgress() returns the current upload progress (which is * meaningful after Open() has been called). Progress only refers to the * request body and does not include the headers. * * This data is only available if the <code>URLRequestInfo</code> passed - * to Open() had the <code>PP_URLREQUESTPROPERTY_REPORTUPLOADPROGRESS</code> + * to Open() had the <code>PP_URLREQUESTPROPERTY_REPORTUPLOADPROGRESS</code> * property set to PP_TRUE. * * @param[in] loader A <code>PP_Resource</code> corresponding to a @@ -123,13 +123,12 @@ struct PPB_URLLoader { * @param[in] bytes_sent The number of bytes sent thus far. * @param[in] total_bytes_to_be_sent The total number of bytes to be sent. * - * @return <code>PP_TRUE</code> if the upload progress is available, + * @return <code>PP_TRUE</code> if the upload progress is available, * <code>PP_FALSE</code> if it is not available. */ PP_Bool (*GetUploadProgress)(PP_Resource loader, int64_t* bytes_sent, int64_t* total_bytes_to_be_sent); - /** * GetDownloadProgress() returns the current download progress, which is * meaningful after Open() has been called. Progress only refers to the @@ -152,7 +151,6 @@ struct PPB_URLLoader { PP_Bool (*GetDownloadProgress)(PP_Resource loader, int64_t* bytes_received, int64_t* total_bytes_to_be_received); - /** * GetResponseInfo() returns the current <code>URLResponseInfo</code> object. * @@ -164,7 +162,6 @@ struct PPB_URLLoader { * resource or if Open() has not been called. */ PP_Resource (*GetResponseInfo)(PP_Resource loader); - /** * ReadResponseBody() is used to read the response body. The size of the * buffer must be large enough to hold the specified number of bytes to read. @@ -205,7 +202,6 @@ struct PPB_URLLoader { */ int32_t (*FinishStreamingToFile)(PP_Resource loader, struct PP_CompletionCallback callback); - /** * Close is a pointer to a function used to cancel any pending IO and close * the <code>URLLoader</code> object. Any pending callbacks will still run, @@ -226,3 +222,4 @@ struct PPB_URLLoader { */ #endif /* PPAPI_C_PPB_URL_LOADER_H_ */ + diff --git a/ppapi/c/ppb_url_request_info.h b/ppapi/c/ppb_url_request_info.h index 83f17c1..d07c297 100644 --- a/ppapi/c/ppb_url_request_info.h +++ b/ppapi/c/ppb_url_request_info.h @@ -2,6 +2,9 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_URL_REQUEST_INFO_H_ #define PPAPI_C_PPB_URL_REQUEST_INFO_H_ @@ -19,18 +22,17 @@ * manipulating URL requests. */ + /** * @addtogroup Enums * @{ */ - /** * This enumeration contains properties that can be set on a URL request. */ typedef enum { /** This corresponds to a string (<code>PP_VARTYPE_STRING</code>). */ PP_URLREQUESTPROPERTY_URL, - /** * This corresponds to a string (<code>PP_VARTYPE_STRING</code>); either * POST or GET. Refer to the @@ -39,7 +41,6 @@ typedef enum { * */ PP_URLREQUESTPROPERTY_METHOD, - /** * This corresponds to a string (<code>PP_VARTYPE_STRING</code>); \n * delimited. Refer to the @@ -47,7 +48,6 @@ typedef enum { * Field Definitions</a> documentaiton for further information. */ PP_URLREQUESTPROPERTY_HEADERS, - /** * This corresponds to a <code>PP_Bool</code> (<code>PP_VARTYPE_BOOL</code>; * default=<code>PP_FALSE</code>). @@ -56,7 +56,6 @@ typedef enum { * download. */ PP_URLREQUESTPROPERTY_STREAMTOFILE, - /** * This corresponds to a <code>PP_Bool</code> (<code>PP_VARTYPE_BOOL</code>; * default=<code>PP_TRUE</code>). @@ -65,7 +64,6 @@ typedef enum { * examining redirect headers. */ PP_URLREQUESTPROPERTY_FOLLOWREDIRECTS, - /** * This corresponds to a <code>PP_Bool</code> (<code>PP_VARTYPE_BOOL</code>; * default=<code>PP_FALSE</code>). @@ -73,14 +71,12 @@ typedef enum { * download progress using PPB_URLLoader.GetDownloadProgress(). */ PP_URLREQUESTPROPERTY_RECORDDOWNLOADPROGRESS, - /** * This corresponds to a <code>PP_Bool (default=<code>PP_FALSE</code>). * Set this value to <code>PP_TRUE</code> if you want to be able to poll the * upload progress using PPB_URLLoader.GetUplaodProgress(). */ PP_URLREQUESTPROPERTY_RECORDUPLOADPROGRESS, - /** * This corresponds to a string (<code>PP_VARTYPE_STRING)</code> or may be * undefined (<code>PP_VARTYPE_UNDEFINED</code>; default). @@ -92,7 +88,6 @@ typedef enum { * <code>PP_ERROR_BADARGUMENT</code> will result. */ PP_URLREQUESTPROPERTY_CUSTOMREFERRERURL, - /** * This corresponds to a <code>PP_Bool</code> (<code>PP_VARTYPE_BOOL</code>; * default=<code>PP_FALSE</code>). Whether cross-origin requests are allowed. @@ -103,7 +98,6 @@ typedef enum { * Sharing</a> documentation. */ PP_URLREQUESTPROPERTY_ALLOWCROSSORIGINREQUESTS, - /** * This corresponds to a <code>PP_Bool</code> (<code>PP_VARTYPE_BOOL</code>; * default=<code>PP_FALSE</code>). @@ -112,7 +106,6 @@ typedef enum { * response. If the request is not cross-origin, this property is ignored. */ PP_URLREQUESTPROPERTY_ALLOWCREDENTIALS, - /** * This corresponds to a string (<code>PP_VARTYPE_STRING</code>) or may be * undefined (<code>PP_VARTYPE_UNDEFINED</code>; default). @@ -124,7 +117,6 @@ typedef enum { * universal access, <code>PP_ERROR_BADARGUMENT</code> will result. */ PP_URLREQUESTPROPERTY_CUSTOMCONTENTTRANSFERENCODING, - /** * This corresponds to an integer (<code>PP_VARTYPE_INT32</code>); default * is not defined and is set by the browser, possibly depending on system @@ -137,7 +129,6 @@ typedef enum { * be set. Behavior is undefined if the former is <= the latter. */ PP_URLREQUESTPROPERTY_PREFETCHBUFFERUPPERTHRESHOLD, - /** * This corresponds to an integer (<code>PP_VARTYPE_INT32</code>); default is * not defined and is set by the browser to a value appropriate for the @@ -157,22 +148,20 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLRequestProperty, 4); * @} */ -#define PPB_URLREQUESTINFO_INTERFACE_0_2 "PPB_URLRequestInfo;0.2" -#define PPB_URLREQUESTINFO_INTERFACE_1_0 "PPB_URLRequestInfo;1.0" -#define PPB_URLREQUESTINFO_INTERFACE PPB_URLREQUESTINFO_INTERFACE_1_0 - /** - * * @addtogroup Interfaces * @{ */ - /** * The <code>PPB_URLRequestInfo</code> interface is used to create * and handle URL requests. This API is used in conjunction with * <code>PPB_URLLoader</code>. Refer to <code>PPB_URLLoader for further * information. */ +#define PPB_URLREQUESTINFO_INTERFACE_0_2 "PPB_URLRequestInfo;0.2" +#define PPB_URLREQUESTINFO_INTERFACE_1_0 "PPB_URLRequestInfo;1.0" +#define PPB_URLREQUESTINFO_INTERFACE PPB_URLREQUESTINFO_INTERFACE_1_0 + struct PPB_URLRequestInfo { /** * Create() creates a new <code>URLRequestInfo</code> object. @@ -184,7 +173,6 @@ struct PPB_URLRequestInfo { * <code>URLRequestInfo</code> if successful, 0 if the instance is invalid. */ PP_Resource (*Create)(PP_Instance instance); - /** * IsURLRequestInfo() determines if a resource is a * <code>URLRequestInfo</code>. @@ -197,7 +185,6 @@ struct PPB_URLRequestInfo { * invalid or some type other than <code>URLRequestInfo</code>. */ PP_Bool (*IsURLRequestInfo)(PP_Resource resource); - /** * SetProperty() sets a request property. The value of the property must be * the correct type according to the property being set. @@ -214,7 +201,6 @@ struct PPB_URLRequestInfo { PP_Bool (*SetProperty)(PP_Resource request, PP_URLRequestProperty property, struct PP_Var value); - /** * AppendDataToBody() appends data to the request body. A Content-Length * request header will be automatically generated. @@ -232,7 +218,6 @@ struct PPB_URLRequestInfo { PP_Bool (*AppendDataToBody)(PP_Resource request, const void* data, uint32_t len); - /** * AppendFileToBody() appends a file, to be uploaded, to the request body. * A content-length request header will be automatically generated. diff --git a/ppapi/c/ppb_url_response_info.h b/ppapi/c/ppb_url_response_info.h index 93051d4..1af0ec0 100644 --- a/ppapi/c/ppb_url_response_info.h +++ b/ppapi/c/ppb_url_response_info.h @@ -2,12 +2,16 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_URL_RESPONSE_INFO_H_ #define PPAPI_C_PPB_URL_RESPONSE_INFO_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" +#include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_var.h" /** @@ -16,12 +20,11 @@ * responses. */ + /** - * * @addtogroup Enums * @{ */ - /** * This enumeration contains properties set on a URL response. */ @@ -36,7 +39,6 @@ typedef enum { * HTML Resolving Relative URIs</a> documentation for further information. */ PP_URLRESPONSEPROPERTY_URL, - /** * This corresponds to a string (PP_VARTYPE_STRING); the absolute URL returned * in the response header's 'Location' field if this is a redirect response, @@ -45,7 +47,6 @@ typedef enum { * HTTP Status Codes - Redirection</a> documentation for further information. */ PP_URLRESPONSEPROPERTY_REDIRECTURL, - /** * This corresponds to a string (PP_VARTYPE_STRING); the HTTP method to be * used in a new request if this is a redirect response, an empty string @@ -54,7 +55,6 @@ typedef enum { * HTTP Status Codes - Redirection</a> documentation for further information. */ PP_URLRESPONSEPROPERTY_REDIRECTMETHOD, - /** * This corresponds to an int32 (PP_VARETYPE_INT32); the status code from the * response, e.g., 200 if the request was successful. Refer to the @@ -63,7 +63,6 @@ typedef enum { * information. */ PP_URLRESPONSEPROPERTY_STATUSCODE, - /** * This corresponds to a string (PP_VARTYPE_STRING); the status line * from the response. Refer to the @@ -71,7 +70,6 @@ typedef enum { * HTTP Response Status Line</a> documentation for further information. */ PP_URLRESPONSEPROPERTY_STATUSLINE, - /** * This corresponds to a string(PP_VARTYPE_STRING), a \n-delimited list of * header field/value pairs of the form "field: value", returned by the @@ -86,23 +84,20 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLResponseProperty, 4); * @} */ -#define PPB_URLRESPONSEINFO_INTERFACE_0_1 "PPB_URLResponseInfo;0.1" -#define PPB_URLRESPONSEINFO_INTERFACE_1_0 "PPB_URLResponseInfo;1.0" -#define PPB_URLRESPONSEINFO_INTERFACE PPB_URLRESPONSEINFO_INTERFACE_1_0 - /** - * * @addtogroup Interfaces * @{ */ - /** * The PPB_URLResponseInfo interface contains APIs for * examining URL responses. Refer to <code>PPB_URLLoader</code> for further * information. */ -struct PPB_URLResponseInfo { +#define PPB_URLRESPONSEINFO_INTERFACE_0_1 "PPB_URLResponseInfo;0.1" +#define PPB_URLRESPONSEINFO_INTERFACE_1_0 "PPB_URLResponseInfo;1.0" +#define PPB_URLRESPONSEINFO_INTERFACE PPB_URLRESPONSEINFO_INTERFACE_1_0 +struct PPB_URLResponseInfo { /** * IsURLResponseInfo() determines if a response is a * <code>URLResponseInfo</code>. @@ -115,7 +110,6 @@ struct PPB_URLResponseInfo { * invalid or some type other than <code>URLResponseInfo</code>. */ PP_Bool (*IsURLResponseInfo)(PP_Resource resource); - /** * GetProperty() gets a response property. * @@ -129,7 +123,6 @@ struct PPB_URLResponseInfo { */ struct PP_Var (*GetProperty)(PP_Resource response, PP_URLResponseProperty property); - /** * GetBodyAsFileRef() returns a FileRef pointing to the file containing the * response body. This is only valid if diff --git a/ppapi/c/ppb_var.h b/ppapi/c/ppb_var.h index ecd7514..2351536 100644 --- a/ppapi/c/ppb_var.h +++ b/ppapi/c/ppb_var.h @@ -2,6 +2,9 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPB_VAR_H_ #define PPAPI_C_PPB_VAR_H_ @@ -11,23 +14,23 @@ #include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_var.h" -#define PPB_VAR_INTERFACE_0_5 "PPB_Var;0.5" -#define PPB_VAR_INTERFACE_1_0 "PPB_Var;1.0" -#define PPB_VAR_INTERFACE PPB_VAR_INTERFACE_1_0 - /** * @file * This file defines the <code>PPB_Var</code> struct. */ + /** * @addtogroup Interfaces * @{ */ - /** * PPB_Var API */ +#define PPB_VAR_INTERFACE_0_5 "PPB_Var;0.5" +#define PPB_VAR_INTERFACE_1_0 "PPB_Var;1.0" +#define PPB_VAR_INTERFACE PPB_VAR_INTERFACE_1_0 + struct PPB_Var { /** * AddRef() adds a reference to the given var. If this is not a refcounted @@ -37,7 +40,6 @@ struct PPB_Var { * @param[in] var A <code>PP_Var</code> that will have a reference added. */ void (*AddRef)(struct PP_Var var); - /** * Release() removes a reference to given var, deleting it if the internal * reference count becomes 0. If the given var is not a refcounted object, @@ -47,7 +49,6 @@ struct PPB_Var { * @param[in] var A <code>PP_Var</code> that will have a reference removed. */ void (*Release)(struct PP_Var var); - /** * VarFromUtf8() creates a string var from a string. The string must be * encoded in valid UTF-8 and is NOT NULL-terminated, the length must be @@ -76,7 +77,6 @@ struct PPB_Var { struct PP_Var (*VarFromUtf8)(PP_Module module, const char* data, uint32_t len); - /** * VarToUtf8() converts a string-type var to a char* encoded in UTF-8. This * string is NOT NULL-terminated. The length will be placed in diff --git a/ppapi/c/ppp.h b/ppapi/c/ppp.h index 7b34ee8..5f42782 100644 --- a/ppapi/c/ppp.h +++ b/ppapi/c/ppp.h @@ -2,9 +2,22 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + +/* From ppp.idl modified Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPP_H_ #define PPAPI_C_PPP_H_ +#include "ppapi/c/pp_macros.h" + +/** + * @file + * This file defines three functions that your module must + * implement to interact with the browser. + */ + + + #include "ppapi/c/pp_module.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/ppb.h" @@ -15,15 +28,8 @@ #define PP_EXPORT __declspec(dllexport) #endif -/** - * @file - * This file defines three functions that your module must - * implement to interact with the browser. - */ - // {PENDING: undefine PP_EXPORT?} - /* We don't want name mangling for these external functions. We only need * 'extern "C"' if we're compiling with a C++ compiler. */ @@ -108,3 +114,4 @@ PP_EXPORT const void* PPP_GetInterface(const char* interface_name); #endif #endif /* PPAPI_C_PPP_H_ */ + diff --git a/ppapi/c/ppp_input_event.h b/ppapi/c/ppp_input_event.h index 0cceff1..e0067e6a 100644 --- a/ppapi/c/ppp_input_event.h +++ b/ppapi/c/ppp_input_event.h @@ -3,13 +3,27 @@ * found in the LICENSE file. */ +/* From ppp_input_event.idl modified Wed Jul 13 17:03:43 2011. */ + #ifndef PPAPI_C_PPP_INPUT_EVENT_H_ #define PPAPI_C_PPP_INPUT_EVENT_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_macros.h" #include "ppapi/c/pp_resource.h" +#include "ppapi/c/pp_stdint.h" + +/** + * @file + * This file defines the API for receiving input events form the browser. + */ + +/** + * @addtogroup Interfaces + * @{ + */ #define PPP_INPUT_EVENT_INTERFACE_0_1 "PPP_InputEvent;0.1" #define PPP_INPUT_EVENT_INTERFACE PPP_INPUT_EVENT_INTERFACE_0_1 @@ -37,5 +51,9 @@ struct PPP_InputEvent { */ PP_Bool (*HandleInputEvent)(PP_Instance instance, PP_Resource input_event); }; +/** + * @} + */ #endif /* PPAPI_C_PPP_INPUT_EVENT_H_ */ + diff --git a/ppapi/c/ppp_instance.h b/ppapi/c/ppp_instance.h index 3fd8263..f38f0ae 100644 --- a/ppapi/c/ppp_instance.h +++ b/ppapi/c/ppp_instance.h @@ -2,18 +2,23 @@ * 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 Sat Jul 16 16:50:26 2011. */ + #ifndef PPAPI_C_PPP_INSTANCE_H_ #define PPAPI_C_PPP_INSTANCE_H_ #include "ppapi/c/pp_bool.h" +#include "ppapi/c/pp_input_event.h" #include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_point.h" #include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_resource.h" - -struct PP_InputEvent; - -#define PPP_INSTANCE_INTERFACE_0_5 "PPP_Instance;0.5" -#define PPP_INSTANCE_INTERFACE PPP_INSTANCE_INTERFACE_0_5 +#include "ppapi/c/pp_size.h" +#include "ppapi/c/pp_stdint.h" +#include "ppapi/c/pp_time.h" +#include "ppapi/c/ppb_input_event.h" /** * @file @@ -21,10 +26,11 @@ struct PP_InputEvent; * pointers to methods that you must implement in your module. */ -/** @addtogroup Interfaces + +/** + * @addtogroup Interfaces * @{ */ - /** * The <code>PPP_Instance</code> interface contains pointers to a series of * functions that you must implement in your module. These functions can be @@ -32,6 +38,8 @@ struct PP_InputEvent; * to handle events such as change of focus or input events (keyboard/mouse) * events. */ +#define PPP_INSTANCE_INTERFACE_0_5 "PPP_Instance;0.5" +#define PPP_INSTANCE_INTERFACE PPP_INSTANCE_INTERFACE_0_5 struct PPP_Instance { /** @@ -77,7 +85,6 @@ struct PPP_Instance { uint32_t argc, const char* argn[], const char* argv[]); - /** * DidDestroy() is an instance destruction handler. This function is called * in many cases (see below) when a module instance is destroyed. It will be @@ -105,7 +112,6 @@ struct PPP_Instance { * of a module. */ void (*DidDestroy)(PP_Instance instance); - /** * DidChangeView() is called when the position, the size, of the clip * rectangle of the element in the browser that corresponds to this @@ -142,7 +148,6 @@ struct PPP_Instance { void (*DidChangeView)(PP_Instance instance, const struct PP_Rect* position, const struct PP_Rect* clip); - /** * DidChangeFocus() is called when an instance has gained or lost focus. * Having focus means that keyboard events will be sent to the instance. @@ -161,7 +166,6 @@ struct PPP_Instance { * @param[in] has_focus Indicates the new focused state of the instance. */ void (*DidChangeFocus)(PP_Instance instance, PP_Bool has_focus); - /** * HandleInputEvent() handles input events, such as keyboard events. This * function returns <code>PP_TRUE</code> if the event was handled or @@ -189,7 +193,6 @@ struct PPP_Instance { */ PP_Bool (*HandleInputEvent)(PP_Instance instance, const struct PP_InputEvent* event); - /** * HandleDocumentLoad() is called after initialize for a full-frame * module that was instantiated based on the MIME type of a DOMWindow @@ -219,11 +222,11 @@ struct PPP_Instance { */ PP_Bool (*HandleDocumentLoad)(PP_Instance instance, PP_Resource url_loader); }; - /** * @} */ + typedef struct PPP_Instance PPP_Instance_0_5; #endif /* PPAPI_C_PPP_INSTANCE_H_ */ diff --git a/ppapi/c/ppp_messaging.h b/ppapi/c/ppp_messaging.h index ef30494..56ff612 100644 --- a/ppapi/c/ppp_messaging.h +++ b/ppapi/c/ppp_messaging.h @@ -2,16 +2,17 @@ * 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 Wed Jul 13 16:51:47 2011. */ + #ifndef PPAPI_C_PPP_MESSAGING_H_ #define PPAPI_C_PPP_MESSAGING_H_ +#include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" - -struct PP_Var; - -#define PPP_MESSAGING_INTERFACE_0_1 "PPP_Messaging;0.1" -#define PPP_MESSAGING_INTERFACE_1_0 "PPP_Messaging;1.0" -#define PPP_MESSAGING_INTERFACE PPP_MESSAGING_INTERFACE_1_0 +#include "ppapi/c/pp_macros.h" +#include "ppapi/c/pp_stdint.h" +#include "ppapi/c/pp_var.h" /** * @file @@ -21,16 +22,20 @@ struct PP_Var; * */ + /** * @addtogroup Interfaces * @{ */ - /** * The <code>PPP_Messaging</code> interface contains pointers to functions * that you must implement to handle postMessage events on the associated * DOM element. */ +#define PPP_MESSAGING_INTERFACE_0_1 "PPP_Messaging;0.1" +#define PPP_MESSAGING_INTERFACE_1_0 "PPP_Messaging;1.0" +#define PPP_MESSAGING_INTERFACE PPP_MESSAGING_INTERFACE_1_0 + struct PPP_Messaging { /** * HandleMessage() is a function that the browser calls when PostMessage() @@ -69,5 +74,6 @@ struct PPP_Messaging { /** * @} */ + #endif /* PPAPI_C_PPP_MESSAGING_H_ */ |