"Replace" PPB_Flash's GetSettingInt with a more general GetSetting.

BUG=none
TEST=ui_tests PPAPITest.Flash and OutOfProcessPPAPITest.Flash


Review URL: https://chromiumcodereview.appspot.com/10546060

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

1 files changed, 20 insertions, 13 deletions

diff --git a/ppapi/api/private/ppb_flash.idl b/ppapi/api/private/ppb_flash.idl
index 8322932..8ce45ef 100644
--- a/ppapi/api/private/ppb_flash.idl
+++ b/ppapi/api/private/ppb_flash.idl
@@ -11,7 +11,8 @@ label Chrome {
   M17 = 12.0,
   M19 = 12.1,
   M20_0 = 12.2,
-  M20_1 = 12.3
+  M20_1 = 12.3,
+  M21 = 12.4
 };
 
 [assert_size(4)]
@@ -19,16 +20,15 @@ enum PP_FlashSetting {
   /**
    * Specifies if the system likely supports 3D hardware acceleration.
    *
-   * The result is an int where 1 corresponds to true and 0 corresponds to
-   * false, depending on the supported nature of 3D acceleration. If querying
-   * this function returns 1, the 3D system will normally use the native
-   * hardware for rendering which will be much faster.
+   * The result is a boolean PP_Var, depending on the supported nature of 3D
+   * acceleration. If querying this function returns true, the 3D system will
+   * normally use the native hardware for rendering which will be much faster.
    *
-   * Having this set to 1 only means that 3D should be used to draw 2D and
+   * Having this set to true only means that 3D should be used to draw 2D and
    * video elements. PP_FLASHSETTING_STAGE3D_ENABLED should be checked to
    * determine if it's ok to use 3D for arbitrary content.
    *
-   * In rare cases (depending on the platform) this value will be 1 but a
+   * In rare cases (depending on the platform) this value will be true but a
    * created 3D context will use emulation because context initialization
    * failed.
    */
@@ -36,15 +36,16 @@ enum PP_FlashSetting {
 
   /**
    * Specifies if the given instance is in private/inconito/off-the-record mode
-   * (returns 1) or "regular" mode (returns 0). Returns -1 on invalid instance.
+   * (returns true) or "regular" mode (returns false). Returns an undefined
+   * PP_Var on invalid instance.
    */
   PP_FLASHSETTING_INCOGNITO = 2,
 
   /**
-   * Specifies if arbitrary 3d commands are supported (returns 1), or if 3d
-   * should only be used for drawing 2d and video (returns 0).
+   * Specifies if arbitrary 3d commands are supported (returns true), or if 3d
+   * should only be used for drawing 2d and video (returns false).
    *
-   * This should only be enabled if PP_FLASHSETTING_3DENABLED is 1.
+   * This should only be enabled if PP_FLASHSETTING_3DENABLED is true.
    */
   PP_FLASHSETTING_STAGE3DENABLED = 3
 };
@@ -174,9 +175,15 @@ interface PPB_Flash {
   PP_Var GetDeviceID([in] PP_Instance instance);
 
   /**
-   * Returns the value associated with the given setting. Invalid enums will
-   * result in -1 return value.
+   * Deprecated. See GetSetting().
    */
   [version=12.3]
   int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting);
+
+  /**
+   * Returns the value associated with the given setting. Invalid enums will
+   * result in an undefined PP_Var return value.
+   */
+  [version=12.4]
+  PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting);
 };