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/tile_draw_quad.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/tile_draw_quad.h')
| -rw-r--r-- | cc/tile_draw_quad.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/tile_draw_quad.h b/cc/tile_draw_quad.h index 21a98cf..4802d82 100644 --- a/cc/tile_draw_quad.h +++ b/cc/tile_draw_quad.h @@ -6,7 +6,7 @@ #define CCTileDrawQuad_h #include "CCDrawQuad.h" -#include "GraphicsTypes3D.h" +#include "third_party/khronos/GLES2/gl2.h" #include "IntPoint.h" #include "IntSize.h" #include "base/memory/scoped_ptr.h" @@ -17,12 +17,12 @@ namespace cc { class CCTileDrawQuad : public CCDrawQuad { public: - static scoped_ptr<CCTileDrawQuad> create(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA); + static scoped_ptr<CCTileDrawQuad> create(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA); unsigned resourceId() const { return m_resourceId; } IntPoint textureOffset() const { return m_textureOffset; } IntSize textureSize() const { return m_textureSize; } - GC3Dint textureFilter() const { return m_textureFilter; } + GLint textureFilter() const { return m_textureFilter; } bool swizzleContents() const { return m_swizzleContents; } bool leftEdgeAA() const { return m_leftEdgeAA; } @@ -34,12 +34,12 @@ public: static const CCTileDrawQuad* materialCast(const CCDrawQuad*); private: - CCTileDrawQuad(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA); + CCTileDrawQuad(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA); unsigned m_resourceId; IntPoint m_textureOffset; IntSize m_textureSize; - GC3Dint m_textureFilter; + GLint m_textureFilter; bool m_swizzleContents; bool m_leftEdgeAA; bool m_topEdgeAA; |