diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 21:08:03 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 21:08:03 +0000 |
| commit | 311615889106cd3765725f984e8377f6c0db1664 (patch) | |
| tree | e97fa43b6566b44b1ee025a6f1525882f2ca4c0c /cc/scrollbar_layer.h | |
| parent | 1cec6529305e724ab4dd6fc346c49d15eda2618a (diff) | |
| download | chromium_src-311615889106cd3765725f984e8377f6c0db1664.zip chromium_src-311615889106cd3765725f984e8377f6c0db1664.tar.gz chromium_src-311615889106cd3765725f984e8377f6c0db1664.tar.bz2 | |
cc: Remove wtf includes for scrollbar layer classes
R=jamesr@chromium.org
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11144034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/scrollbar_layer.h')
| -rw-r--r-- | cc/scrollbar_layer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/scrollbar_layer.h b/cc/scrollbar_layer.h index 2645774..3d70f91 100644 --- a/cc/scrollbar_layer.h +++ b/cc/scrollbar_layer.h @@ -22,7 +22,7 @@ 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); + static scoped_refptr<ScrollbarLayerChromium> create(scoped_ptr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, scoped_ptr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId); // LayerChromium interface virtual bool needsContentsScale() const OVERRIDE; @@ -38,16 +38,16 @@ public: virtual ScrollbarLayerChromium* toScrollbarLayerChromium() OVERRIDE; protected: - ScrollbarLayerChromium(PassOwnPtr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId); + ScrollbarLayerChromium(scoped_ptr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, scoped_ptr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId); virtual ~ScrollbarLayerChromium(); private: void updatePart(CachingBitmapCanvasLayerTextureUpdater*, LayerTextureUpdater::Texture*, const IntRect&, CCTextureUpdateQueue&, CCRenderingStats&); void createTextureUpdaterIfNeeded(); - OwnPtr<WebKit::WebScrollbar> m_scrollbar; + scoped_ptr<WebKit::WebScrollbar> m_scrollbar; WebKit::WebScrollbarThemePainter m_painter; - OwnPtr<WebKit::WebScrollbarThemeGeometry> m_geometry; + scoped_ptr<WebKit::WebScrollbarThemeGeometry> m_geometry; int m_scrollLayerId; GC3Denum m_textureFormat; |