summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authornhiroki@chromium.org <nhiroki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 05:41:37 +0000
committernhiroki@chromium.org <nhiroki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 05:41:37 +0000
commit799c6fe999b2439c59adbe7e08b42eace0fc1f37 (patch)
treeb621df2910431918fce3cf63da5d7282b70c933c /ppapi
parent9b34c1fdebbb9fea66273abda6946e2cffaae35a (diff)
downloadchromium_src-799c6fe999b2439c59adbe7e08b42eace0fc1f37.zip
chromium_src-799c6fe999b2439c59adbe7e08b42eace0fc1f37.tar.gz
chromium_src-799c6fe999b2439c59adbe7e08b42eace0fc1f37.tar.bz2
PPAPI: Promote PPB_FileRef (v1.2) to stable
BUG=314879 TEST=browser_tests R=dmichael@chromium.org Review URL: https://codereview.chromium.org/135393005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/api/ppb_file_ref.idl2
-rw-r--r--ppapi/c/ppb_file_ref.h12
-rw-r--r--ppapi/thunk/interfaces_ppb_public_dev_channel.h1
-rw-r--r--ppapi/thunk/interfaces_ppb_public_stable.h1
4 files changed, 8 insertions, 8 deletions
diff --git a/ppapi/api/ppb_file_ref.idl b/ppapi/api/ppb_file_ref.idl
index 7685836..f3207e0 100644
--- a/ppapi/api/ppb_file_ref.idl
+++ b/ppapi/api/ppb_file_ref.idl
@@ -11,7 +11,7 @@
label Chrome {
M14 = 1.0,
M28 = 1.1,
- [channel=dev] M34 = 1.2
+ M34 = 1.2
};
/**
diff --git a/ppapi/c/ppb_file_ref.h b/ppapi/c/ppb_file_ref.h
index 035e3ee..b4f2955 100644
--- a/ppapi/c/ppb_file_ref.h
+++ b/ppapi/c/ppb_file_ref.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* From ppb_file_ref.idl modified Wed Jan 8 12:40:12 2014. */
+/* From ppb_file_ref.idl modified Wed Jan 29 20:50:29 2014. */
#ifndef PPAPI_C_PPB_FILE_REF_H_
#define PPAPI_C_PPB_FILE_REF_H_
@@ -20,8 +20,8 @@
#define PPB_FILEREF_INTERFACE_1_0 "PPB_FileRef;1.0"
#define PPB_FILEREF_INTERFACE_1_1 "PPB_FileRef;1.1"
-#define PPB_FILEREF_INTERFACE_1_2 "PPB_FileRef;1.2" /* dev */
-#define PPB_FILEREF_INTERFACE PPB_FILEREF_INTERFACE_1_1
+#define PPB_FILEREF_INTERFACE_1_2 "PPB_FileRef;1.2"
+#define PPB_FILEREF_INTERFACE PPB_FILEREF_INTERFACE_1_2
/**
* @file
@@ -61,7 +61,7 @@ typedef enum {
* a file system. This struct contains a <code>PP_FileSystemType</code>
* identifier and a file path string.
*/
-struct PPB_FileRef_1_2 { /* dev */
+struct PPB_FileRef_1_2 {
/**
* Create() creates a weak pointer to a file in the given file system. File
* paths are POSIX style.
@@ -233,6 +233,8 @@ struct PPB_FileRef_1_2 { /* dev */
struct PP_CompletionCallback callback);
};
+typedef struct PPB_FileRef_1_2 PPB_FileRef;
+
struct PPB_FileRef_1_0 {
PP_Resource (*Create)(PP_Resource file_system, const char* path);
PP_Bool (*IsFileRef)(PP_Resource resource);
@@ -280,8 +282,6 @@ struct PPB_FileRef_1_1 {
struct PP_ArrayOutput output,
struct PP_CompletionCallback callback);
};
-
-typedef struct PPB_FileRef_1_1 PPB_FileRef;
/**
* @}
*/
diff --git a/ppapi/thunk/interfaces_ppb_public_dev_channel.h b/ppapi/thunk/interfaces_ppb_public_dev_channel.h
index 7269c4e..24e42c5 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev_channel.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev_channel.h
@@ -10,7 +10,6 @@
// Interfaces go here.
PROXIED_IFACE(PPB_AUDIOFRAME_INTERFACE_0_1, PPB_AudioFrame_0_1)
PROXIED_IFACE(PPB_FILEMAPPING_INTERFACE_0_1, PPB_FileMapping_0_1)
-PROXIED_IFACE(PPB_FILEREF_INTERFACE_1_2, PPB_FileRef_1_2)
PROXIED_IFACE(PPB_MEDIASTREAMAUDIOTRACK_INTERFACE_0_1,
PPB_MediaStreamAudioTrack_0_1)
PROXIED_IFACE(PPB_MEDIASTREAMVIDEOTRACK_INTERFACE_0_1,
diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h
index 45ce4d7..578e37d 100644
--- a/ppapi/thunk/interfaces_ppb_public_stable.h
+++ b/ppapi/thunk/interfaces_ppb_public_stable.h
@@ -53,6 +53,7 @@ PROXIED_IFACE(PPB_AUDIO_INTERFACE_1_0, PPB_Audio_1_0)
PROXIED_IFACE(PPB_AUDIO_INTERFACE_1_1, PPB_Audio_1_1)
PROXIED_IFACE(PPB_FILEREF_INTERFACE_1_0, PPB_FileRef_1_0)
PROXIED_IFACE(PPB_FILEREF_INTERFACE_1_1, PPB_FileRef_1_1)
+PROXIED_IFACE(PPB_FILEREF_INTERFACE_1_2, PPB_FileRef_1_2)
PROXIED_IFACE(PPB_FILESYSTEM_INTERFACE_1_0, PPB_FileSystem_1_0)
PROXIED_IFACE(PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D_1_0)
PROXIED_IFACE(PPB_IMAGEDATA_INTERFACE_1_0, PPB_ImageData_1_0)