Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3100)

Unified Diff: cc/ScrollbarLayerChromium.h

Issue 10947047: Fix remaining cc files to compile with Clang (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix FakeCCDelayBasedTimeSource Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/LayerTextureUpdater.cpp ('k') | cc/ScrollbarLayerChromium.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/ScrollbarLayerChromium.h
diff --git a/cc/ScrollbarLayerChromium.h b/cc/ScrollbarLayerChromium.h
index b4b8b8bc6298e53263b64a5d78a14dd2fe28687d..62ace2d20e1cad884e82daedc2dd678311636235 100644
--- a/cc/ScrollbarLayerChromium.h
+++ b/cc/ScrollbarLayerChromium.h
@@ -23,8 +23,11 @@ class CCTextureUpdateQueue;
class ScrollbarLayerChromium : public LayerChromium {
public:
virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
+
static PassRefPtr<ScrollbarLayerChromium> create(PassOwnPtr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
+ virtual ~ScrollbarLayerChromium();
+
// LayerChromium interface
virtual void setTexturePriorities(const CCPriorityCalculator&) OVERRIDE;
virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
@@ -34,7 +37,7 @@ public:
int scrollLayerId() const { return m_scrollLayerId; }
void setScrollLayerId(int id) { m_scrollLayerId = id; }
- virtual ScrollbarLayerChromium* toScrollbarLayerChromium() OVERRIDE { return this; }
+ virtual ScrollbarLayerChromium* toScrollbarLayerChromium() OVERRIDE;
protected:
ScrollbarLayerChromium(PassOwnPtr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
« no previous file with comments | « cc/LayerTextureUpdater.cpp ('k') | cc/ScrollbarLayerChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698