| Index: cc/CCHeadsUpDisplayLayerImpl.h
|
| diff --git a/cc/CCHeadsUpDisplayLayerImpl.h b/cc/CCHeadsUpDisplayLayerImpl.h
|
| index 47e7cfe73e4252314394e1eed42dfdc6fbcc275f..ec7b16067990b1a8f0d8afbff3e17a255cecb8b9 100644
|
| --- a/cc/CCHeadsUpDisplayLayerImpl.h
|
| +++ b/cc/CCHeadsUpDisplayLayerImpl.h
|
| @@ -2,56 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CCHeadsUpDisplayLayerImpl_h
|
| -#define CCHeadsUpDisplayLayerImpl_h
|
| -
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "CCFontAtlas.h"
|
| -#include "CCLayerImpl.h"
|
| -#include "CCScopedTexture.h"
|
| -
|
| -class SkCanvas;
|
| -
|
| -namespace cc {
|
| -
|
| -class CCDebugRectHistory;
|
| -class CCFontAtlas;
|
| -class CCFrameRateCounter;
|
| -
|
| -class CCHeadsUpDisplayLayerImpl : public CCLayerImpl {
|
| -public:
|
| - static scoped_ptr<CCHeadsUpDisplayLayerImpl> create(int id)
|
| - {
|
| - return make_scoped_ptr(new CCHeadsUpDisplayLayerImpl(id));
|
| - }
|
| - virtual ~CCHeadsUpDisplayLayerImpl();
|
| -
|
| - void setFontAtlas(scoped_ptr<CCFontAtlas>);
|
| -
|
| - virtual void willDraw(CCResourceProvider*) OVERRIDE;
|
| - virtual void appendQuads(CCQuadSink&, CCAppendQuadsData&) OVERRIDE;
|
| - void updateHudTexture(CCResourceProvider*);
|
| - virtual void didDraw(CCResourceProvider*) OVERRIDE;
|
| -
|
| - virtual void didLoseContext() OVERRIDE;
|
| -
|
| - virtual bool layerIsAlwaysDamaged() const OVERRIDE;
|
| -
|
| -private:
|
| - explicit CCHeadsUpDisplayLayerImpl(int);
|
| -
|
| - virtual const char* layerTypeAsString() const OVERRIDE;
|
| -
|
| - void drawHudContents(SkCanvas*);
|
| - void drawFPSCounter(SkCanvas*, CCFrameRateCounter*, int top, int height);
|
| - void drawFPSCounterText(SkCanvas*, CCFrameRateCounter*, int top, int width, int height);
|
| - void drawDebugRects(SkCanvas*, CCDebugRectHistory*);
|
| -
|
| - scoped_ptr<CCFontAtlas> m_fontAtlas;
|
| - OwnPtr<CCScopedTexture> m_hudTexture;
|
| - OwnPtr<SkCanvas> m_hudCanvas;
|
| -};
|
| -
|
| -} // namespace cc
|
| -
|
| -#endif // CCHeadsUpDisplayLayerImpl_h
|
| +// Temporary forwarding header
|
| +#include "cc/heads_up_display_layer_impl.h"
|
|
|