Rev the Flash interface to add new functionality.

This adds support for IDL in the private directory. Some of the interfaces there don't actually work, they were a work in progress and this breaks everything, so I moved the broken files to a new subdirectory. Everything left in the api/private directory can be autogenerated now.

BUG=
TEST=

Review URL: http://codereview.chromium.org/8930023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114534 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 148 insertions, 92 deletions

diff --git a/ppapi/c/private/ppb_file_ref_private.h b/ppapi/c/private/ppb_file_ref_private.h
index ea1dabe..43c1cfe 100644
--- a/ppapi/c/private/ppb_file_ref_private.h
+++ b/ppapi/c/private/ppb_file_ref_private.h
@@ -3,11 +3,15 @@
  * found in the LICENSE file.
  */
 
+/* From private/ppb_file_ref_private.idl modified Mon Dec 12 14:04:17 2011. */
+
 #ifndef PPAPI_C_PRIVATE_PPB_FILE_REF_PRIVATE_H_
 #define PPAPI_C_PRIVATE_PPB_FILE_REF_PRIVATE_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"
 
 #define PPB_FILEREFPRIVATE_INTERFACE_0_1 "PPB_FileRefPrivate;0.1"
@@ -15,8 +19,7 @@
 
 /**
  * @file
- * This file contains the <code>PPB_FileRefPrivate</code> interface.
- */
+ * This file contains the <code>PPB_FileRefPrivate</code> interface. */
 
 
 /**
@@ -40,3 +43,4 @@ struct PPB_FileRefPrivate {
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPB_FILE_REF_PRIVATE_H_ */
+
diff --git a/ppapi/c/private/ppb_flash.h b/ppapi/c/private/ppb_flash.h
index d0bff42..9d33247 100644
--- a/ppapi/c/private/ppb_flash.h
+++ b/ppapi/c/private/ppb_flash.h
@@ -1,90 +1,142 @@
-/* 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.
- */
-
-#ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_
-#define PPAPI_C_PRIVATE_PPB_FLASH_H_
-
-#include "ppapi/c/pp_bool.h"
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_module.h"
-#include "ppapi/c/pp_point.h"
-#include "ppapi/c/pp_rect.h"
-#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_time.h"
-#include "ppapi/c/pp_var.h"
-
-#define PPB_FLASH_INTERFACE "PPB_Flash;11"
-
-/**
- * @file
- * This file contains the <code>PPB_Flash</code> interface.
- */
-
-
-/**
- * @addtogroup Interfaces
- * @{
- */
-/**
- * The <code>PPB_Flash</code> interface contains pointers to various functions
- * that are only needed to support Pepper Flash.
- */
-struct PPB_Flash {
-  /**
-   * 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
-   * this case.
-   */
-  void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);
-  PP_Bool (*DrawGlyphs)(PP_Instance instance,
-                        PP_Resource pp_image_data,
-                        const struct PP_FontDescription_Dev* font_desc,
-                        uint32_t color,
-                        struct PP_Point position,
-                        struct PP_Rect clip,
-                        const float transformation[3][3],
-                        uint32_t glyph_count,
-                        const uint16_t glyph_indices[],
-                        const struct PP_Point glyph_advances[]);
-  /**
-   * Retrieves the proxy that will be used for the given URL. The result will
-   * be a string in PAC format, or an undefined var on error.
-   */
-  struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url);
-  /**
-   * Navigate to the URL given by the given URLRequestInfo. (This supports GETs,
-   * POSTs, and javascript: URLs.) May open a new tab if target is not "_self".
-   */
-  int32_t (*Navigate)(PP_Resource request_info,
-                      const char* target,
-                      bool from_user_action);
-  /**
-   * Runs a nested message loop. The plugin will be reentered from this call.
-   * This function is used in places where Flash would normally enter a nested
-   * message loop (e.g., when displaying context menus), but Pepper provides
-   * only an asynchronous call. After performing that asynchronous call, call
-   * |RunMessageLoop()|. In the callback, call |QuitMessageLoop()|.
-   */
-  void (*RunMessageLoop)(PP_Instance instance);
-  /**
-   * Posts a quit message for the outermost nested message loop. Use this to
-   * exit and return back to the caller after you call RunMessageLoop.
-   */
-  void (*QuitMessageLoop)(PP_Instance instance);
-  /**
-   * Retrieves the local time zone offset from GM time for the given UTC time.
-   */
-  double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t);
-  /**
-   * Gets a (string) with "command-line" options for Flash; used to pass
-   * run-time debugging parameters, etc.
-   */
-  struct PP_Var (*GetCommandLineArgs)(PP_Module module);
-};
-/**
- * @}
- */
-
-#endif  /* PPAPI_C_PRIVATE_PPB_FLASH_H_ */
+/* 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 private/ppb_flash.idl modified Wed Dec 14 13:56:17 2011. */

