diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 18:16:38 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 18:16:38 +0000 |
| commit | 4456eee2eaca5737a9482303a1cea8998223cb14 (patch) | |
| tree | 924688951a916dcf3745792ebabbd9cd598883f0 /cc/gl_renderer.cc | |
| parent | 0152773a7e8c07b7c8bc3b536a1fbaf444402445 (diff) | |
| download | chromium_src-4456eee2eaca5737a9482303a1cea8998223cb14.zip chromium_src-4456eee2eaca5737a9482303a1cea8998223cb14.tar.gz chromium_src-4456eee2eaca5737a9482303a1cea8998223cb14.tar.bz2 | |
Reland "cc: Remove CC*.h temporary includes, part 1/4."
Exception: Missing input files:
c:\b\build\slave\cr-win-rel\build\src\cc\CCTextureUpdateQueue.h
Relanding with this file removed as well.
BUG=155413
TEST=cc_unittests
TBR=enne@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11227005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/gl_renderer.cc')
| -rw-r--r-- | cc/gl_renderer.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc index 7f2ea51..ead4315 100644 --- a/cc/gl_renderer.cc +++ b/cc/gl_renderer.cc @@ -6,8 +6,6 @@ #include "CCRendererGL.h" -#include "third_party/khronos/GLES2/gl2.h" -#include "third_party/khronos/GLES2/gl2ext.h" #include "CCDamageTracker.h" #include "CCLayerQuad.h" #include "CCMathUtil.h" @@ -16,17 +14,21 @@ #include "CCRenderSurfaceFilters.h" #include "CCScopedTexture.h" #include "CCSettings.h" -#include "CCSingleThreadProxy.h" #include "CCVideoLayerImpl.h" #include "FloatQuad.h" #include "GrTexture.h" #include "NotImplemented.h" #include "base/debug/trace_event.h" +#include "base/logging.h" #include "base/string_split.h" #include "base/string_util.h" -#include "base/logging.h" #include "cc/geometry_binding.h" #include "cc/platform_color.h" +#include "cc/single_thread_proxy.h" +#include "cc/stream_video_draw_quad.h" +#include "cc/texture_draw_quad.h" +#include "third_party/khronos/GLES2/gl2.h" +#include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include <public/WebGraphicsContext3D.h> |