Changeset 86664 in webkit
- Timestamp:
- May 17, 2011, 2:46:54 AM (14 years ago)
- Location:
- trunk/Source
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r86663 r86664 1 2011-05-17 Young Han Lee <joybro@company100.net> 2 3 Reviewed by Csaba Osztrogonác. 4 5 [Texmap][Qt] Enable strict PassOwnPtr for Qt with texmap enabled. 6 https://bugs.webkit.org/show_bug.cgi?id=60947 7 8 No new tests. Build fix. 9 10 * platform/graphics/qt/TextureMapperQt.cpp: 11 (WebCore::TextureMapper::create): 12 * platform/graphics/qt/TextureMapperQt.h: 13 (WebCore::TextureMapperQt::create): 14 * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp: 15 (WebCore::GraphicsLayer::create): 16 1 17 2011-05-17 Alexander Pavlov <apavlov@chromium.org> 2 18 -
trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.cpp
r86269 r86664 188 188 #ifdef QT_OPENGL_LIB 189 189 if (context && context->platformContext()->paintEngine()->type() == QPaintEngine::OpenGL2) 190 return new TextureMapperGL;190 return adoptPtr(new TextureMapperGL); 191 191 #endif 192 return new TextureMapperQt;192 return adoptPtr(new TextureMapperQt); 193 193 } 194 194 -
trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.h
r86269 r86664 73 73 } 74 74 75 static PassOwnPtr<TextureMapper> create() { return new TextureMapperQt; }75 static PassOwnPtr<TextureMapper> create() { return adoptPtr(new TextureMapperQt); } 76 76 private: 77 77 inline QPainter* currentPainter() { return m_currentSurface ? m_currentSurface->painter() : m_painter; } -
trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
r86276 r86664 352 352 PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client) 353 353 { 354 return new GraphicsLayerTextureMapper(client);354 return adoptPtr(new GraphicsLayerTextureMapper(client)); 355 355 } 356 356 -
trunk/Source/WebKit/qt/ChangeLog
r86584 r86664 1 2011-05-17 Young Han Lee <joybro@company100.net> 2 3 Reviewed by Csaba Osztrogonác. 4 5 [Texmap][Qt] Enable strict PassOwnPtr for Qt with texmap enabled. 6 https://bugs.webkit.org/show_bug.cgi?id=60947 7 8 * WebCoreSupport/PageClientQt.cpp: 9 (WebCore::PageClientQWidget::setRootGraphicsLayer): 10 1 11 2011-05-16 Jon Lee <jonlee@apple.com> 2 12 -
trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp
r86582 r86664 77 77 if (layer) { 78 78 textureMapperNodeClient = adoptPtr(new TextureMapperNodeClientQt(page->mainFrame(), layer)); 79 textureMapperNodeClient->setTextureMapper( new TextureMapperQt);79 textureMapperNodeClient->setTextureMapper(adoptPtr(new TextureMapperQt)); 80 80 textureMapperNodeClient->syncRootLayer(); 81 81 return;
Note:
See TracChangeset
for help on using the changeset viewer.