summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-12-13 09:30:18 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-13 09:30:18 -0800
commitc5a7eaffa9be6afd209020f1ffdc6278c284e7a3 (patch)
treee106d48db6cf5eaf30eb95c53cfa43f6ef3f1f46
parenta61906ec8ab3cd5ce28e1ba2039c394a6f097c69 (diff)
parenta86cc8fd1a3549f6acef8def42325ae490510e76 (diff)
downloadexternal_webkit-c5a7eaffa9be6afd209020f1ffdc6278c284e7a3.zip
external_webkit-c5a7eaffa9be6afd209020f1ffdc6278c284e7a3.tar.gz
external_webkit-c5a7eaffa9be6afd209020f1ffdc6278c284e7a3.tar.bz2
Merge "SkRect takes left, top, right, bottom."
-rw-r--r--WebCore/platform/graphics/android/ScrollableLayerAndroid.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/ScrollableLayerAndroid.h b/WebCore/platform/graphics/android/ScrollableLayerAndroid.h
index d63625a..25f9900 100644
--- a/WebCore/platform/graphics/android/ScrollableLayerAndroid.h
+++ b/WebCore/platform/graphics/android/ScrollableLayerAndroid.h
@@ -43,6 +43,7 @@ public:
// Returns true if the content position has changed.
bool scrollTo(int dx, int dy);
+
// Fills the rect with the current scroll offset and the maximum scroll.
// fLeft = scrollX
// fTop = scrollY
@@ -51,7 +52,7 @@ public:
void getScrollRect(SkIRect* out) const;
void setScrollLimits(float x, float y, float width, float height) {
- m_scrollLimits.set(x, y, width, height);
+ m_scrollLimits.set(x, y, x + width, y + height);
}
private: