Changeset 121710 in webkit


Ignore:
Timestamp:
Jul 2, 2012 3:44:32 PM (12 years ago)
Author:
noam.rosenthal@nokia.com
Message:

[Qt] Get rid of GraphicsLayerQt
​https://bugs.webkit.org/show_bug.cgi?id=78598

Reviewed by Luiz Agostini.

Source/WebCore:

Remove GraphicsLayerQt.h/cpp, as well as references to the non-TextureMapper code paths
in GraphicsContext3DQt and MediaPlayerPrivateQt.

No new tests, removing unused code paths.

  • Target.pri:
  • platform/graphics/PlatformLayer.h:
  • platform/graphics/qt/GraphicsContext3DQt.cpp:

(GraphicsContext3DPrivate):
(WebCore):

  • platform/graphics/qt/GraphicsContextQt.cpp:

(WebCore):

  • platform/graphics/qt/GraphicsLayerQt.cpp: Removed.
  • platform/graphics/qt/GraphicsLayerQt.h: Removed.
  • platform/graphics/qt/MediaPlayerPrivateQt.cpp:

(WebCore):

  • platform/graphics/qt/MediaPlayerPrivateQt.h:

(MediaPlayerPrivateQt):

  • plugins/qt/PluginViewQt.cpp:

(WebCore::PluginView::invalidateRect):
(WebCore::PluginView::platformStart):

Source/WebKit/qt:

Removed all references to GraphicsLayerQt, including #ifdef code paths that only apply
when TEXTURE_MAPPER is disabled.

  • Api/qgraphicswebview.cpp:

(QGraphicsWebView::paint):

  • Api/qwebframe.cpp:

(QWebFramePrivate::renderFromTiledBackingStore):
(QWebFramePrivate::renderRelativeCoords):

  • Api/qwebframe_p.h:

(QWebFramePrivate::QWebFramePrivate):
(QWebFramePrivate):

  • Api/qwebsettings.cpp:

(QWebSettingsPrivate::apply):

  • WebCoreSupport/PageClientQt.cpp:

(WebCore):
(WebCore::PageClientQGraphicsWidget::~PageClientQGraphicsWidget):
(WebCore::PageClientQGraphicsWidget::update):
(WebCore::PageClientQGraphicsWidget::syncLayers):
(WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):

  • WebCoreSupport/PageClientQt.h:

(WebCore):
(WebCore::PageClientQWidget::PageClientQWidget):
(PageClientQWidget):
(PageClientQGraphicsWidget):

