Changeset 56546 in webkit

Timestamp:

Mar 25, 2010 8:06:10 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-25 yael aharon <​yael.aharon@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] Windowed netscape plugins don't work with QGraphicsWebView on Symbian
​https://bugs.webkit.org/show_bug.cgi?id=35112

Add a proxy widget when loading a QWidget based plugin in a QGraphicsWebView.

• plugins/symbian/PluginContainerSymbian.cpp: (PluginContainerSymbian::PluginContainerSymbian): (PluginContainerSymbian::focusInEvent):
• plugins/symbian/PluginContainerSymbian.h: (WebCore::PluginContainerSymbian::proxy):
• plugins/symbian/PluginViewSymbian.cpp: (WebCore::PluginView::updatePluginWidget): (WebCore::PluginView::platformStart): (WebCore::PluginView::platformDestroy):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/symbian/PluginContainerSymbian.cpp (modified) (2 diffs)
• plugins/symbian/PluginContainerSymbian.h (modified) (3 diffs)
• plugins/symbian/PluginViewSymbian.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-25  yael aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Windowed netscape plugins don't work with QGraphicsWebView on Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=35112
+
+        Add a proxy widget when loading a QWidget based plugin in a QGraphicsWebView.
+
+        * plugins/symbian/PluginContainerSymbian.cpp:
+        (PluginContainerSymbian::PluginContainerSymbian):
+        (PluginContainerSymbian::focusInEvent):
+        * plugins/symbian/PluginContainerSymbian.h:
+        (WebCore::PluginContainerSymbian::proxy):
+        * plugins/symbian/PluginViewSymbian.cpp:
+        (WebCore::PluginView::updatePluginWidget):
+        (WebCore::PluginView::platformStart):
+        (WebCore::PluginView::platformDestroy):
+
 2010-03-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/plugins/symbian/PluginContainerSymbian.cpp

@@ -33 +33 @@
 using namespace WebCore;
 
-PluginContainerSymbian::PluginContainerSymbian(PluginView* view, QWidget* parent)
-    : m_parent(parent)
+PluginContainerSymbian::PluginContainerSymbian(PluginView* view, QWidget* parent, QGraphicsProxyWidget* proxy)
+    : QWidget(parent)
     , m_pluginView(view)
+    , m_proxy(proxy)
     , m_hasPendingGeometryChange(false)
 {
-    setParent(m_parent);
 }
 
@@ -63 +63 @@
 }
 
-void PluginContainerSymbian::focusInEvent(QFocusEvent* event)
+void PluginContainerSymbian::focusInEvent(QFocusEvent*)
 {
     if (Page* page = m_pluginView->parentFrame()->page())

trunk/WebCore/plugins/symbian/PluginContainerSymbian.h

@@ -23 +23 @@
 #include <QWidget>
 
+class QGraphicsProxyWidget;
+
 namespace WebCore {
 
@@ -30 +32 @@
         Q_OBJECT
     public:
-        PluginContainerSymbian(PluginView*, QWidget* parent);
+        PluginContainerSymbian(PluginView*, QWidget* parent, QGraphicsProxyWidget* proxy = 0);
         ~PluginContainerSymbian();
 
         void requestGeometry(const QRect&, const QRegion& clip = QRegion());
         void adjustGeometry();
+        QGraphicsProxyWidget* proxy() { return m_proxy; }
 
     protected:
@@ -41 +44 @@
     private:
         PluginView* m_pluginView;
-        QWidget* m_parent;
+        QGraphicsProxyWidget* m_proxy;
         QRect m_windowRect;
         QRegion m_clipRegion;

trunk/WebCore/plugins/symbian/PluginViewSymbian.cpp

@@ -53 +53 @@
 #include "npinterface.h"
 #include "npruntime_impl.h"
+#include "qgraphicswebview.h"
 #include "runtime_root.h"
+#include <QGraphicsProxyWidget>
 #include <QKeyEvent>
 #include <QPixmap>
@@ -86 +88 @@
     
     m_windowRect = IntRect(frameView->contentsToWindow(frameRect().location()), frameRect().size());
+    
     m_clipRect = windowClipRect();
     m_clipRect.move(-m_windowRect.x(), -m_windowRect.y());
@@ -388 +391 @@
     if (m_isWindowed) {
         QWebPageClient* client = m_parentFrame->view()->hostWindow()->platformPageClient();
-        // FIXME this will not work for QGraphicsView.
-        // But we cannot use winId because it will create a window and on S60,
-        // QWidgets should not create a window. 
-        Q_ASSERT(qobject_cast<QWidget*>(client->pluginParent()));
-        setPlatformWidget(new PluginContainerSymbian(this, 
-            qobject_cast<QWidget*>(client->pluginParent())));
+        QGraphicsProxyWidget* proxy = 0;
+        if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(client->pluginParent()))
+            proxy = new QGraphicsProxyWidget(webView);
+
+        PluginContainerSymbian* container = new PluginContainerSymbian(this, proxy ? 0 : client->ownerWidget(), proxy);
+        setPlatformWidget(container);
+        if (proxy)
+            proxy->setWidget(container);
+        
         m_npWindow.type = NPWindowTypeWindow;
         m_npWindow.window = (void*)platformPluginWidget();
@@ -409 +415 @@
 void PluginView::platformDestroy()
 {
-    delete platformPluginWidget();
+    QWebPageClient* client = m_parentFrame->view()->hostWindow()->platformPageClient();
+    if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(client->pluginParent()))
+        delete static_cast<PluginContainerSymbian*>(platformPluginWidget())->proxy();
+    else
+        delete platformPluginWidget();
 }