| Index: cc/ScrollbarLayerChromium.h
|
| diff --git a/cc/ScrollbarLayerChromium.h b/cc/ScrollbarLayerChromium.h
|
| index 5c7cc5c0cd293cda2a54e895e9651a53155bcb2e..1e7384a9650ffee984b2bebd48a308f3984ef465 100644
|
| --- a/cc/ScrollbarLayerChromium.h
|
| +++ b/cc/ScrollbarLayerChromium.h
|
| @@ -2,69 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -
|
| -#ifndef ScrollbarLayerChromium_h
|
| -#define ScrollbarLayerChromium_h
|
| -
|
| -#if USE(ACCELERATED_COMPOSITING)
|
| -
|
| -#include "LayerChromium.h"
|
| -#include "caching_bitmap_canvas_layer_texture_updater.h"
|
| -#include <public/WebScrollbar.h>
|
| -#include <public/WebScrollbarThemeGeometry.h>
|
| -#include <public/WebScrollbarThemePainter.h>
|
| -
|
| -namespace cc {
|
| -
|
| -class Scrollbar;
|
| -class ScrollbarThemeComposite;
|
| -class CCTextureUpdateQueue;
|
| -
|
| -class ScrollbarLayerChromium : public LayerChromium {
|
| -public:
|
| - virtual scoped_ptr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
|
| -
|
| - static scoped_refptr<ScrollbarLayerChromium> create(PassOwnPtr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
|
| -
|
| - // LayerChromium interface
|
| - virtual bool needsContentsScale() const OVERRIDE;
|
| - virtual IntSize contentBounds() const OVERRIDE;
|
| - virtual void setTexturePriorities(const CCPriorityCalculator&) OVERRIDE;
|
| - virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
|
| - virtual void setLayerTreeHost(CCLayerTreeHost*) OVERRIDE;
|
| - virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
|
| -
|
| - int scrollLayerId() const { return m_scrollLayerId; }
|
| - void setScrollLayerId(int id) { m_scrollLayerId = id; }
|
| -
|
| - virtual ScrollbarLayerChromium* toScrollbarLayerChromium() OVERRIDE;
|
| -
|
| -protected:
|
| - ScrollbarLayerChromium(PassOwnPtr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
|
| - virtual ~ScrollbarLayerChromium();
|
| -
|
| -private:
|
| - void updatePart(CachingBitmapCanvasLayerTextureUpdater*, LayerTextureUpdater::Texture*, const IntRect&, CCTextureUpdateQueue&, CCRenderingStats&);
|
| - void createTextureUpdaterIfNeeded();
|
| -
|
| - OwnPtr<WebKit::WebScrollbar> m_scrollbar;
|
| - WebKit::WebScrollbarThemePainter m_painter;
|
| - OwnPtr<WebKit::WebScrollbarThemeGeometry> m_geometry;
|
| - int m_scrollLayerId;
|
| -
|
| - GC3Denum m_textureFormat;
|
| -
|
| - RefPtr<CachingBitmapCanvasLayerTextureUpdater> m_backTrackUpdater;
|
| - RefPtr<CachingBitmapCanvasLayerTextureUpdater> m_foreTrackUpdater;
|
| - RefPtr<CachingBitmapCanvasLayerTextureUpdater> m_thumbUpdater;
|
| -
|
| - // All the parts of the scrollbar except the thumb
|
| - OwnPtr<LayerTextureUpdater::Texture> m_backTrack;
|
| - OwnPtr<LayerTextureUpdater::Texture> m_foreTrack;
|
| - OwnPtr<LayerTextureUpdater::Texture> m_thumb;
|
| -};
|
| -
|
| -}
|
| -#endif // USE(ACCELERATED_COMPOSITING)
|
| -
|
| -#endif
|
| +// Temporary forwarding header
|
| +#include "cc/scrollbar_layer.h"
|
|
|