summaryrefslogtreecommitdiffstats
path: root/ppapi/c/trusted
diff options
context:
space:
mode:
authornoelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 00:41:22 +0000
committernoelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 00:41:22 +0000
commit5f79c2adde064424d6b19f8673ef82e9cb92774d (patch)
treeecf40509498dce2ed6b04ab1ff5ac3d694d307e1 /ppapi/c/trusted
parent30c918084bac874b6cfaabb93f0bb2545c5354e2 (diff)
downloadchromium_src-5f79c2adde064424d6b19f8673ef82e9cb92774d.zip
chromium_src-5f79c2adde064424d6b19f8673ef82e9cb92774d.tar.gz
chromium_src-5f79c2adde064424d6b19f8673ef82e9cb92774d.tar.bz2
Integrate NaCl Head - Revert 69309 to restore 64b handles in PPAPI
BUG= http://code.google.com/p/nativeclient/issues/detail?id=933 TEST=It compiles can run the nacl ppapi srpc test Review URL: http://codereview.chromium.org/6041001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c/trusted')
-rw-r--r--ppapi/c/trusted/ppb_image_data_trusted.h2
-rw-r--r--ppapi/c/trusted/ppb_url_loader_trusted.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/c/trusted/ppb_image_data_trusted.h b/ppapi/c/trusted/ppb_image_data_trusted.h
index 9d2f3a7..bbc944d 100644
--- a/ppapi/c/trusted/ppb_image_data_trusted.h
+++ b/ppapi/c/trusted/ppb_image_data_trusted.h
@@ -8,7 +8,7 @@
#include "ppapi/c/pp_stdint.h"
#include "ppapi/c/pp_resource.h"
-#define PPB_IMAGEDATA_TRUSTED_INTERFACE "PPB_ImageDataTrusted;0.4"
+#define PPB_IMAGEDATA_TRUSTED_INTERFACE "PPB_ImageDataTrusted;0.3"
struct PPB_ImageDataTrusted {
/**
diff --git a/ppapi/c/trusted/ppb_url_loader_trusted.h b/ppapi/c/trusted/ppb_url_loader_trusted.h
index a9b15cf..4e027f9 100644
--- a/ppapi/c/trusted/ppb_url_loader_trusted.h
+++ b/ppapi/c/trusted/ppb_url_loader_trusted.h
@@ -9,7 +9,7 @@
#include "ppapi/c/pp_resource.h"
#include "ppapi/c/pp_stdint.h"
-#define PPB_URLLOADERTRUSTED_INTERFACE "PPB_URLLoaderTrusted;0.3"
+#define PPB_URLLOADERTRUSTED_INTERFACE "PPB_URLLoaderTrusted;0.2"
// Callback that indicates the status of the download and upload for the
// given URLLoader resource.