diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:06 -0800 |
| commit | b880d713c04257ca40abfef97c300afdead423b8 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/plugins/qt/PluginViewQt.cpp | |
| parent | e2e7a5c57b53f01e63a0245b4420d54b454cb373 (diff) | |
| parent | 643ca7872b450ea4efacab6188849e5aac2ba161 (diff) | |
| download | external_webkit-b880d713c04257ca40abfef97c300afdead423b8.zip external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.gz external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.bz2 | |
am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit '643ca7872b450ea4efacab6188849e5aac2ba161' into eclair-mr2-plus-aosp
* commit '643ca7872b450ea4efacab6188849e5aac2ba161':
Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/plugins/qt/PluginViewQt.cpp')
| -rw-r--r-- | WebCore/plugins/qt/PluginViewQt.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp index e61736b..063a7e5 100644 --- a/WebCore/plugins/qt/PluginViewQt.cpp +++ b/WebCore/plugins/qt/PluginViewQt.cpp @@ -138,26 +138,14 @@ void PluginView::setFocus() void PluginView::show() { - setSelfVisible(true); - - if (isParentVisible() && platformPluginWidget()) - platformPluginWidget()->setVisible(true); - - // do not call parent impl. here as it will set the platformWidget - // (same as platformPluginWidget in the Qt port) to visible, even - // when parent isn't visible. + Q_ASSERT(platformPluginWidget() == platformWidget()); + Widget::show(); } void PluginView::hide() { - setSelfVisible(false); - - if (isParentVisible() && platformPluginWidget()) - platformPluginWidget()->setVisible(false); - - // do not call parent impl. here as it will set the platformWidget - // (same as platformPluginWidget in the Qt port) to invisible, even - // when parent isn't visible. + Q_ASSERT(platformPluginWidget() == platformWidget()); + Widget::hide(); } void PluginView::paint(GraphicsContext* context, const IntRect& rect) |