diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 00:29:30 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 00:29:30 +0000 |
| commit | 1c0088fc6cfec7c21c20a147218f49b8e34e21c0 (patch) | |
| tree | 4939597b2ca0d1357fa1f417a6a901159376854a /cc/resource_provider.cc | |
| parent | 57fe2460cc1baaaa66d691218de03b2cae77572b (diff) | |
| download | chromium_src-1c0088fc6cfec7c21c20a147218f49b8e34e21c0.zip chromium_src-1c0088fc6cfec7c21c20a147218f49b8e34e21c0.tar.gz chromium_src-1c0088fc6cfec7c21c20a147218f49b8e34e21c0.tar.bz2 | |
Revert 162284 - cc: Get rid of CC*.h temporary header files.
BUG=155413
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org
Review URL: https://codereview.chromium.org/11145033
TBR=tfarina@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_provider.cc')
| -rw-r--r-- | cc/resource_provider.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc index d90c6ee..4b2326b 100644 --- a/cc/resource_provider.cc +++ b/cc/resource_provider.cc @@ -4,13 +4,15 @@ #include "config.h" -#include "cc/resource_provider.h" +#include "CCResourceProvider.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" @@ -18,9 +20,7 @@ #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> |