summaryrefslogtreecommitdiffstats
path: root/ppapi/c/pp_errors.h
diff options
context:
space:
mode:
authorpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 22:46:44 +0000
committerpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 22:46:44 +0000
commit996bdbda28035f7f68955525625c998290706281 (patch)
treedfc61c5633359f02e40421e0240aeac25753b642 /ppapi/c/pp_errors.h
parenta965ca65e8170b3d685b7ca9185929fe3915b7f9 (diff)
downloadchromium_src-996bdbda28035f7f68955525625c998290706281.zip
chromium_src-996bdbda28035f7f68955525625c998290706281.tar.gz
chromium_src-996bdbda28035f7f68955525625c998290706281.tar.bz2
1;2cReplace PP_ERROR_WOULDBLOCK with PP_OK_COMPLETIONPENDING. Improve error code comments. Update all code that uses this error code. Keep the old code for now flagging it as deprecated. Update copyrights.
BUG=none TEST=bots Review URL: http://codereview.chromium.org/6814033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c/pp_errors.h')
-rw-r--r--ppapi/c/pp_errors.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/ppapi/c/pp_errors.h b/ppapi/c/pp_errors.h
index 36911b2..da2f5b4 100644
--- a/ppapi/c/pp_errors.h
+++ b/ppapi/c/pp_errors.h
@@ -1,4 +1,4 @@
-/* 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.
*/
@@ -7,7 +7,7 @@
/**
* @file
- * This file defines an enumeration of all Native Client errors.
+ * This file defines an enumeration of all PPAPI error codes.
*/
/**
@@ -16,19 +16,25 @@
* @{
*/
-/** This enumeration contains enumerators of all Native Client errors.
+/** This enumeration contains enumerators of all PPAPI error codes.
* Errors are negative valued.
*/
enum {
+ /**
+ * This value is returned by a function on successful synchronous completion
+ * or is passed as a result to a PP_CompletionCallback_Func on successful
+ * asynchronous completion.
+ */
PP_OK = 0,
/**
* This value is returned by a function that accepts a PP_CompletionCallback
- * and cannot complete synchronously. This error indicates that the given
+ * and cannot complete synchronously. This code indicates that the given
* callback will be asynchronously notified of the final result once it is
* available.
*/
- PP_ERROR_WOULDBLOCK = -1,
+ PP_OK_COMPLETIONPENDING = -1,
+ PP_ERROR_WOULDBLOCK = -1, /* DEPRECATED: DO NOT USE */
/** This value indicates failure for unspecified reasons. */
PP_ERROR_FAILED = -2,
@@ -96,4 +102,3 @@ enum {
*/
#endif /* PPAPI_C_PP_ERRORS_H_ */
-