diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/plugins/symbian | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/plugins/symbian')
| -rw-r--r-- | WebCore/plugins/symbian/PluginPackageSymbian.cpp | 2 | ||||
| -rw-r--r-- | WebCore/plugins/symbian/PluginViewSymbian.cpp | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/WebCore/plugins/symbian/PluginPackageSymbian.cpp b/WebCore/plugins/symbian/PluginPackageSymbian.cpp index d30f80e..7fca625 100644 --- a/WebCore/plugins/symbian/PluginPackageSymbian.cpp +++ b/WebCore/plugins/symbian/PluginPackageSymbian.cpp @@ -174,7 +174,7 @@ void PluginPackage::unload() m_pluginLoader = 0; } -uint16 PluginPackage::NPVersion() const +uint16_t PluginPackage::NPVersion() const { return NP_VERSION_MINOR; } diff --git a/WebCore/plugins/symbian/PluginViewSymbian.cpp b/WebCore/plugins/symbian/PluginViewSymbian.cpp index bae3b7f..361f946 100644 --- a/WebCore/plugins/symbian/PluginViewSymbian.cpp +++ b/WebCore/plugins/symbian/PluginViewSymbian.cpp @@ -101,12 +101,14 @@ void PluginView::updatePluginWidget() setNPWindowIfNeeded(); } -void PluginView::setFocus() +void PluginView::setFocus(bool focused) { - if (platformPluginWidget()) - platformPluginWidget()->setFocus(Qt::OtherFocusReason); - else - Widget::setFocus(); + if (platformPluginWidget()) { + if (focused) + platformPluginWidget()->setFocus(Qt::OtherFocusReason); + } else { + Widget::setFocus(focused); + } } void PluginView::show() @@ -304,7 +306,7 @@ void PluginView::setParentVisible(bool visible) platformPluginWidget()->setVisible(visible); } -NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const char* buf) +NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32_t len, const char* buf) { notImplemented(); return NPERR_NO_ERROR; @@ -414,11 +416,11 @@ bool PluginView::platformStart() void PluginView::platformDestroy() { - QWebPageClient* client = m_parentFrame->view()->hostWindow()->platformPageClient(); - if (client && qobject_cast<QGraphicsWebView*>(client->pluginParent())) - delete static_cast<PluginContainerSymbian*>(platformPluginWidget())->proxy(); - else - delete platformPluginWidget(); + if (platformPluginWidget()) { + PluginContainerSymbian* container = static_cast<PluginContainerSymbian*>(platformPluginWidget()); + delete container->proxy(); + delete container; + } } void PluginView::halt() |