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

Side by Side Diff: cc/gl_renderer.cc

Issue 11227005: Reland "cc: Remove CC*.h temporary includes, part 1/4." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: the fix Created 8 years, 2 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
« no previous file with comments | « cc/gl_renderer.h ('k') | cc/gl_renderer_unittest.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 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 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCRendererGL.h" 7 #include "CCRendererGL.h"
8 8
9 #include "third_party/khronos/GLES2/gl2.h"
10 #include "third_party/khronos/GLES2/gl2ext.h"
11 #include "CCDamageTracker.h" 9 #include "CCDamageTracker.h"
12 #include "CCLayerQuad.h" 10 #include "CCLayerQuad.h"
13 #include "CCMathUtil.h" 11 #include "CCMathUtil.h"
14 #include "CCProxy.h" 12 #include "CCProxy.h"
15 #include "CCRenderPass.h" 13 #include "CCRenderPass.h"
16 #include "CCRenderSurfaceFilters.h" 14 #include "CCRenderSurfaceFilters.h"
17 #include "CCScopedTexture.h" 15 #include "CCScopedTexture.h"
18 #include "CCSettings.h" 16 #include "CCSettings.h"
19 #include "CCSingleThreadProxy.h"
20 #include "CCVideoLayerImpl.h" 17 #include "CCVideoLayerImpl.h"
21 #include "FloatQuad.h" 18 #include "FloatQuad.h"
22 #include "GrTexture.h" 19 #include "GrTexture.h"
23 #include "NotImplemented.h" 20 #include "NotImplemented.h"
24 #include "base/debug/trace_event.h" 21 #include "base/debug/trace_event.h"
22 #include "base/logging.h"
25 #include "base/string_split.h" 23 #include "base/string_split.h"
26 #include "base/string_util.h" 24 #include "base/string_util.h"
27 #include "base/logging.h"
28 #include "cc/geometry_binding.h" 25 #include "cc/geometry_binding.h"
29 #include "cc/platform_color.h" 26 #include "cc/platform_color.h"
27 #include "cc/single_thread_proxy.h"
28 #include "cc/stream_video_draw_quad.h"
29 #include "cc/texture_draw_quad.h"
30 #include "third_party/khronos/GLES2/gl2.h"
31 #include "third_party/khronos/GLES2/gl2ext.h"
30 #include "third_party/skia/include/core/SkBitmap.h" 32 #include "third_party/skia/include/core/SkBitmap.h"
31 #include "third_party/skia/include/core/SkColor.h" 33 #include "third_party/skia/include/core/SkColor.h"
32 #include <public/WebGraphicsContext3D.h> 34 #include <public/WebGraphicsContext3D.h>
33 #include <public/WebSharedGraphicsContext3D.h> 35 #include <public/WebSharedGraphicsContext3D.h>
34 #include <public/WebVideoFrame.h> 36 #include <public/WebVideoFrame.h>
35 #include <set> 37 #include <set>
36 #include <string> 38 #include <string>
37 #include <vector> 39 #include <vector>
38 #include <wtf/CurrentTime.h> 40 #include <wtf/CurrentTime.h>
39 41
(...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 1514
1513 releaseRenderPassTextures(); 1515 releaseRenderPassTextures();
1514 } 1516 }
1515 1517
1516 bool CCRendererGL::isContextLost() 1518 bool CCRendererGL::isContextLost()
1517 { 1519 {
1518 return (m_context->getGraphicsResetStatusARB() != GL_NO_ERROR); 1520 return (m_context->getGraphicsResetStatusARB() != GL_NO_ERROR);
1519 } 1521 }
1520 1522
1521 } // namespace cc 1523 } // namespace cc
OLDNEW
« no previous file with comments | « cc/gl_renderer.h ('k') | cc/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698