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

Side by Side Diff: cc/CCRendererGL.cpp

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 #include "config.h" 6 #include "config.h"
7 7
8 #if USE(ACCELERATED_COMPOSITING) 8 #if USE(ACCELERATED_COMPOSITING)
9 #include "CCRendererGL.h" 9 #include "CCRendererGL.h"
10 10
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 143
144 CCRendererGL::~CCRendererGL() 144 CCRendererGL::~CCRendererGL()
145 { 145 {
146 ASSERT(CCProxy::isImplThread()); 146 ASSERT(CCProxy::isImplThread());
147 m_context->setSwapBuffersCompleteCallbackCHROMIUM(0); 147 m_context->setSwapBuffersCompleteCallbackCHROMIUM(0);
148 m_context->setMemoryAllocationChangedCallbackCHROMIUM(0); 148 m_context->setMemoryAllocationChangedCallbackCHROMIUM(0);
149 m_context->setContextLostCallback(0); 149 m_context->setContextLostCallback(0);
150 cleanupSharedObjects(); 150 cleanupSharedObjects();
151 } 151 }
152 152
153 const RendererCapabilities& CCRendererGL::capabilities() const
154 {
155 return m_capabilities;
156 }
157
153 WebGraphicsContext3D* CCRendererGL::context() 158 WebGraphicsContext3D* CCRendererGL::context()
154 { 159 {
155 return m_context; 160 return m_context;
156 } 161 }
157 162
158 void CCRendererGL::debugGLCall(WebGraphicsContext3D* context, const char* comman d, const char* file, int line) 163 void CCRendererGL::debugGLCall(WebGraphicsContext3D* context, const char* comman d, const char* file, int line)
159 { 164 {
160 unsigned long error = context->getError(); 165 unsigned long error = context->getError();
161 if (error != GraphicsContext3D::NO_ERROR) 166 if (error != GraphicsContext3D::NO_ERROR)
162 LOG_ERROR("GL command failed: File: %s\n\tLine %d\n\tcommand: %s, error %x\n", file, line, command, static_cast<int>(error)); 167 LOG_ERROR("GL command failed: File: %s\n\tLine %d\n\tcommand: %s, error %x\n", file, line, command, static_cast<int>(error));
(...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 } 1513 }
1509 1514
1510 bool CCRendererGL::isContextLost() 1515 bool CCRendererGL::isContextLost()
1511 { 1516 {
1512 return (m_context->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERRO R); 1517 return (m_context->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERRO R);
1513 } 1518 }
1514 1519
1515 } // namespace cc 1520 } // namespace cc
1516 1521
1517 #endif // USE(ACCELERATED_COMPOSITING) 1522 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW
« no previous file with comments | « cc/CCRendererGL.h ('k') | cc/CCResourceProvider.h » ('j') | cc/CCTiledLayerImpl.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698