diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:34:10 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:34:10 +0000 |
| commit | 49306751db60b2437a17dcfcedd616c4d97e7ee8 (patch) | |
| tree | d2218de82349d7d85364539aebdcec1c75a4329c /cc/CCLayerImpl.h | |
| parent | 356aa5469d5eb5e04d1661aafa86fa6f38006aae (diff) | |
| download | chromium_src-49306751db60b2437a17dcfcedd616c4d97e7ee8.zip chromium_src-49306751db60b2437a17dcfcedd616c4d97e7ee8.tar.gz chromium_src-49306751db60b2437a17dcfcedd616c4d97e7ee8.tar.bz2 | |
Fix CC*Renderer and CC*LayerImpl to compile with Clang
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10942040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCLayerImpl.h')
| -rw-r--r-- | cc/CCLayerImpl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/CCLayerImpl.h b/cc/CCLayerImpl.h index 3509ffd..d66c521 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; |