Changeset 88816 in webkit

Timestamp:

Jun 14, 2011 10:13:03 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-14 Viatcheslav Ostapenko <​ostapenko.viatcheslav@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] [Symbian] GraphicsLayer: support plugins on symbian
​https://bugs.webkit.org/show_bug.cgi?id=57418

Implement graphics layer for plugins on Symbian.

• plugins/PluginView.h:
• plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::shouldUseAcceleratedCompositing): (WebCore::PluginView::platformStart):
• plugins/symbian/PluginViewSymbian.cpp: (WebCore::PluginGraphicsLayerQt::PluginGraphicsLayerQt): (WebCore::PluginGraphicsLayerQt::~PluginGraphicsLayerQt): (WebCore::PluginGraphicsLayerQt::paint): (WebCore::PluginView::shouldUseAcceleratedCompositing): (WebCore::PluginView::paint): (WebCore::PluginView::invalidateRect): (WebCore::PluginView::platformStart): (WebCore::PluginView::platformLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginView.h (modified) (3 diffs)
• plugins/qt/PluginViewQt.cpp (modified) (2 diffs)
• plugins/symbian/PluginViewSymbian.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-14  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] [Symbian] GraphicsLayer: support plugins on symbian
+        https://bugs.webkit.org/show_bug.cgi?id=57418
+
+        Implement graphics layer for plugins on Symbian.
+
+        * plugins/PluginView.h:
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::shouldUseAcceleratedCompositing):
+        (WebCore::PluginView::platformStart):
+        * plugins/symbian/PluginViewSymbian.cpp:
+        (WebCore::PluginGraphicsLayerQt::PluginGraphicsLayerQt):
+        (WebCore::PluginGraphicsLayerQt::~PluginGraphicsLayerQt):
+        (WebCore::PluginGraphicsLayerQt::paint):
+        (WebCore::PluginView::shouldUseAcceleratedCompositing):
+        (WebCore::PluginView::paint):
+        (WebCore::PluginView::invalidateRect):
+        (WebCore::PluginView::platformStart):
+        (WebCore::PluginView::platformLayer):
+
 2011-06-14  Sreeram Ramachandran  <sreeram@chromium.org>
 

trunk/Source/WebCore/plugins/PluginView.h

@@ -69 +69 @@
 QT_END_NAMESPACE
 #endif
+#if PLATFORM(QT) && USE(ACCELERATED_COMPOSITING) && ENABLE(NETSCAPE_PLUGIN_API) && (defined(XP_UNIX) || OS(SYMBIAN))
+#ifndef WTF_USE_ACCELERATED_COMPOSITING_PLUGIN_LAYER
+#define WTF_USE_ACCELERATED_COMPOSITING_PLUGIN_LAYER 1
+#endif
+#endif
 #if PLATFORM(GTK)
 typedef struct _GtkSocket GtkSocket;
@@ -260 +265 @@
 
 #if USE(ACCELERATED_COMPOSITING)
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(QT)
+#if USE(ACCELERATED_COMPOSITING_PLUGIN_LAYER)
         virtual PlatformLayer* platformLayer() const;
+        bool shouldUseAcceleratedCompositing() const;
 #else
         virtual PlatformLayer* platformLayer() const { return 0; }
@@ -433 +439 @@
 #if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
         void paintUsingXPixmap(QPainter* painter, const QRect &exposedRect);
-#if USE(ACCELERATED_COMPOSITING)
+#endif
+#if USE(ACCELERATED_COMPOSITING_PLUGIN_LAYER)
         OwnPtr<PlatformLayer> m_platformLayer;
         friend class PluginGraphicsLayerQt;
-#endif // USE(ACCELERATED_COMPOSITING)
-#endif
+#endif // USE(ACCELERATED_COMPOSITING_PLUGIN_LAYER)
 #endif // PLATFORM(QT)
 

trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp

@@ -121 +121 @@
     PluginView* m_view;
 };
