Changeset 68390 in webkit


Ignore:
Timestamp:
Sep 27, 2010 7:54:15 AM (14 years ago)
Author:
Girish Ramakrishnan
Message:

2010-09-27 Girish Ramakrishnan <Girish Ramakrishnan>

Reviewed by Antonio Gomes.

[Qt] Enable local rendering of NPAPI plugins on Maemo6.

​https://bugs.webkit.org/show_bug.cgi?id=46618

  • WebCore.pro:
  • bridge/npapi.h:
  • plugins/PluginView.cpp: (WebCore::PluginView::setValue): (WebCore::PluginView::PluginView):
  • plugins/PluginView.h:
  • plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::updatePluginWidget): (WebCore::PluginView::paint): (WebCore::PluginView::platformGetValueStatic):
  • WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::createPlugin):
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r68389 r68390  
     12010-09-27  Girish Ramakrishnan  <girish@forwardbias.in>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [Qt] Enable local rendering of NPAPI plugins on Maemo6.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=46618
     8
     9        * WebCore.pro:
     10        * bridge/npapi.h:
     11        * plugins/PluginView.cpp:
     12        (WebCore::PluginView::setValue):
     13        (WebCore::PluginView::PluginView):
     14        * plugins/PluginView.h:
     15        * plugins/qt/PluginViewQt.cpp:
     16        (WebCore::PluginView::updatePluginWidget):
     17        (WebCore::PluginView::paint):
     18        (WebCore::PluginView::platformGetValueStatic):
     19
    1202010-09-27  Ilya Tikhonovsky  <loislo@chromium.org>
    221

  • trunk/WebCore/WebCore.pro

    r68251 r68390  
    27092709                    DEFINES += MOZ_PLATFORM_MAEMO=5
    27102710                }
     2711                contains(DEFINES, Q_WS_MAEMO_6) {
     2712                    DEFINES += MOZ_PLATFORM_MAEMO=6
     2713                }
    27112714                SOURCES += \
    27122715                    plugins/qt/PluginContainerQt.cpp \

  • trunk/WebCore/bridge/npapi.h

    r61277 r68390  
    382382#endif
    383383
    384 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     384#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    385385  , NPPVpluginWindowlessLocalBool = 2002
    386386#endif
    … …  
    428428  , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
    429429#endif /* XP_MACOSX */
    430 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     430#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    431431  , NPNVSupportsWindowlessLocal = 2002
    432432#endif

  • trunk/WebCore/plugins/PluginView.cpp

    r67338 r68390  
    679679#endif // defined(XP_MACOSX)
    680680
    681 #if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     681#if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    682682    case NPPVpluginWindowlessLocalBool:
    683683        m_renderToImage = true;
    … …  
    874874    , m_pluginDisplay(0)
    875875#endif
    876 #if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     876#if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    877877    , m_renderToImage(false)
    878878#endif

  • trunk/WebCore/plugins/PluginView.h

    r67337 r68390  
    5858#endif
    5959#endif
    60 #if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     60#if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    6161#include <QImage>
    6262class QPainter;
    … …  
    403403#endif
    404404
    405 #if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     405#if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    406406        QImage m_image;
    407407        bool m_renderToImage;

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

    r67325 r68390  
    116116
    117117    if (!m_isWindowed && m_windowRect.size() != oldWindowRect.size()) {
    118 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     118#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    119119        // On Maemo5, Flash always renders to 16-bit buffer
    120120        if (m_renderToImage)
    … …  
    173173}
    174174
    175 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     175#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    176176void PluginView::paintUsingImageSurfaceExtension(QPainter* painter, const IntRect& exposedRect)
    177177{
    … …  
    254254
    255255    if (!m_drawable
    256 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     256#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    257257        && m_image.isNull()
    258258#endif
    … …  
    265265    exposedRect.move(-frameRect().x(), -frameRect().y());
    266266
    267 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     267#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    268268    if (!m_image.isNull()) {
    269269        paintUsingImageSurfaceExtension(painter, exposedRect);
    … …  
    698698        return true;
    699699
    700 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     700#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    701701    case NPNVSupportsWindowlessLocal:
    702702        *static_cast<NPBool*>(value) = true;

  • trunk/WebKit/qt/ChangeLog

    r68382 r68390  
     12010-09-27  Girish Ramakrishnan  <girish@forwardbias.in>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        Enable local rendering of NPAPI plugins on Maemo6.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=46618
     8
     9        * WebCoreSupport/FrameLoaderClientQt.cpp:
     10        (WebCore::FrameLoaderClientQt::createPlugin):
     11
    1122010-09-27  Benjamin Poulain  <benjamin.poulain@nokia.com>
    213

  • trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r68292 r68390  
    15111511            QWebPageClient* client = m_webFrame->page()->d->client;
    15121512            const bool isQWebView = client && qobject_cast<QWidget*>(client->pluginParent());
    1513 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
     1513#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
    15141514            size_t wmodeIndex = params.find("wmode");
    15151515            if (wmodeIndex == -1) {
Note: See TracChangeset for help on using the changeset viewer.