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

Unified Diff: cc/CCLayerImpl.h

Issue 10942040: Fix CC*Renderer and CC*LayerImpl to compile with Clang (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: cc/CCLayerImpl.h
diff --git a/cc/CCLayerImpl.h b/cc/CCLayerImpl.h
index 3509ffd694b1ff4792292b102dac47b8dcf8f317..d66c521f643fcedb54fb800cb87514c560bb179c 100644
--- a/cc/CCLayerImpl.h
+++ b/cc/CCLayerImpl.h
@@ -43,11 +43,11 @@ public:
virtual ~CCLayerImpl();
// CCLayerAnimationControllerClient implementation.
- virtual int id() const OVERRIDE { return m_layerId; }
+ virtual int id() const OVERRIDE;
virtual void setOpacityFromAnimation(float) OVERRIDE;
- virtual float opacity() const OVERRIDE { return m_opacity; }
+ virtual float opacity() const OVERRIDE;
virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix&) OVERRIDE;
- virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE { return m_transform; }
+ virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE;
// Tree structure.
CCLayerImpl* parent() const { return m_parent; }
@@ -232,7 +232,7 @@ public:
void resetAllChangeTrackingForSubtree();
- virtual bool layerIsAlwaysDamaged() const { return false; }
+ virtual bool layerIsAlwaysDamaged() const;
CCLayerAnimationController* layerAnimationController() { return m_layerAnimationController.get(); }
@@ -269,7 +269,7 @@ private:
// Note carefully this does not affect the current layer.
void noteLayerPropertyChangedForDescendants();
- virtual const char* layerTypeAsString() const { return "LayerChromium"; }
+ virtual const char* layerTypeAsString() const;
void dumpLayer(std::string*, int indent) const;
« no previous file with comments | « cc/CCIOSurfaceLayerImpl.cpp ('k') | cc/CCLayerImpl.cpp » ('j') | cc/CCTiledLayerImpl.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698