diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-02-10 18:14:11 +0000 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2010-02-11 14:05:56 +0000 |
| commit | 7cf8f5417b00f178c31fe6bba844ba4bb1957019 (patch) | |
| tree | e5a0bcb3e361decb16b51ad873203553993e1027 | |
| parent | d699f768cc84aa8a94faf24e39d8583700b4977d (diff) | |
| download | external_webkit-7cf8f5417b00f178c31fe6bba844ba4bb1957019.zip external_webkit-7cf8f5417b00f178c31fe6bba844ba4bb1957019.tar.gz external_webkit-7cf8f5417b00f178c31fe6bba844ba4bb1957019.tar.bz2 | |
cleanup
(cherry picked from commit fc34a9dc6e4aa1d0e96fc5523ee77e618648e615)
| -rw-r--r-- | WebCore/platform/graphics/android/AndroidAnimation.h | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.h | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/android/AndroidAnimation.h b/WebCore/platform/graphics/android/AndroidAnimation.h index c4be10b..75e2f35 100644 --- a/WebCore/platform/graphics/android/AndroidAnimation.h +++ b/WebCore/platform/graphics/android/AndroidAnimation.h @@ -21,6 +21,7 @@ #include "FloatPoint.h" #include "FloatPoint3D.h" +#include "GraphicsLayer.h" #include "HashMap.h" #include "LayerAndroid.h" #include "RefPtr.h" @@ -30,7 +31,6 @@ namespace WebCore { class AndroidAnimation; -class GraphicsLayerAndroid; class TimingFunction; class AndroidAnimationValue : public RefCounted<AndroidAnimationValue> { diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp index 1788f2d..e080d3d 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.cpp +++ b/WebCore/platform/graphics/android/LayerAndroid.cpp @@ -90,8 +90,8 @@ LayerAndroid::LayerAndroid(LayerAndroid* layer) : m_anchorPoint(layer->m_anchorPoint), m_scale(layer->m_scale), m_fixedLeft(layer->m_fixedLeft), - m_fixedRight(layer->m_fixedRight), m_fixedTop(layer->m_fixedTop), + m_fixedRight(layer->m_fixedRight), m_fixedBottom(layer->m_fixedBottom) { if (layer->m_recordingPicture) { diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h index 8436921..6ca4083 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.h +++ b/WebCore/platform/graphics/android/LayerAndroid.h @@ -23,13 +23,11 @@ #include "FloatPoint.h" #include "FloatPoint3D.h" #include "FloatSize.h" -#include "GraphicsContext.h" -#include "GraphicsLayer.h" #include "Length.h" #include "RefPtr.h" #include "StringHash.h" #include "Vector.h" -#include <wtf/HashSet.h> +#include <wtf/HashMap.h> class SkCanvas; class SkPicture; @@ -66,7 +64,6 @@ public: void setIsRootLayer(bool isRootLayer) { m_isRootLayer = isRootLayer; } void paintOn(int scrollX, int scrollY, int width, int height, float scale, SkCanvas*); - GraphicsContext* paintContext(); void removeAllChildren() { m_children.clear(); } void addChildren(LayerAndroid* layer) { m_children.append(layer); } bool prepareContext(bool force = false); |