summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/ScrollView.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2012-02-27 15:28:21 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-27 15:28:21 -0800
commit6753735b5cf1b2396d387b9f876a11a5fd2b3c3d (patch)
tree8d41427725d0a0c8567353446fe41385901e2f3d /Source/WebCore/platform/ScrollView.h
parent5015ffe477809860e6a9e05779afb1855aa994f2 (diff)
parenta3d6f6aedc8ed044682d65258bb964c64fc7511b (diff)
downloadexternal_webkit-6753735b5cf1b2396d387b9f876a11a5fd2b3c3d.zip
external_webkit-6753735b5cf1b2396d387b9f876a11a5fd2b3c3d.tar.gz
external_webkit-6753735b5cf1b2396d387b9f876a11a5fd2b3c3d.tar.bz2
Merge "Fix iframe webkit positioning"
Diffstat (limited to 'Source/WebCore/platform/ScrollView.h')
-rw-r--r--Source/WebCore/platform/ScrollView.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/platform/ScrollView.h b/Source/WebCore/platform/ScrollView.h
index 558aee2..3228870 100644
--- a/Source/WebCore/platform/ScrollView.h
+++ b/Source/WebCore/platform/ScrollView.h
@@ -53,6 +53,10 @@ namespace WebCore {
class HostWindow;
class Scrollbar;
+#if PLATFORM(ANDROID)
+class FrameView;
+#endif
+
class ScrollView : public Widget, public ScrollableArea {
public:
~ScrollView();
@@ -172,6 +176,7 @@ public:
int actualHeight() const;
int actualScrollX() const;
int actualScrollY() const;
+ FrameView* frameView();
#endif
// Functions for querying the current scrolled position (both as a point, a size, or as individual X and Y values).