diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/plugins/symbian | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/plugins/symbian')
-rw-r--r-- | WebCore/plugins/symbian/PluginViewSymbian.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/plugins/symbian/PluginViewSymbian.cpp b/WebCore/plugins/symbian/PluginViewSymbian.cpp index b9f82ad..b8a72b1 100644 --- a/WebCore/plugins/symbian/PluginViewSymbian.cpp +++ b/WebCore/plugins/symbian/PluginViewSymbian.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + Copyright (C) 2009, 2010 Nokia Corporation and/or its subsidiary(-ies) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -180,6 +180,7 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event) if (m_isWindowed) return; + ASSERT(event->keyEvent()->qtEvent()); QEvent& npEvent = *(event->keyEvent()->qtEvent()); if (!dispatchNPEvent(npEvent)) event->setDefaultHandled(); @@ -412,6 +413,7 @@ bool PluginView::platformStart() m_npWindow.type = NPWindowTypeDrawable; m_npWindow.window = 0; // Not used? } + updatePluginWidget(); setNPWindowIfNeeded(); return true; |