| Index: cc/CCTileDrawQuad.h
|
| diff --git a/cc/CCTileDrawQuad.h b/cc/CCTileDrawQuad.h
|
| index 21a98cfb864a41b095fd9b8aba439ffb86945c14..584c439f2d6eb9004ec211d5d9680e3cd7ef3758 100644
|
| --- a/cc/CCTileDrawQuad.h
|
| +++ b/cc/CCTileDrawQuad.h
|
| @@ -2,53 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CCTileDrawQuad_h
|
| -#define CCTileDrawQuad_h
|
| -
|
| -#include "CCDrawQuad.h"
|
| -#include "GraphicsTypes3D.h"
|
| -#include "IntPoint.h"
|
| -#include "IntSize.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -
|
| -namespace cc {
|
| -
|
| -#pragma pack(push, 4)
|
| -
|
| -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);
|
| -
|
| - unsigned resourceId() const { return m_resourceId; }
|
| - IntPoint textureOffset() const { return m_textureOffset; }
|
| - IntSize textureSize() const { return m_textureSize; }
|
| - GC3Dint textureFilter() const { return m_textureFilter; }
|
| - bool swizzleContents() const { return m_swizzleContents; }
|
| -
|
| - bool leftEdgeAA() const { return m_leftEdgeAA; }
|
| - bool topEdgeAA() const { return m_topEdgeAA; }
|
| - bool rightEdgeAA() const { return m_rightEdgeAA; }
|
| - bool bottomEdgeAA() const { return m_bottomEdgeAA; }
|
| -
|
| - bool isAntialiased() const { return leftEdgeAA() || topEdgeAA() || rightEdgeAA() || bottomEdgeAA(); }
|
| -
|
| - 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);
|
| -
|
| - unsigned m_resourceId;
|
| - IntPoint m_textureOffset;
|
| - IntSize m_textureSize;
|
| - GC3Dint m_textureFilter;
|
| - bool m_swizzleContents;
|
| - bool m_leftEdgeAA;
|
| - bool m_topEdgeAA;
|
| - bool m_rightEdgeAA;
|
| - bool m_bottomEdgeAA;
|
| -};
|
| -
|
| -#pragma pack(pop)
|
| -
|
| -}
|
| -
|
| -#endif
|
| +// Temporary forwarding header
|
| +#include "cc/tile_draw_quad.h"
|
|
|