+
+bool PluginView::shouldUseAcceleratedCompositing() const
+{
+    return m_parentFrame->page()->chrome()->client()->allowsAcceleratedCompositing()
+           && m_parentFrame->page()->settings()
+           && m_parentFrame->page()->settings()->acceleratedCompositingEnabled();
+}
 #endif
 
@@ -960 +967 @@
 
 #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
-        if (m_parentFrame->page()->chrome()->client()->allowsAcceleratedCompositing()
-            && m_parentFrame->page()->settings() 
-            && m_parentFrame->page()->settings()->acceleratedCompositingEnabled()) {
+        if (shouldUseAcceleratedCompositing()) {
             m_platformLayer = adoptPtr(new PluginGraphicsLayerQt(this));
             // Trigger layer computation in RenderLayerCompositor

trunk/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp

@@ -21 +21 @@
 
 #include "BridgeJSC.h"
+#include "Chrome.h"
+#include "ChromeClient.h"
 #include "Document.h"
 #include "DocumentLoader.h"
@@ -60 +62 @@
 #include <QPixmap>
 #include <QRegion>
+#include <QStyleOptionGraphicsItem>
 #include <QVector>
 #include <QWidget>
@@ -86 +89 @@
 using namespace HTMLNames;
 
+#if USE(ACCELERATED_COMPOSITING)
+class PluginGraphicsLayerQt : public QGraphicsWidget {
+public:
+    PluginGraphicsLayerQt(PluginView* view) : m_view(view)
+    {
+        setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
+    }
+
+    ~PluginGraphicsLayerQt() { }
+
+    void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0)
+    {
+        Q_UNUSED(widget);
+
+        m_view->m_npWindow.ws_info = (void*)(painter);
+        m_view->setNPWindowIfNeeded();
+
+        painter->save();
+        QRectF clipRect(QPointF(0, 0), QSizeF(m_view->frameRect().size()));
+        if (option && !option->exposedRect.isEmpty())
+            clipRect &= option->exposedRect;
+        painter->setClipRect(clipRect);
+
+        QRect rect = clipRect.toRect();
+        QPaintEvent ev(rect);
+        QEvent& npEvent = ev;
+        m_view->dispatchNPEvent(npEvent);
+
+        painter->restore();
+    }
+
+private:
+    PluginView* m_view;
+};
+
+bool PluginView::shouldUseAcceleratedCompositing() const
+{
+    return m_parentFrame->page()->chrome()->client()->allowsAcceleratedCompositing()
+           && m_parentFrame->page()->settings()
+           && m_parentFrame->page()->settings()->acceleratedCompositingEnabled();
+}
+#endif
+
 void PluginView::updatePluginWidget()
 {
@@ -148 +194 @@
     if (m_isWindowed)
         return;
+
+#if USE(ACCELERATED_COMPOSITING)
+    if (m_platformLayer)
+        return;
+#endif
 
     context->save();
@@ -345 +396 @@
 void PluginView::invalidateRect(const IntRect& rect)
 {
+#if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
+    if (m_platformLayer) {
+        m_platformLayer->update(QRectF(rect));
+        return;
+    }
+#endif
+
     if (m_isWindowed) {
         platformWidget()->update(rect);
@@ -416 +474 @@
         m_npWindow.type = NPWindowTypeDrawable;
         m_npWindow.window = 0; // Not used?
+#if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
+        if (shouldUseAcceleratedCompositing()) {
+            m_platformLayer = new PluginGraphicsLayerQt(this);
+            m_element->setNeedsStyleRecalc(SyntheticStyleChange);
+        }
+#endif
     }    
     updatePluginWidget();
@@ -445 +509 @@
 }
 
+#if USE(ACCELERATED_COMPOSITING)
+PlatformLayer* PluginView::platformLayer() const
+{
+    return m_platformLayer.get();
+}
+#endif
+
 } // namespace WebCore