summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/ScrollView.cpp
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2012-02-22 12:29:40 -0800
committerNicolas Roard <nicolasroard@google.com>2012-02-27 15:01:52 -0800
commita3d6f6aedc8ed044682d65258bb964c64fc7511b (patch)
tree4eea449a7a38a093cd32e0e84502286b817a3c3f /Source/WebCore/platform/ScrollView.cpp
parentdfdb101465a930f38ec4294b0b8063c1f0f1bdbc (diff)
downloadexternal_webkit-a3d6f6aedc8ed044682d65258bb964c64fc7511b.zip
external_webkit-a3d6f6aedc8ed044682d65258bb964c64fc7511b.tar.gz
external_webkit-a3d6f6aedc8ed044682d65258bb964c64fc7511b.tar.bz2
Fix iframe webkit positioning
Change-Id: I7b2b3a7312c89bc505d7f629380df0d3f24eee5f
Diffstat (limited to 'Source/WebCore/platform/ScrollView.cpp')
-rw-r--r--Source/WebCore/platform/ScrollView.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/WebCore/platform/ScrollView.cpp b/Source/WebCore/platform/ScrollView.cpp
index e79f049..58a1fbf 100644
--- a/Source/WebCore/platform/ScrollView.cpp
+++ b/Source/WebCore/platform/ScrollView.cpp
@@ -27,6 +27,9 @@
#include "ScrollView.h"
#include "AXObjectCache.h"
+#if PLATFORM(ANDROID)
+#include "FrameView.h"
+#endif
#include "GraphicsContext.h"
#include "GraphicsLayer.h"
#include "HostWindow.h"
@@ -328,6 +331,14 @@ int ScrollView::actualScrollY() const
return platformActualScrollY();
return scrollY();
}
+
+FrameView* ScrollView::frameView() {
+ if (this->isFrameView()) {
+ FrameView* frameView = reinterpret_cast<FrameView*>(this);
+ return frameView;
+ }
+ return 0;
+}
#endif
IntPoint ScrollView::maximumScrollPosition() const