cc/gl_renderer.cc - Issue 11227005: Reland "cc: Remove CC*.h temporary includes, part 1/4."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: cc/gl_renderer.cc

diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc

index 7f2ea51859171ac879b7cd51477d0689353f6ec7..ead431580ccb806f87161afc4a417c482f7fd8ff 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>

« no previous file with comments | « cc/gl_renderer.h ('k') | cc/gl_renderer_unittest.cc » ('j') | no next file with comments »