diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 13:40:29 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 13:40:29 +0000 |
| commit | ad5d142574850436f1ef5e2d94aa68c8d6594dfc (patch) | |
| tree | 915eb600b08485fb948c13769592698f1d3f0ae9 /cc/prioritized_texture.h | |
| parent | e3a71831c6eded3764955fd4d82b8e1b72b3773e (diff) | |
| download | chromium_src-ad5d142574850436f1ef5e2d94aa68c8d6594dfc.zip chromium_src-ad5d142574850436f1ef5e2d94aa68c8d6594dfc.tar.gz chromium_src-ad5d142574850436f1ef5e2d94aa68c8d6594dfc.tar.bz2 | |
Revert r162986 "cc: Remove CC*.h temporary includes, part 1/4."
Build fails with "gclient hooks failed" error.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/prioritized_texture.h')
| -rw-r--r-- | cc/prioritized_texture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/prioritized_texture.h b/cc/prioritized_texture.h index aff026e..fe06b17 100644 --- a/cc/prioritized_texture.h +++ b/cc/prioritized_texture.h @@ -7,12 +7,12 @@ #include "CCPriorityCalculator.h" #include "CCResourceProvider.h" +#include "CCTexture.h" #include "IntRect.h" #include "IntSize.h" #include "base/basictypes.h" -#include "base/logging.h" +#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "cc/texture.h" #include "third_party/khronos/GLES2/gl2.h" namespace cc { |