diff options
author | Patrick Scott <phanna@android.com> | 2010-03-23 13:36:20 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-23 13:36:20 -0700 |
commit | 4aa28f1f5940594c38e46f06d720f07852b17112 (patch) | |
tree | 609bdadee80410507b6d601294ab90d1a23ab54e /WebCore/platform/android/WidgetAndroid.cpp | |
parent | e34f81fbe92e8ec4045613ae8e3e0e2f3b7360e3 (diff) | |
parent | 8216a0e796895ec6e736aebbeacee9567ae85515 (diff) | |
download | external_webkit-4aa28f1f5940594c38e46f06d720f07852b17112.zip external_webkit-4aa28f1f5940594c38e46f06d720f07852b17112.tar.gz external_webkit-4aa28f1f5940594c38e46f06d720f07852b17112.tar.bz2 |
Merge "Add on-demand plugin support."
Diffstat (limited to 'WebCore/platform/android/WidgetAndroid.cpp')
-rw-r--r-- | WebCore/platform/android/WidgetAndroid.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/platform/android/WidgetAndroid.cpp b/WebCore/platform/android/WidgetAndroid.cpp index d122ef7..9ab0b2c 100644 --- a/WebCore/platform/android/WidgetAndroid.cpp +++ b/WebCore/platform/android/WidgetAndroid.cpp @@ -49,9 +49,8 @@ Widget::~Widget() IntRect Widget::frameRect() const { - // FIXME: use m_frame instead? if (!platformWidget()) - return IntRect(0, 0, 0, 0); + return m_frame; return platformWidget()->getBounds(); } @@ -95,7 +94,7 @@ void Widget::hide() void Widget::setFrameRect(const IntRect& rect) { - // FIXME: set m_frame instead? + m_frame = rect; // platformWidget() is 0 when called from Scrollbar if (!platformWidget()) return; |