+

+#ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_

+#define PPAPI_C_PRIVATE_PPB_FLASH_H_

+

+#include "ppapi/c/dev/ppb_font_dev.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_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"

+#include "ppapi/c/pp_time.h"

+#include "ppapi/c/pp_var.h"

+

+#define PPB_FLASH_INTERFACE_12_0 "PPB_Flash;12.0"

+#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_12_0

+

+/**

+ * @file

+ * This file contains the <code>PPB_Flash</code> interface.

+ */

+

+

+/**

+ * @addtogroup Interfaces

+ * @{

+ */

+/**

+ * The <code>PPB_Flash</code> interface contains pointers to various functions

+ * that are only needed to support Pepper Flash.

+ */

+struct PPB_Flash {

+  /**

+   * 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

+   * this case.

+   */

+  void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);

+  /**

+   * Draws the given pre-laid-out text. It is almost equivalent to Windows'

+   * ExtTextOut with the addition of the transformation (a 3x3 matrix given the

+   * transform to apply before drawing). It also adds the allow_subpixel_aa

+   * flag which when true, will use subpixel antialiasing if enabled in the

+   * system settings. For this to work properly, the graphics layer that the

+   * text is being drawn into must be opaque.

+   */

+  PP_Bool (*DrawGlyphs)(PP_Instance instance,

+                        PP_Resource pp_image_data,

+                        const struct PP_FontDescription_Dev* font_desc,

+                        uint32_t color,

+                        const struct PP_Point* position,

+                        const struct PP_Rect* clip,

+                        const float transformation[3][3],

+                        PP_Bool allow_subpixel_aa,

+                        uint32_t glyph_count,

+                        const uint16_t glyph_indices[],

+                        const struct PP_Point glyph_advances[]);

+  /**

+   * Retrieves the proxy that will be used for the given URL. The result will

+   * be a string in PAC format, or an undefined var on error.

+   */

+  struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url);

+  /**

+   * Navigate to the URL given by the given URLRequestInfo. (This supports GETs,

+   * POSTs, and javascript: URLs.) May open a new tab if target is not "_self".

+   */

+  int32_t (*Navigate)(PP_Resource request_info,

+                      const char* target,

+                      PP_Bool from_user_action);

+  /**

+   * Runs a nested message loop. The plugin will be reentered from this call.

+   * This function is used in places where Flash would normally enter a nested

+   * message loop (e.g., when displaying context menus), but Pepper provides

+   * only an asynchronous call. After performing that asynchronous call, call

+   * |RunMessageLoop()|. In the callback, call |QuitMessageLoop()|.

+   */

+  void (*RunMessageLoop)(PP_Instance instance);

+  /* Posts a quit message for the outermost nested message loop. Use this to

+   * exit and return back to the caller after you call RunMessageLoop.

+   */

+  void (*QuitMessageLoop)(PP_Instance instance);

+  /**

+   * Retrieves the local time zone offset from GM time for the given UTC time.

+   */

+  double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t);

+  /**

+   * Gets a (string) with "command-line" options for Flash; used to pass

+   * run-time debugging parameters, etc.

+   */

+  struct PP_Var (*GetCommandLineArgs)(PP_Module module);

+  /**

+   * Loads the given font in a more priviledged process on Windows. Call this if

+   * Windows is giving errors for font calls. See

+   * content/renderer/font_cache_dispatcher_win.cc

+   *

+   * The parameter is a pointer to a LOGFONTW structure.

+   *

+   * On non-Windows platforms, this function does nothing.

+   */

+  void (*PreloadFontWin)(const void* logfontw);

+};

+/**

+ * @}

+ */

+

+/**

+ * The old version of the interface, which cannot be generated from IDL.

+ * TODO(viettrungluu): Remove this when enough time has passed. crbug.com/104184

+ */

+#define PPB_FLASH_INTERFACE_11_0 "PPB_Flash;11"

+struct PPB_Flash_11 {

+  void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);

+  PP_Bool (*DrawGlyphs)(PP_Instance instance,

+                        PP_Resource pp_image_data,

+                        const struct PP_FontDescription_Dev* font_desc,

+                        uint32_t color,

+                        struct PP_Point position,

+                        struct PP_Rect clip,

+                        const float transformation[3][3],

+                        uint32_t glyph_count,

+                        const uint16_t glyph_indices[],

+                        const struct PP_Point glyph_advances[]);

+  struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url);

+  int32_t (*Navigate)(PP_Resource request_info,

+                      const char* target,

+                      bool from_user_action);

+  void (*RunMessageLoop)(PP_Instance instance);

+  void (*QuitMessageLoop)(PP_Instance instance);

+  double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t);

+  struct PP_Var (*GetCommandLineArgs)(PP_Module module);

+};

+#endif  /* PPAPI_C_PRIVATE_PPB_FLASH_H_ */

+