diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 03:54:57 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 03:54:57 +0000 |
| commit | 8aad42dcc8d683242c730901c51061de710046b9 (patch) | |
| tree | 8039a09fa18702dca2681646612b54ef05957485 /ppapi/cpp | |
| parent | bf802a7a32cbd53466c30773498fa6c3674688ea (diff) | |
| download | chromium_src-8aad42dcc8d683242c730901c51061de710046b9.zip chromium_src-8aad42dcc8d683242c730901c51061de710046b9.tar.gz chromium_src-8aad42dcc8d683242c730901c51061de710046b9.tar.bz2 | |
Revert 69511 - Make Graphics3D::SwapBuffers take a completion callback
BUG=none
TEST=with pepper flash, rate control works
Review URL: http://codereview.chromium.org/5944001
TBR=piman@google.com
Review URL: http://codereview.chromium.org/5835007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp')
| -rw-r--r-- | ppapi/cpp/dev/graphics_3d_dev.cc | 5 | ||||
| -rw-r--r-- | ppapi/cpp/dev/graphics_3d_dev.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ppapi/cpp/dev/graphics_3d_dev.cc b/ppapi/cpp/dev/graphics_3d_dev.cc index b1fa037..a15417c 100644 --- a/ppapi/cpp/dev/graphics_3d_dev.cc +++ b/ppapi/cpp/dev/graphics_3d_dev.cc @@ -119,9 +119,8 @@ bool Graphics3D_Dev::MakeCurrent() const { return graphics_3d_f && graphics_3d_f->MakeCurent(pp_resource()); } -bool Graphics3D_Dev::SwapBuffers(const CompletionCallback& cc) const { - return graphics_3d_f && graphics_3d_f->SwapBuffers( - pp_resource(), cc.pp_completion_callback()); +bool Graphics3D_Dev::SwapBuffers() const { + return graphics_3d_f && graphics_3d_f->SwapBuffers(pp_resource()); } } // namespace pp diff --git a/ppapi/cpp/dev/graphics_3d_dev.h b/ppapi/cpp/dev/graphics_3d_dev.h index ac9406b..88fe47d 100644 --- a/ppapi/cpp/dev/graphics_3d_dev.h +++ b/ppapi/cpp/dev/graphics_3d_dev.h @@ -7,7 +7,6 @@ #include "ppapi/c/dev/ppb_graphics_3d_dev.h" #include "ppapi/c/dev/ppb_opengles_dev.h" -#include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/resource.h" @@ -42,7 +41,7 @@ class Graphics3D_Dev : public Resource { const int32_t* attrib_list); bool MakeCurrent() const; - bool SwapBuffers(const CompletionCallback& cc) const; + bool SwapBuffers() const; protected: explicit Graphics3D_Dev(PP_Resource resource_id) : Resource(resource_id) {} |