| Index: cc/CCTextureDrawQuad.h
|
| diff --git a/cc/CCTextureDrawQuad.h b/cc/CCTextureDrawQuad.h
|
| index daa600f717f6d44da2ffe9151391c63c8aa9057e..2ad6600fdf482a0d800256e687fc3af10967cf1a 100644
|
| --- a/cc/CCTextureDrawQuad.h
|
| +++ b/cc/CCTextureDrawQuad.h
|
| @@ -2,40 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CCTextureDrawQuad_h
|
| -#define CCTextureDrawQuad_h
|
| -
|
| -#include "CCDrawQuad.h"
|
| -#include "FloatRect.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -
|
| -namespace cc {
|
| -
|
| -#pragma pack(push, 4)
|
| -
|
| -class CCTextureDrawQuad : public CCDrawQuad {
|
| -public:
|
| - static scoped_ptr<CCTextureDrawQuad> create(const CCSharedQuadState*, const IntRect&, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped);
|
| - FloatRect uvRect() const { return m_uvRect; }
|
| -
|
| - unsigned resourceId() const { return m_resourceId; }
|
| - bool premultipliedAlpha() const { return m_premultipliedAlpha; }
|
| - bool flipped() const { return m_flipped; }
|
| -
|
| - void setNeedsBlending();
|
| -
|
| - static const CCTextureDrawQuad* materialCast(const CCDrawQuad*);
|
| -private:
|
| - CCTextureDrawQuad(const CCSharedQuadState*, const IntRect&, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped);
|
| -
|
| - unsigned m_resourceId;
|
| - bool m_premultipliedAlpha;
|
| - FloatRect m_uvRect;
|
| - bool m_flipped;
|
| -};
|
| -
|
| -#pragma pack(pop)
|
| -
|
| -}
|
| -
|
| -#endif
|
| +// Temporary forwarding header
|
| +#include "cc/texture_draw_quad.h"
|
|
|