diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-14 15:31:20 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2012-05-14 16:09:37 -0700 |
| commit | 4f91e5abbd847c4dee4740d3116f23b73bf02ee5 (patch) | |
| tree | b6c9af6053e6ca04641a50eacc2049d912997a59 /Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h | |
| parent | 9c3ba7668c398bf33a509c6b3138b9575a9bb24d (diff) | |
| download | external_webkit-4f91e5abbd847c4dee4740d3116f23b73bf02ee5.zip external_webkit-4f91e5abbd847c4dee4740d3116f23b73bf02ee5.tar.gz external_webkit-4f91e5abbd847c4dee4740d3116f23b73bf02ee5.tar.bz2 | |
Update bounds calculation to use draw transform
Remove old bounds calculation method.
Depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/190474/
bug:6486310
Change-Id: Ieeb09778f810598c38127c66ae12b2b29abcf8e4
Diffstat (limited to 'Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h index 7c755ae..afe1c35 100644 --- a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h +++ b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h @@ -37,7 +37,7 @@ class RenderStyle; class BaseLayerAndroid : public LayerAndroid { public: BaseLayerAndroid(LayerContent* content); - virtual SubclassType subclassType() { return LayerAndroid::BaseLayer; } + virtual SubclassType subclassType() const { return LayerAndroid::BaseLayer; } virtual void getLocalTransform(SkMatrix* matrix) const; virtual const TransformationMatrix* drawTransform() const { return 0; } virtual bool needsTexture() { return content(); } @@ -55,7 +55,7 @@ private: class ForegroundBaseLayerAndroid : public LayerAndroid { public: ForegroundBaseLayerAndroid(LayerContent* content); - virtual SubclassType subclassType() { return LayerAndroid::ForegroundBaseLayer; } + virtual SubclassType subclassType() const { return LayerAndroid::ForegroundBaseLayer; } virtual bool needsTexture() { return false; } }; @@ -66,7 +66,7 @@ public: FixedBackgroundImageLayerAndroid(const FixedBackgroundImageLayerAndroid& layer); virtual LayerAndroid* copy() const { return new FixedBackgroundImageLayerAndroid(*this); } virtual bool needsTexture() { return true; } - virtual SubclassType subclassType() { return LayerAndroid::FixedBackgroundImageLayer; } + virtual SubclassType subclassType() const { return LayerAndroid::FixedBackgroundImageLayer; } virtual bool drawGL(bool layerTilesDisabled); private: |