Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Side by Side Diff: cc/CCRendererGL.h

Issue 10942040: Fix CC*Renderer and CC*LayerImpl to compile with Clang (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 5
6 #ifndef CCRendererGL_h 6 #ifndef CCRendererGL_h
7 #define CCRendererGL_h 7 #define CCRendererGL_h
8 8
9 #if USE(ACCELERATED_COMPOSITING) 9 #if USE(ACCELERATED_COMPOSITING)
10 10
(...skipping 25 matching lines...) Expand all
36 class CCRendererGL : public CCDirectRenderer, 36 class CCRendererGL : public CCDirectRenderer,
37 public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffers CompleteCallbackCHROMIUM, 37 public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffers CompleteCallbackCHROMIUM,
38 public WebKit::WebGraphicsContext3D::WebGraphicsMemoryAlloc ationChangedCallbackCHROMIUM , 38 public WebKit::WebGraphicsContext3D::WebGraphicsMemoryAlloc ationChangedCallbackCHROMIUM ,
39 public WebKit::WebGraphicsContext3D::WebGraphicsContextLost Callback { 39 public WebKit::WebGraphicsContext3D::WebGraphicsContextLost Callback {
40 WTF_MAKE_NONCOPYABLE(CCRendererGL); 40 WTF_MAKE_NONCOPYABLE(CCRendererGL);
41 public: 41 public:
42 static PassOwnPtr<CCRendererGL> create(CCRendererClient*, CCResourceProvider *); 42 static PassOwnPtr<CCRendererGL> create(CCRendererClient*, CCResourceProvider *);
43 43
44 virtual ~CCRendererGL(); 44 virtual ~CCRendererGL();
45 45
46 virtual const RendererCapabilities& capabilities() const OVERRIDE { return m _capabilities; } 46 virtual const RendererCapabilities& capabilities() const OVERRIDE;
47 47
48 WebKit::WebGraphicsContext3D* context(); 48 WebKit::WebGraphicsContext3D* context();
49 49
50 virtual void viewportChanged() OVERRIDE; 50 virtual void viewportChanged() OVERRIDE;
51 51
52 const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; } 52 const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
53 53
54 // waits for rendering to finish 54 // waits for rendering to finish
55 virtual void finish() OVERRIDE; 55 virtual void finish() OVERRIDE;
56 56
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 #else 228 #else
229 #define GLC(context, x) (x) 229 #define GLC(context, x) (x)
230 #endif 230 #endif
231 231
232 232
233 } 233 }
234 234
235 #endif // USE(ACCELERATED_COMPOSITING) 235 #endif // USE(ACCELERATED_COMPOSITING)
236 236
237 #endif 237 #endif
OLDNEW
« no previous file with comments | « cc/CCRenderer.cpp ('k') | cc/CCRendererGL.cpp » ('j') | cc/CCTiledLayerImpl.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698