diff options
Diffstat (limited to 'Source/WebCore/platform/android')
-rw-r--r-- | Source/WebCore/platform/android/ScrollViewAndroid.cpp | 28 | ||||
-rw-r--r-- | Source/WebCore/platform/android/WidgetAndroid.cpp | 9 |
2 files changed, 1 insertions, 36 deletions
diff --git a/Source/WebCore/platform/android/ScrollViewAndroid.cpp b/Source/WebCore/platform/android/ScrollViewAndroid.cpp index 8df0c2f..ecaa2b5 100644 --- a/Source/WebCore/platform/android/ScrollViewAndroid.cpp +++ b/Source/WebCore/platform/android/ScrollViewAndroid.cpp @@ -68,34 +68,6 @@ 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 10326f9..0f7758d 100644 --- a/Source/WebCore/platform/android/WidgetAndroid.cpp +++ b/Source/WebCore/platform/android/WidgetAndroid.cpp @@ -49,9 +49,7 @@ Widget::~Widget() IntRect Widget::frameRect() const { - if (!platformWidget()) - return m_frame; - return platformWidget()->getBounds(); + return m_frame; } void Widget::setFocus(bool focused) @@ -95,11 +93,6 @@ 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) |