summaryrefslogtreecommitdiffstats
path: root/cc/texture_layer.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 04:37:17 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 04:37:17 +0000
commit3b9f2df0b78911631b92fff4c174a37fd8077482 (patch)
tree7eceed9124cdad273658f9c813a51ccd37bfcdf0 /cc/texture_layer.cc
parent5b3065b13476000a1940aeabfec125c736d687da (diff)
downloadchromium_src-3b9f2df0b78911631b92fff4c174a37fd8077482.zip
chromium_src-3b9f2df0b78911631b92fff4c174a37fd8077482.tar.gz
chromium_src-3b9f2df0b78911631b92fff4c174a37fd8077482.tar.bz2
cc: Finish the rename from cc::GraphicsContext to cc::OutputSurface
It is far too confusing to deal with OutputSurface code when half the time it is called a GraphicsContext in correctly. Cleaning this up so I can think about the code properly as I upstream the Ubercomp CL. NOTRY=true R=jamesr,piman BUG=146080 Review URL: https://chromiumcodereview.appspot.com/11450019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/texture_layer.cc')
-rw-r--r--cc/texture_layer.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc
index 2afa51c..b6007f0 100644
--- a/cc/texture_layer.cc
+++ b/cc/texture_layer.cc
@@ -4,10 +4,11 @@
#include "cc/texture_layer.h"
-#include "third_party/khronos/GLES2/gl2.h"
#include "cc/layer_tree_host.h"
#include "cc/texture_layer_client.h"
#include "cc/texture_layer_impl.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/khronos/GLES2/gl2.h"
namespace cc {