diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 23:35:43 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 23:35:43 +0000 |
| commit | d9c2852424a372ad67459719c398d9040e2c0111 (patch) | |
| tree | 68ca65cbcd9c3d791e9eced185c17d8fa4850bb6 /cc/tiled_layer.h | |
| parent | b9deda21a9b74d344d60081688b10fab4ebf0d4b (diff) | |
| download | chromium_src-d9c2852424a372ad67459719c398d9040e2c0111.zip chromium_src-d9c2852424a372ad67459719c398d9040e2c0111.tar.gz chromium_src-d9c2852424a372ad67459719c398d9040e2c0111.tar.bz2 | |
Remove GraphicsContext3D:: stubs from cc
cc needs GL enum values. In WebKit, these came from GraphicsContext3D::,
Extensions3D::, Extensions3DChromium and types came from GraphicsTypes3D.
In chromium, we juse use the GL headers for this.
BUG=144577
Review URL: https://chromiumcodereview.appspot.com/11111005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/tiled_layer.h')
| -rw-r--r-- | cc/tiled_layer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h index 6163391..fa701e0 100644 --- a/cc/tiled_layer.h +++ b/cc/tiled_layer.h @@ -46,7 +46,7 @@ protected: // Exposed to subclasses for testing. void setTileSize(const IntSize&); - void setTextureFormat(GC3Denum textureFormat) { m_textureFormat = textureFormat; } + void setTextureFormat(GLenum textureFormat) { m_textureFormat = textureFormat; } void setBorderTexelOption(CCLayerTilingData::BorderTexelOption); void setSampledTexelFormat(LayerTextureUpdater::SampledTexelFormat sampledTexelFormat) { m_sampledTexelFormat = sampledTexelFormat; } size_t numPaintedTiles() { return m_tiler->tiles().size(); } @@ -88,7 +88,7 @@ private: UpdatableTile* tileAt(int, int) const; UpdatableTile* createTile(int, int); - GC3Denum m_textureFormat; + GLenum m_textureFormat; bool m_skipsDraw; bool m_failedUpdate; LayerTextureUpdater::SampledTexelFormat m_sampledTexelFormat; |