cc/resource_provider.cc - Issue 11145033: cc: Get rid of CC*.h temporary header files.

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/resource_provider.cc

Issue 11145033: cc: Get rid of CC*.h temporary header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased - fixed the conflicts hopefuly 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/resource_provider.cc

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

index 4b2326bc44a9c4f3c3f36990300e44d062cbcf0e..d90c6eee31d9062cd1b1489b05d40848ad8612d2 100644

--- a/cc/resource_provider.cc

+++ b/cc/resource_provider.cc

@@ -4,15 +4,13 @@

#include "config.h"

-#include "CCResourceProvider.h"

+#include "cc/resource_provider.h"

#ifdef LOG

#undef LOG

#endif

#include <limits.h>

-#include "CCProxy.h"

-#include "CCRendererGL.h" // For the GLC() macro.

#include "Extensions3DChromium.h"

#include "IntRect.h"

#include "base/debug/alias.h"

@@ -20,7 +18,9 @@

#include "base/stl_util.h"

#include "base/string_split.h"

#include "base/string_util.h"

+#include "cc/gl_renderer.h" // For the GLC() macro.

#include "cc/layer_texture_sub_image.h"

+#include "cc/proxy.h"

#include "cc/throttled_texture_uploader.h"

#include "cc/unthrottled_texture_uploader.h"

#include <public/WebGraphicsContext3D.h>

« no previous file with comments | « cc/render_surface_impl.cc ('k') | cc/resource_provider_unittest.cc » ('j') | no next file with comments »