Location:
trunk/Source
Files:
2 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r121709 r121710  
     12012-07-02  No'am Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        [Qt] Get rid of GraphicsLayerQt
     4        https://bugs.webkit.org/show_bug.cgi?id=78598
     5
     6        Reviewed by Luiz Agostini.
     7
     8        Remove GraphicsLayerQt.h/cpp, as well as references to the non-TextureMapper code paths
     9        in GraphicsContext3DQt and MediaPlayerPrivateQt.
     10
     11        No new tests, removing unused code paths.
     12
     13        * Target.pri:
     14        * platform/graphics/PlatformLayer.h:
     15        * platform/graphics/qt/GraphicsContext3DQt.cpp:
     16        (GraphicsContext3DPrivate):
     17        (WebCore):
     18        * platform/graphics/qt/GraphicsContextQt.cpp:
     19        (WebCore):
     20        * platform/graphics/qt/GraphicsLayerQt.cpp: Removed.
     21        * platform/graphics/qt/GraphicsLayerQt.h: Removed.
     22        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
     23        (WebCore):
     24        * platform/graphics/qt/MediaPlayerPrivateQt.h:
     25        (MediaPlayerPrivateQt):
     26        * plugins/qt/PluginViewQt.cpp:
     27        (WebCore::PluginView::invalidateRect):
     28        (WebCore::PluginView::platformStart):
     29
    1302012-07-02  Behdad Esfahbod  <behdad@behdad.org>
    231

  • trunk/Source/WebCore/Target.pri

    r121525 r121710  
    23142314    platform/graphics/SimpleFontData.h \
    23152315    platform/graphics/surfaces/GraphicsSurface.h \
     2316    platform/graphics/texmap/GraphicsLayerTextureMapper.h \
     2317    platform/graphics/texmap/LayerTransform.h \
     2318    platform/graphics/texmap/TextureMapper.h \
     2319    platform/graphics/texmap/TextureMapperAnimation.h \
     2320    platform/graphics/texmap/TextureMapperBackingStore.h \
     2321    platform/graphics/texmap/TextureMapperImageBuffer.h \
     2322    platform/graphics/texmap/TextureMapperLayer.h \
     2323    platform/graphics/texmap/TextureMapperPlatformLayer.h \
    23162324    platform/graphics/Tile.h \
    23172325    platform/graphics/TiledBackingStore.h \
    … …  
    29242932    platform/graphics/qt/PatternQt.cpp \
    29252933    platform/graphics/qt/StillImageQt.cpp \
     2934    platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \
     2935    platform/graphics/texmap/LayerTransform.cpp \
     2936    platform/graphics/texmap/TextureMapper.cpp \
     2937    platform/graphics/texmap/TextureMapperAnimation.cpp \
     2938    platform/graphics/texmap/TextureMapperBackingStore.cpp \
     2939    platform/graphics/texmap/TextureMapperImageBuffer.cpp \
     2940    platform/graphics/texmap/TextureMapperLayer.cpp \
    29262941    platform/network/MIMESniffing.cpp \
    29272942    platform/network/qt/CredentialStorageQt.cpp \
    … …  
    41334148}
    41344149
    4135 contains(CONFIG, texmap) {
     4150contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1) {
    41364151    HEADERS += \
    4137         platform/graphics/texmap/GraphicsLayerTextureMapper.h \
    4138         platform/graphics/texmap/LayerTransform.h \
    4139         platform/graphics/texmap/TextureMapper.h \
    4140         platform/graphics/texmap/TextureMapperAnimation.h \
    4141         platform/graphics/texmap/TextureMapperBackingStore.h \
    4142         platform/graphics/texmap/TextureMapperImageBuffer.h \
    4143         platform/graphics/texmap/TextureMapperLayer.h \
    4144         platform/graphics/texmap/TextureMapperPlatformLayer.h
     4152        platform/graphics/texmap/TextureMapperGL.h \
     4153        platform/graphics/texmap/TextureMapperShaderManager.h
    41454154
    41464155    SOURCES += \
    4147         platform/graphics/texmap/LayerTransform.cpp \
    4148         platform/graphics/texmap/TextureMapper.cpp \
    4149         platform/graphics/texmap/TextureMapperAnimation.cpp \
    4150         platform/graphics/texmap/TextureMapperBackingStore.cpp \
    4151         platform/graphics/texmap/TextureMapperImageBuffer.cpp \
    4152         platform/graphics/texmap/TextureMapperLayer.cpp \
    4153         platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
    4154 
    4155     contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1) {
    4156         HEADERS += \
    4157             platform/graphics/texmap/TextureMapperGL.h \
    4158             platform/graphics/texmap/TextureMapperShaderManager.h
    4159 
    4160         SOURCES += \
    4161             platform/graphics/texmap/TextureMapperGL.cpp \
    4162             platform/graphics/texmap/TextureMapperShaderManager.cpp
    4163 
    4164         CONFIG += opengl-shims
    4165     }
    4166 } else {
    4167     HEADERS += platform/graphics/qt/GraphicsLayerQt.h
    4168     SOURCES += platform/graphics/qt/GraphicsLayerQt.cpp
     4156        platform/graphics/texmap/TextureMapperGL.cpp \
     4157        platform/graphics/texmap/TextureMapperShaderManager.cpp
     4158
     4159    CONFIG += opengl-shims
    41694160}
    41704161

  • trunk/Source/WebCore/platform/graphics/PlatformLayer.h

    r121513 r121710  
    3535typedef struct _CACFLayer PlatformLayer;
    3636#elif PLATFORM(QT)
    37 #if USE(TEXTURE_MAPPER)
    3837namespace WebCore {
    3938class TextureMapperPlatformLayer;
    4039typedef TextureMapperPlatformLayer PlatformLayer;
    4140};
    42 #else
    43 QT_BEGIN_NAMESPACE
    44 class QGraphicsObject;
    45 QT_END_NAMESPACE
    46 namespace WebCore {
    47 typedef QGraphicsObject PlatformLayer;
    48 }
    49 #endif
    5041#elif PLATFORM(CHROMIUM)
    5142namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

    r121501 r121710  
    4141#include <wtf/text/CString.h>
    4242
    43 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) && USE(TEXTURE_MAPPER_GL)
     43#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
    4444#include <texmap/TextureMapperGL.h>
    4545#endif
    … …  
    5858
    5959class GraphicsContext3DPrivate
    60 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     60#if USE(ACCELERATED_COMPOSITING)
    6161        : public TextureMapperPlatformLayer
    6262#endif
    … …  
    6666    ~GraphicsContext3DPrivate();
    6767
    68 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     68#if USE(ACCELERATED_COMPOSITING)
    6969    virtual void paintToTextureMapper(TextureMapper*, const FloatRect& target, const TransformationMatrix&, float opacity, BitmapTexture* mask);
    7070#endif
    … …  
    154154}
    155155
    156 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     156#if USE(ACCELERATED_COMPOSITING)
    157157void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, BitmapTexture* mask)
    158158{

  • trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

    r121618 r121710  
    13191319}
    13201320
    1321 #if ENABLE(3D_RENDERING) && USE(TEXTURE_MAPPER)
     1321#if ENABLE(3D_RENDERING)
    13221322TransformationMatrix GraphicsContext::get3DTransform() const
    13231323{

  • trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

    r121053 r121710  
    5353#include <wtf/text/CString.h>
    5454
    55 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     55#if USE(ACCELERATED_COMPOSITING)
    5656#include "texmap/TextureMapper.h"
    5757#endif
    … …  
    614614}
    615615
    616 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     616#if USE(ACCELERATED_COMPOSITING)
    617617void MediaPlayerPrivateQt::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, BitmapTexture*) const
    618618{

  • trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h

    r121053 r121710  
    3232QT_END_NAMESPACE
    3333
    34 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     34#if USE(ACCELERATED_COMPOSITING)
    3535#include "TextureMapper.h"
    3636#endif
    … …  
    3939
    4040class MediaPlayerPrivateQt : public QObject, public MediaPlayerPrivateInterface
    41 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     41#if USE(ACCELERATED_COMPOSITING)
    4242        , public TextureMapperPlatformLayer
    4343#endif
    … …  
    102102
    103103#if USE(ACCELERATED_COMPOSITING)
    104 #if USE(TEXTURE_MAPPER)
    105104    // whether accelerated rendering is supported by the media engine for the current media.
    106105    virtual bool supportsAcceleratedRendering() const { return false; }
    … …  
    110109    virtual PlatformLayer* platformLayer() const { return 0; }
    111110    virtual void paintToTextureMapper(TextureMapper*, const FloatRect& targetRect, const TransformationMatrix&, float opacity, BitmapTexture* mask) const;
    112 #else
    113     virtual bool supportsAcceleratedRendering() const { return false; }
    114     virtual void acceleratedRenderingStateChanged() { }
    115     virtual PlatformLayer* platformLayer() const { return 0; }
    116 #endif
    117111#endif
    118112

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

    r121381 r121710  
    143143}
    144144
    145 #if !HAVE(QT5) && USE(ACCELERATED_COMPOSITING)
    146 // Qt's GraphicsLayer (GraphicsLayerQt) requires layers to be QGraphicsWidgets
    147 class PluginGraphicsLayerQt : public QGraphicsWidget {
    148 public:
    149     PluginGraphicsLayerQt(PluginView* view) : m_view(view) { }
    150     ~PluginGraphicsLayerQt() { }
    151 
    152     void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0)
    153     {
    154         Q_UNUSED(widget);
    155         m_view->paintUsingXPixmap(painter, option->exposedRect.toRect());
    156     }
    157 
    158 private:
    159     PluginView* m_view;
    160 };
    161 
    162 bool PluginView::shouldUseAcceleratedCompositing() const
    163 {
    164     return m_parentFrame->page()->chrome()->client()->allowsAcceleratedCompositing()
    165            && m_parentFrame->page()->settings()
    166            && m_parentFrame->page()->settings()->acceleratedCompositingEnabled();
    167 }
    168 #endif
    169 
    170145void PluginView::updatePluginWidget()
    171146{
    … …  
    802777void PluginView::invalidateRect(const IntRect& rect)
    803778{
    804 #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
    805     if (m_platformLayer) {
    806         m_platformLayer->update(QRectF(rect));
    807         return;
    808     }
    809 #endif
    810 
    811779#if !HAVE(QT5) // Windowed mode is not supported with Qt5 yet.
    812780    if (m_isWindowed) {
    … …  
    974942        setPlatformWidget(0);
    975943        m_pluginDisplay = getPluginDisplay();
    976 
    977 #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
    978         if (shouldUseAcceleratedCompositing()) {
    979             m_platformLayer = adoptPtr(new PluginGraphicsLayerQt(this));
    980             // Trigger layer computation in RenderLayerCompositor
    981             m_element->setNeedsStyleRecalc(SyntheticStyleChange);
    982         }
    983 #endif
    984944    }
    985945

  • trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp

    r120704 r121710  
    297297    }
    298298#endif
    299 #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
    300     page()->mainFrame()->render(painter, d->overlay() ? QWebFrame::ContentsLayer : QWebFrame::AllLayers, option->exposedRect.toAlignedRect());
    301 #else
    302299    page()->mainFrame()->render(painter, QWebFrame::AllLayers, option->exposedRect.toRect());
    303 #endif
    304300    painter->setRenderHints(oldHints);
    305301}

  • trunk/Source/WebKit/qt/Api/qwebframe.cpp

    r121381 r121710  
    323323    }
    324324
    325 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     325#if USE(ACCELERATED_COMPOSITING)
    326326    renderCompositedLayers(context, IntRect(clip.boundingRect()));
    327327    renderFrameExtras(context, QFlags<QWebFrame::RenderLayer>(QWebFrame::ScrollBarLayer) | QWebFrame::PanIconLayer, clip);
    … …  
    330330#endif
    331331
    332 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     332#if USE(ACCELERATED_COMPOSITING)
    333333void QWebFramePrivate::renderCompositedLayers(GraphicsContext* context, const IntRect& clip)
    334334{
    … …  
    396396            context->restore();
    397397        }
    398 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     398#if USE(ACCELERATED_COMPOSITING)
    399399        renderCompositedLayers(context, IntRect(clip.boundingRect()));
    400400#endif

  • trunk/Source/WebKit/qt/Api/qwebframe_p.h

    r120704 r121710  
    4040#include "ViewportArguments.h"
    4141
    42 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     42#if USE(ACCELERATED_COMPOSITING)
    4343#include "texmap/TextureMapper.h"
    4444#endif
    … …  
    8585        , marginWidth(-1)
    8686        , marginHeight(-1)
    87 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     87#if USE(ACCELERATED_COMPOSITING)
    8888        , rootTextureMapperLayer(0)
    8989#endif
    … …  
    105105#endif
    106106
    107 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     107#if USE(ACCELERATED_COMPOSITING)
    108108    void renderCompositedLayers(WebCore::GraphicsContext*, const WebCore::IntRect& clip);
    109109#endif
    … …  
    125125    int marginWidth;
    126126    int marginHeight;
    127 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     127#if USE(ACCELERATED_COMPOSITING)
    128128    WebCore::TextureMapperLayer* rootTextureMapperLayer;
    129129    OwnPtr<WebCore::TextureMapper> textureMapper;

  • trunk/Source/WebKit/qt/Api/qwebsettings.cpp

    r121241 r121710  
    157157        settings->setAcceleratedCompositingFor3DTransformsEnabled(value);
    158158        settings->setAcceleratedCompositingForAnimationEnabled(value);
    159 #if USE(TEXTURE_MAPPER)
    160159        settings->setAcceleratedCompositingForVideoEnabled(false);
    161160        settings->setAcceleratedCompositingForPluginsEnabled(false);
    162 #endif
    163161#endif
    164162#if ENABLE(WEBGL)

  • trunk/Source/WebKit/qt/ChangeLog

    r121707 r121710  
     12012-07-02  No'am Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        [Qt] Get rid of GraphicsLayerQt
     4        https://bugs.webkit.org/show_bug.cgi?id=78598
     5
     6        Reviewed by Luiz Agostini.
     7
     8        Removed all references to GraphicsLayerQt, including #ifdef code paths that only apply
     9        when TEXTURE_MAPPER is disabled.
     10
     11        * Api/qgraphicswebview.cpp:
     12        (QGraphicsWebView::paint):
     13        * Api/qwebframe.cpp:
     14        (QWebFramePrivate::renderFromTiledBackingStore):
     15        (QWebFramePrivate::renderRelativeCoords):
     16        * Api/qwebframe_p.h:
     17        (QWebFramePrivate::QWebFramePrivate):
     18        (QWebFramePrivate):
     19        * Api/qwebsettings.cpp:
     20        (QWebSettingsPrivate::apply):
     21        * WebCoreSupport/PageClientQt.cpp:
     22        (WebCore):
     23        (WebCore::PageClientQGraphicsWidget::~PageClientQGraphicsWidget):
     24        (WebCore::PageClientQGraphicsWidget::update):
     25        (WebCore::PageClientQGraphicsWidget::syncLayers):
     26        (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
     27        * WebCoreSupport/PageClientQt.h:
     28        (WebCore):
     29        (WebCore::PageClientQWidget::PageClientQWidget):
     30        (PageClientQWidget):
     31        (PageClientQGraphicsWidget):
     32
    1332012-07-02  Benjamin Poulain  <bpoulain@apple.com>
    234

  • trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp

    r119098 r121710  
    6565#endif
    6666
    67 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     67#if USE(ACCELERATED_COMPOSITING)
    6868#include "TextureMapper.h"
    6969#include "texmap/TextureMapperLayer.h"
    … …  
    8686namespace WebCore {
    8787
    88 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     88#if USE(ACCELERATED_COMPOSITING)
    8989TextureMapperLayerClientQt::TextureMapperLayerClientQt(QWebFrame* frame, GraphicsLayer* layer)
    9090    : m_frame(frame)
    … …  
    250250{
    251251    delete overlay;
    252 #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
    253     if (!rootGraphicsLayer)
    254         return;
    255     // we don't need to delete the root graphics layer. The lifecycle is managed in GraphicsLayerQt.cpp.
    256     rootGraphicsLayer.data()->setParentItem(0);
    257     view->scene()->removeItem(rootGraphicsLayer.data());
    258 #endif
    259252}
    260253
    … …  
    268261    view->update(dirtyRect);
    269262
    270     createOrDeleteOverlay();
    271263    if (overlay)
    272264        overlay->update(QRectF(dirtyRect));
    273 #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
    274     syncLayers();
    275 #endif
    276 }
    277 
    278 void PageClientQGraphicsWidget::createOrDeleteOverlay()
    279 {
    280     // We don't use an overlay with TextureMapper. Instead, the overlay is drawn inside QWebFrame.
    281 #if !USE(TEXTURE_MAPPER)
    282     bool useOverlay = false;
    283     if (!viewResizesToContents) {
    284 #if USE(ACCELERATED_COMPOSITING)
    285         useOverlay = useOverlay || rootGraphicsLayer;
    286 #endif
    287 #if USE(TILED_BACKING_STORE)
    288         useOverlay = useOverlay || QWebFramePrivate::core(page->mainFrame())->tiledBackingStore();
    289 #endif
    290     }
    291     if (useOverlay == !!overlay)
    292         return;
    293 
    294     if (useOverlay) {
    295         overlay = new QGraphicsItemOverlay(view, page);
    296         overlay->setZValue(OverlayZValue);
    297     } else {
    298         // Changing the overlay might be done inside paint events.
    299         overlay->deleteLater();
    300         overlay = 0;
    301     }
    302 #endif // !USE(TEXTURE_MAPPER)
    303265}
    304266
    … …  
    306268void PageClientQGraphicsWidget::syncLayers()
    307269{
    308 #if USE(TEXTURE_MAPPER)
    309270    if (TextureMapperLayerClient)
    310271        TextureMapperLayerClient->syncRootLayer();
    311 #endif
    312272
    313273    QWebFramePrivate::core(page->mainFrame())->view()->syncCompositingStateIncludingSubframes();
    314274
    315 #if USE(TEXTURE_MAPPER)
    316275    if (!TextureMapperLayerClient)
    317276        return;
    … …  
    320279        syncTimer.startOneShot(1.0 / 60.0);
    321280    update(view->boundingRect().toAlignedRect());
    322 #endif
    323 }
    324 
    325 #if USE(TEXTURE_MAPPER)
     281}
     282
    326283void PageClientQGraphicsWidget::setRootGraphicsLayer(GraphicsLayer* layer)
    327284{
    … …  
    340297    TextureMapperLayerClient.clear();
    341298}
    342 #else
    343 void PageClientQGraphicsWidget::setRootGraphicsLayer(GraphicsLayer* layer)
    344 {
    345     if (rootGraphicsLayer) {
    346         rootGraphicsLayer.data()->setParentItem(0);
    347         view->scene()->removeItem(rootGraphicsLayer.data());
    348         QWebFramePrivate::core(page->mainFrame())->view()->syncCompositingStateIncludingSubframes();
    349     }
    350 
    351     rootGraphicsLayer = layer ? layer->platformLayer() : 0;
    352 
    353     if (rootGraphicsLayer) {
    354         rootGraphicsLayer.data()->setParentItem(view);
    355         rootGraphicsLayer.data()->setZValue(RootGraphicsLayerZValue);
    356     }
    357     createOrDeleteOverlay();
    358 }
    359 #endif
    360299
    361300void PageClientQGraphicsWidget::markForSync(bool scheduleSync)

  • trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h

    r120704 r121710  
    4444namespace WebCore {
    4545
    46 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     46#if USE(ACCELERATED_COMPOSITING)
    4747class TextureMapperLayerClientQt {
    4848public:
    … …  
    6464        : view(newView)
    6565        , page(newPage)
    66 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     66#if USE(ACCELERATED_COMPOSITING)
    6767        , syncTimer(this, &PageClientQWidget::syncLayers)
    6868#endif
    … …  
    108108    QWebPage* page;
    109109
    110 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     110#if USE(ACCELERATED_COMPOSITING)
    111111    virtual void setRootGraphicsLayer(GraphicsLayer*);
    112112    virtual void markForSync(bool scheduleSync);
    … …  
    114114#endif
    115115
    116 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     116#if USE(ACCELERATED_COMPOSITING)
    117117    virtual bool allowsAcceleratedCompositing() const { return true; }
    118118#else
    … …  
    120120#endif
    121121
    122 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     122#if USE(ACCELERATED_COMPOSITING)
    123123    Timer<PageClientQWidget> syncTimer;
    124124    OwnPtr<TextureMapperLayerClientQt> TextureMapperLayerClient;
    … …  
    213213#endif
    214214
    215     void createOrDeleteOverlay();
    216 
    217215#if USE(TILED_BACKING_STORE)
    218216    void updateTiledBackingStoreScale();
    … …  
    237235
    238236#if USE(ACCELERATED_COMPOSITING)
    239 #if USE(TEXTURE_MAPPER)
    240237    OwnPtr<TextureMapperLayerClientQt> TextureMapperLayerClient;
    241 #else
    242     QPointer<QGraphicsObject> rootGraphicsLayer;
    243 #endif
    244238    // we have to flush quite often, so we use a meta-method instead of QTimer::singleShot for putting the event in the queue
    245239    Timer<PageClientQGraphicsWidget> syncTimer;
Note: See TracChangeset for help on using the changeset viewer.