Changeset 88304 in webkit


Ignore:
Timestamp:
Jun 7, 2011 5:57:16 PM (13 years ago)
Author:
noam.rosenthal@nokia.com
Message:

2011-06-07 No'am Rosenthal <noam.rosenthal@nokia.com>

Reviewed by Andreas Kling.

[Texmap][Qt] Enable TextureMapper by default
https://bugs.webkit.org/show_bug.cgi?id=61740

Enable TextureMapper on Windows+Symbian, disabling the direct OpenGL path. This would mean that
for now QtWebKit on Windows/Symbian would use the Qt backend for TextureMapper.

No new functionality so no new tests.

  • WebCore.pri:
  • WebCore.pro:
  • platform/graphics/qt/GraphicsContext3DQt.cpp:
  • platform/graphics/qt/TextureMapperQt.cpp: (WebCore::TextureMapper::create):

2011-06-07 Noam Rosenthal <noam.rosenthal@nokia.com>

Reviewed by Andreas Kling.

[Texmap][Qt] Enable TextureMapper by default
https://bugs.webkit.org/show_bug.cgi?id=61740

Enable TextureMapper on Windows+Symbian, disabling the direct OpenGL path. This would mean that
for now QtWebKit on Windows/Symbian would use the Qt backend for TextureMapper.

  • WebCoreSupport/PageClientQt.cpp: (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r88297 r88304  
     12011-06-07  No'am Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Texmap][Qt] Enable TextureMapper by default
     6        https://bugs.webkit.org/show_bug.cgi?id=61740
     7
     8        Enable TextureMapper on Windows+Symbian, disabling the direct OpenGL path. This would mean that
     9        for now QtWebKit on Windows/Symbian would use the Qt backend for TextureMapper.
     10
     11        No new functionality so no new tests.
     12
     13        * WebCore.pri:
     14        * WebCore.pro:
     15        * platform/graphics/qt/GraphicsContext3DQt.cpp:
     16        * platform/graphics/qt/TextureMapperQt.cpp:
     17        (WebCore::TextureMapper::create):
     18
    1192011-06-07  Emil A Eklund  <eae@chromium.org>
    220
  • trunk/Source/WebCore/WebCore.pri

    r88016 r88304  
    55
    66# We enable TextureMapper by default; remove this line to enable GraphicsLayerQt.
    7 mac|unix:!symbian:CONFIG += texmap
     7CONFIG += texmap
    88
    99QT *= network
     
    285285contains(CONFIG, texmap) {
    286286    DEFINES += WTF_USE_TEXTURE_MAPPER=1
    287     contains(QT_CONFIG, opengl) {
     287    !symbian:!win32-*:contains(QT_CONFIG, opengl) {
     288        DEFINES += WTF_USE_TEXTURE_MAPPER_GL
    288289        QT *= opengl
    289290    }
  • trunk/Source/WebCore/WebCore.pro

    r88273 r88304  
    35663566        platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
    35673567
    3568     contains(QT_CONFIG, opengl) {
     3568    !symbian:!win32-*:contains(QT_CONFIG, opengl) {
    35693569        HEADERS += platform/graphics/opengl/TextureMapperGL.h
    35703570        SOURCES += platform/graphics/opengl/TextureMapperGL.cpp
  • trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

    r87208 r88304  
    4040#include <wtf/text/CString.h>
    4141
    42 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     42#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) && USE(TEXTURE_MAPPER_GL)
    4343#include <opengl/TextureMapperGL.h>
    4444#endif
  • trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.cpp

    r86664 r88304  
    2525#include <QtGui/qpixmap.h>
    2626
    27 #ifdef QT_OPENGL_LIB
     27#if USE(TEXTURE_MAPPER_GL)
    2828# include "opengl/TextureMapperGL.h"
    2929#endif
     
    186186PassOwnPtr<TextureMapper> TextureMapper::create(GraphicsContext* context)
    187187{
    188 #ifdef QT_OPENGL_LIB
     188#if USE(TEXTURE_MAPPER_GL)
    189189    if (context && context->platformContext()->paintEngine()->type() == QPaintEngine::OpenGL2)
    190190        return adoptPtr(new TextureMapperGL);
     
    214214}
    215215
    216 #ifdef QT_OPENGL_LIB
     216#if USE(TEXTURE_MAPPER_GL)
    217217class RGBA32PremultimpliedBufferQt : public RGBA32PremultimpliedBuffer {
    218218public:
  • trunk/Source/WebKit/qt/ChangeLog

    r88253 r88304  
     12011-06-07  Noam Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Texmap][Qt] Enable TextureMapper by default
     6        https://bugs.webkit.org/show_bug.cgi?id=61740
     7
     8        Enable TextureMapper on Windows+Symbian, disabling the direct OpenGL path. This would mean that
     9        for now QtWebKit on Windows/Symbian would use the Qt backend for TextureMapper.
     10
     11        * WebCoreSupport/PageClientQt.cpp:
     12        (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
     13
    1142011-06-07  Aravind Akella  <aravind.akella@nokia.com>
    215
  • trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp

    r86664 r88304  
    3232#include "texmap/TextureMapperNode.h"
    3333
    34 #ifdef QT_OPENGL_LIB
     34#if USE(TEXTURE_MAPPER_GL)
    3535#include "opengl/TextureMapperGL.h"
    3636#endif
     
    266266    if (layer) {
    267267        textureMapperNodeClient = adoptPtr(new TextureMapperNodeClientQt(page->mainFrame(), layer));
    268 #ifdef QT_OPENGL_LIB
     268#if USE(TEXTURE_MAPPER_GL)
    269269        QGraphicsView* graphicsView = view->scene()->views()[0];
    270270        if (graphicsView && graphicsView->viewport() && graphicsView->viewport()->inherits("QGLWidget")) {
Note: See TracChangeset for help on using the changeset viewer.