Changeset 88304 in webkit
- Timestamp:
- Jun 7, 2011 5:57:16 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r88297 r88304 1 2011-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 1 19 2011-06-07 Emil A Eklund <eae@chromium.org> 2 20 -
trunk/Source/WebCore/WebCore.pri
r88016 r88304 5 5 6 6 # We enable TextureMapper by default; remove this line to enable GraphicsLayerQt. 7 mac|unix:!symbian:CONFIG += texmap7 CONFIG += texmap 8 8 9 9 QT *= network … … 285 285 contains(CONFIG, texmap) { 286 286 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 288 289 QT *= opengl 289 290 } -
trunk/Source/WebCore/WebCore.pro
r88273 r88304 3566 3566 platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 3567 3567 3568 contains(QT_CONFIG, opengl) {3568 !symbian:!win32-*:contains(QT_CONFIG, opengl) { 3569 3569 HEADERS += platform/graphics/opengl/TextureMapperGL.h 3570 3570 SOURCES += platform/graphics/opengl/TextureMapperGL.cpp -
trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
r87208 r88304 40 40 #include <wtf/text/CString.h> 41 41 42 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) 42 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) && USE(TEXTURE_MAPPER_GL) 43 43 #include <opengl/TextureMapperGL.h> 44 44 #endif -
trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.cpp
r86664 r88304 25 25 #include <QtGui/qpixmap.h> 26 26 27 #if def QT_OPENGL_LIB27 #if USE(TEXTURE_MAPPER_GL) 28 28 # include "opengl/TextureMapperGL.h" 29 29 #endif … … 186 186 PassOwnPtr<TextureMapper> TextureMapper::create(GraphicsContext* context) 187 187 { 188 #if def QT_OPENGL_LIB188 #if USE(TEXTURE_MAPPER_GL) 189 189 if (context && context->platformContext()->paintEngine()->type() == QPaintEngine::OpenGL2) 190 190 return adoptPtr(new TextureMapperGL); … … 214 214 } 215 215 216 #if def QT_OPENGL_LIB216 #if USE(TEXTURE_MAPPER_GL) 217 217 class RGBA32PremultimpliedBufferQt : public RGBA32PremultimpliedBuffer { 218 218 public: -
trunk/Source/WebKit/qt/ChangeLog
r88253 r88304 1 2011-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 1 14 2011-06-07 Aravind Akella <aravind.akella@nokia.com> 2 15 -
trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp
r86664 r88304 32 32 #include "texmap/TextureMapperNode.h" 33 33 34 #if def QT_OPENGL_LIB34 #if USE(TEXTURE_MAPPER_GL) 35 35 #include "opengl/TextureMapperGL.h" 36 36 #endif … … 266 266 if (layer) { 267 267 textureMapperNodeClient = adoptPtr(new TextureMapperNodeClientQt(page->mainFrame(), layer)); 268 #if def QT_OPENGL_LIB268 #if USE(TEXTURE_MAPPER_GL) 269 269 QGraphicsView* graphicsView = view->scene()->views()[0]; 270 270 if (graphicsView && graphicsView->viewport() && graphicsView->viewport()->inherits("QGLWidget")) {
Note: See TracChangeset
for help on using the changeset viewer.