am 80e066f5: am 8156b667: Merge "Revert part of "Fix iframe, ..."" into jb-dev

* commit '80e066f593d481ee02fc9cde720967532015493e':
  Revert part of "Fix iframe, ..."

2 files changed, 36 insertions, 1 deletions

diff --git a/Source/WebCore/platform/android/ScrollViewAndroid.cpp b/Source/WebCore/platform/android/ScrollViewAndroid.cpp
index cc1c09e..e7300a1 100644
--- a/Source/WebCore/platform/android/ScrollViewAndroid.cpp
+++ b/Source/WebCore/platform/android/ScrollViewAndroid.cpp
@@ -68,6 +68,34 @@ IntSize ScrollView::platformContentsSize() const
     return m_contentsSize;
 }
 
+int ScrollView::platformActualWidth() const
+{
+    if (parent())
+        return width();
+    return platformWidget()->visibleWidth();
+}
+
+int ScrollView::platformActualHeight() const
+{
+    if (parent())
+        return height();
+    return platformWidget()->visibleHeight();
+}
+
+int ScrollView::platformActualScrollX() const
+{
+    if (parent())
+        return scrollX();
+    return platformWidget()->visibleX();
+}
+
+int ScrollView::platformActualScrollY() const
+{
+    if (parent())
+        return scrollY();
+    return platformWidget()->visibleY();
+}
+
 void ScrollView::platformSetScrollPosition(const WebCore::IntPoint& pt)
 {
     PlatformBridge::setScrollPosition(this, m_scrollOrigin.x() + pt.x(),
diff --git a/Source/WebCore/platform/android/WidgetAndroid.cpp b/Source/WebCore/platform/android/WidgetAndroid.cpp
index 6858f29..3c5b1c8 100644
--- a/Source/WebCore/platform/android/WidgetAndroid.cpp
+++ b/Source/WebCore/platform/android/WidgetAndroid.cpp
@@ -49,7 +49,9 @@ Widget::~Widget()
 
 IntRect Widget::frameRect() const
 {
-    return m_frame;
+    if (!platformWidget())
+        return m_frame;
+    return platformWidget()->getBounds();
 }
 
 void Widget::setFocus(bool focused)
@@ -89,6 +91,11 @@ void Widget::hide()
 void Widget::setFrameRect(const IntRect& rect)
 {
     m_frame = rect;
+    // platformWidget() is 0 when called from Scrollbar
+    if (!platformWidget())
+        return;
+    platformWidget()->setLocation(rect.x(), rect.y());
+    platformWidget()->setSize(rect.width(), rect.height());
 }
 
 void Widget::setIsSelected(bool isSelected)