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

Side by Side Diff: cc/program_binding.cc

Issue 11615020: Clean up cc and webkit/compositor_bindings include path shenanigans (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years 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
« no previous file with comments | « cc/platform_color.h ('k') | cc/rate_limiter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 #include "cc/program_binding.h" 5 #include "cc/program_binding.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "cc/geometry_binding.h" 8 #include "cc/geometry_binding.h"
9 #include "cc/gl_renderer.h" // For the GLC() macro. 9 #include "cc/gl_renderer.h" // For the GLC() macro.
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
10 #include "third_party/khronos/GLES2/gl2.h" 11 #include "third_party/khronos/GLES2/gl2.h"
11 #include <public/WebGraphicsContext3D.h>
12 12
13 using WebKit::WebGraphicsContext3D; 13 using WebKit::WebGraphicsContext3D;
14 14
15 namespace cc { 15 namespace cc {
16 16
17 ProgramBindingBase::ProgramBindingBase() 17 ProgramBindingBase::ProgramBindingBase()
18 : m_program(0) 18 : m_program(0)
19 , m_vertexShaderId(0) 19 , m_vertexShaderId(0)
20 , m_fragmentShaderId(0) 20 , m_fragmentShaderId(0)
21 , m_initialized(false) 21 , m_initialized(false)
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 GLC(context, context->deleteShader(m_fragmentShaderId)); 129 GLC(context, context->deleteShader(m_fragmentShaderId));
130 m_fragmentShaderId = 0; 130 m_fragmentShaderId = 0;
131 } 131 }
132 } 132 }
133 133
134 bool ProgramBindingBase::IsContextLost(WebGraphicsContext3D* context) { 134 bool ProgramBindingBase::IsContextLost(WebGraphicsContext3D* context) {
135 return (context->getGraphicsResetStatusARB() != GL_NO_ERROR); 135 return (context->getGraphicsResetStatusARB() != GL_NO_ERROR);
136 } 136 }
137 137
138 } // namespace cc 138 } // namespace cc
OLDNEW
« no previous file with comments | « cc/platform_color.h ('k') | cc/rate_limiter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698