diff options
| -rw-r--r-- | ppapi/c/pp_errors.h | 1 | ||||
| -rw-r--r-- | ppapi/cpp/url_loader.h | 4 | ||||
| -rw-r--r-- | ppapi/examples/gles2/gles2.cc | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/ppapi/c/pp_errors.h b/ppapi/c/pp_errors.h index a029e16..4a7b3e3 100644 --- a/ppapi/c/pp_errors.h +++ b/ppapi/c/pp_errors.h @@ -34,7 +34,6 @@ enum { * available. */ PP_OK_COMPLETIONPENDING = -1, - PP_ERROR_WOULDBLOCK = -1, /* DEPRECATED: DO NOT USE */ /** This value indicates failure for unspecified reasons. */ PP_ERROR_FAILED = -2, diff --git a/ppapi/cpp/url_loader.h b/ppapi/cpp/url_loader.h index a83f44a..0cfe5ea 100644 --- a/ppapi/cpp/url_loader.h +++ b/ppapi/cpp/url_loader.h @@ -29,7 +29,7 @@ class URLResponseInfo; // void ProcessURL(const char* url) { // CompletionCallback* cc = NewCallback(); // int32_t rv = loader_.Open(MakeRequest(url), cc); -// if (rv != PP_Error_WouldBlock) +// if (rv != PP_OK_COMPLETIONPENDING) // cc->Run(rv); // } // private: @@ -60,7 +60,7 @@ class URLResponseInfo; // void ReadMore() { // CompletionCallback* cc = NewCallback(); // int32_t rv = fio_.Read(offset_, buf_, sizeof(buf_), cc); -// if (rv != PP_Error_WouldBlock) +// if (rv != PP_OK_COMPLETIONPENDING) // cc->Run(rv); // } // void ProcessResponseInfo(const URLResponseInfo& response_info) { diff --git a/ppapi/examples/gles2/gles2.cc b/ppapi/examples/gles2/gles2.cc index 657159b..62e0711 100644 --- a/ppapi/examples/gles2/gles2.cc +++ b/ppapi/examples/gles2/gles2.cc @@ -8,7 +8,6 @@ #include <map> #include <set> #include <vector> - #include "ppapi/c/dev/ppb_opengles_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/cpp/dev/context_3d_dev.h" @@ -348,7 +347,7 @@ void GLES2DemoInstance::Render(const PP_GLESBuffer_Dev& buffer) { pp::CompletionCallback cb = callback_factory_.NewCallback( &GLES2DemoInstance::PaintFinished, buffer.info.id); - assert(surface_->SwapBuffers(cb) == PP_ERROR_WOULDBLOCK); + assert(surface_->SwapBuffers(cb) == PP_OK_COMPLETIONPENDING); assertNoGLError(); } |