Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef WebLayerImpl_h | 5 #ifndef WebLayerImpl_h |
| 6 #define WebLayerImpl_h | 6 #define WebLayerImpl_h |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" | 9 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" |
| 10 | 10 |
| 11 namespace cc { | 11 namespace cc { |
| 12 class LayerChromium; | 12 class LayerChromium; |
| 13 } | 13 } |
| 14 | 14 |
| 15 // TODO(senorblanco): Remove this once WebKit changes have landed. | |
| 16 class SkImageFilter; | |
| 17 | |
| 15 namespace WebKit { | 18 namespace WebKit { |
| 16 | 19 |
| 17 class WebLayerImpl : public WebLayer { | 20 class WebLayerImpl : public WebLayer { |
| 18 public: | 21 public: |
| 19 WebLayerImpl(); | 22 WebLayerImpl(); |
| 20 explicit WebLayerImpl(scoped_refptr<cc::LayerChromium>); | 23 explicit WebLayerImpl(scoped_refptr<cc::LayerChromium>); |
| 21 virtual ~WebLayerImpl(); | 24 virtual ~WebLayerImpl(); |
| 22 | 25 |
| 23 // WebLayer implementation. | 26 // WebLayer implementation. |
| 24 virtual int id() const OVERRIDE; | 27 virtual int id() const OVERRIDE; |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 50 virtual SkMatrix44 sublayerTransform() const OVERRIDE; | 53 virtual SkMatrix44 sublayerTransform() const OVERRIDE; |
| 51 virtual void setTransform(const SkMatrix44&) OVERRIDE; | 54 virtual void setTransform(const SkMatrix44&) OVERRIDE; |
| 52 virtual void setTransform(const WebTransformationMatrix&) OVERRIDE; | 55 virtual void setTransform(const WebTransformationMatrix&) OVERRIDE; |
| 53 virtual SkMatrix44 transform() const OVERRIDE; | 56 virtual SkMatrix44 transform() const OVERRIDE; |
| 54 virtual void setDrawsContent(bool) OVERRIDE; | 57 virtual void setDrawsContent(bool) OVERRIDE; |
| 55 virtual bool drawsContent() const OVERRIDE; | 58 virtual bool drawsContent() const OVERRIDE; |
| 56 virtual void setPreserves3D(bool) OVERRIDE; | 59 virtual void setPreserves3D(bool) OVERRIDE; |
| 57 virtual void setUseParentBackfaceVisibility(bool) OVERRIDE; | 60 virtual void setUseParentBackfaceVisibility(bool) OVERRIDE; |
| 58 virtual void setBackgroundColor(WebColor) OVERRIDE; | 61 virtual void setBackgroundColor(WebColor) OVERRIDE; |
| 59 virtual WebColor backgroundColor() const; | 62 virtual WebColor backgroundColor() const; |
| 63 // TODO(senorblanco): uncomment OVERRIDE once WebKit changes have landed. | |
|
jamesr
2012/10/19 19:15:30
No, leave the OVERRIDE out. OVERRIDE's aren't wor
Stephen White
2012/10/19 21:34:50
Done.
| |
| 64 virtual void setFilter(SkImageFilter*) /* OVERRIDE */; | |
| 60 virtual void setFilters(const WebFilterOperations&) OVERRIDE; | 65 virtual void setFilters(const WebFilterOperations&) OVERRIDE; |
| 61 virtual void setBackgroundFilters(const WebFilterOperations&) OVERRIDE; | 66 virtual void setBackgroundFilters(const WebFilterOperations&) OVERRIDE; |
| 62 virtual void setDebugBorderColor(const WebColor&) OVERRIDE; | 67 virtual void setDebugBorderColor(const WebColor&) OVERRIDE; |
| 63 virtual void setDebugBorderWidth(float) OVERRIDE; | 68 virtual void setDebugBorderWidth(float) OVERRIDE; |
| 64 virtual void setDebugName(WebString) OVERRIDE; | 69 virtual void setDebugName(WebString) OVERRIDE; |
| 65 virtual void setAnimationDelegate(WebAnimationDelegate*) OVERRIDE; | 70 virtual void setAnimationDelegate(WebAnimationDelegate*) OVERRIDE; |
| 66 virtual bool addAnimation(WebAnimation*) OVERRIDE; | 71 virtual bool addAnimation(WebAnimation*) OVERRIDE; |
| 67 virtual void removeAnimation(int animationId) OVERRIDE; | 72 virtual void removeAnimation(int animationId) OVERRIDE; |
| 68 virtual void removeAnimation(int animationId, WebAnimation::TargetProperty) OVERRIDE; | 73 virtual void removeAnimation(int animationId, WebAnimation::TargetProperty) OVERRIDE; |
| 69 virtual void pauseAnimation(int animationId, double timeOffset) OVERRIDE; | 74 virtual void pauseAnimation(int animationId, double timeOffset) OVERRIDE; |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 92 | 97 |
| 93 cc::LayerChromium* layer() const; | 98 cc::LayerChromium* layer() const; |
| 94 | 99 |
| 95 protected: | 100 protected: |
| 96 scoped_refptr<cc::LayerChromium> m_layer; | 101 scoped_refptr<cc::LayerChromium> m_layer; |
| 97 }; | 102 }; |
| 98 | 103 |
| 99 } // namespace WebKit | 104 } // namespace WebKit |
| 100 | 105 |
| 101 #endif // WebLayerImpl_h | 106 #endif // WebLayerImpl_h |
| OLD | NEW |