diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 21:23:33 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 21:23:33 +0000 |
| commit | a803592b764704068582548d7cf9a7f8ce55a017 (patch) | |
| tree | c8946cbecb4548e2c442808859c631b2966af35a | |
| parent | 2167cd6288d2efd66b7ae640ab769d16dceb121c (diff) | |
| download | chromium_src-a803592b764704068582548d7cf9a7f8ce55a017.zip chromium_src-a803592b764704068582548d7cf9a7f8ce55a017.tar.gz chromium_src-a803592b764704068582548d7cf9a7f8ce55a017.tar.bz2 | |
Chromium style clang fixes for OVERRIDE in compositor_unittests
Fixes clang plugin complaint about missing override:
./ui/gfx/compositor/compositor_cc.h:35:11: error: [chromium-style] Overriding method must be marked with OVERRIDE.
virtual void* GetDisplay();
^
Also, adds |SetCurrent| call to properly track context in |GLContextNSView::MakeCurrent|.
BUG=104390
TEST=Compiles on Mac/clang. compositor_unittests pass.
R=piman@chromium.org, kbr@chromium.org
Review URL: http://codereview.chromium.org/8748018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112291 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/compositor/compositor_cc.h | 2 | ||||
| -rw-r--r-- | ui/gfx/compositor/layer.cc | 7 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_context_nsview.mm | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ui/gfx/compositor/compositor_cc.h b/ui/gfx/compositor/compositor_cc.h index 60f6eb1..def2181 100644 --- a/ui/gfx/compositor/compositor_cc.h +++ b/ui/gfx/compositor/compositor_cc.h @@ -32,7 +32,7 @@ class COMPOSITOR_EXPORT SharedResourcesCC virtual gfx::ScopedMakeCurrent* GetScopedMakeCurrent() OVERRIDE; - virtual void* GetDisplay(); + virtual void* GetDisplay() OVERRIDE; gfx::GLShareGroup* GetShareGroup(); diff --git a/ui/gfx/compositor/layer.cc b/ui/gfx/compositor/layer.cc index ffcb8a2..e26c032 100644 --- a/ui/gfx/compositor/layer.cc +++ b/ui/gfx/compositor/layer.cc @@ -17,14 +17,15 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" #include "ui/base/animation/animation.h" #include "ui/gfx/canvas_skia.h" -#if defined(USE_WEBKIT_COMPOSITOR) -#include "ui/gfx/compositor/compositor_cc.h" -#endif #include "ui/gfx/compositor/compositor_switches.h" #include "ui/gfx/compositor/layer_animator.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/point3.h" +#if defined(USE_WEBKIT_COMPOSITOR) +#include "ui/gfx/compositor/compositor_cc.h" +#endif + namespace { const float EPSILON = 1e-3f; diff --git a/ui/gfx/gl/gl_context_nsview.mm b/ui/gfx/gl/gl_context_nsview.mm index 1ad1c6d..c6d9a97 100644 --- a/ui/gfx/gl/gl_context_nsview.mm +++ b/ui/gfx/gl/gl_context_nsview.mm @@ -62,6 +62,8 @@ bool GLContextNSView::MakeCurrent(GLSurface* surface) { [context_ setView:view]; [context_ makeCurrentContext]; + SetCurrent(this, surface); + if (!surface->OnMakeCurrent(this)) { LOG(ERROR) << "Unable to make gl context current."; return false; |