[webkit-changes] [86664] trunk/Source

Tue, 17 May 2011 02:47:03 -0700

Title: [86664] trunk/Source
Revision
86664
Author
[email protected]
Date
2011-05-17 02:46:54 -0700 (Tue, 17 May 2011)

Log Message

2011-05-17  Young Han Lee  <[email protected]>

        Reviewed by Csaba Osztrogonác.

        [Texmap][Qt] Enable strict PassOwnPtr for Qt with texmap enabled.
        https://bugs.webkit.org/show_bug.cgi?id=60947

        No new tests. Build fix.

        * platform/graphics/qt/TextureMapperQt.cpp:
        (WebCore::TextureMapper::create):
        * platform/graphics/qt/TextureMapperQt.h:
        (WebCore::TextureMapperQt::create):
        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
        (WebCore::GraphicsLayer::create):
2011-05-17  Young Han Lee  <[email protected]>

        Reviewed by Csaba Osztrogonác.

        [Texmap][Qt] Enable strict PassOwnPtr for Qt with texmap enabled.
        https://bugs.webkit.org/show_bug.cgi?id=60947

        * WebCoreSupport/PageClientQt.cpp:
        (WebCore::PageClientQWidget::setRootGraphicsLayer):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (86663 => 86664)


--- trunk/Source/WebCore/ChangeLog	2011-05-17 09:34:49 UTC (rev 86663)
+++ trunk/Source/WebCore/ChangeLog	2011-05-17 09:46:54 UTC (rev 86664)
@@ -1,3 +1,19 @@
+2011-05-17  Young Han Lee  <[email protected]>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Texmap][Qt] Enable strict PassOwnPtr for Qt with texmap enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=60947
+
+        No new tests. Build fix.
+
+        * platform/graphics/qt/TextureMapperQt.cpp:
+        (WebCore::TextureMapper::create):
+        * platform/graphics/qt/TextureMapperQt.h:
+        (WebCore::TextureMapperQt::create):
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayer::create):
+
 2011-05-17  Alexander Pavlov  <[email protected]>
 
         Reviewed by Yury Semikhatsky.

Modified: trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.cpp (86663 => 86664)


--- trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.cpp	2011-05-17 09:34:49 UTC (rev 86663)
+++ trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.cpp	2011-05-17 09:46:54 UTC (rev 86664)
@@ -187,9 +187,9 @@
 {
 #ifdef QT_OPENGL_LIB
     if (context && context->platformContext()->paintEngine()->type() == QPaintEngine::OpenGL2)
-        return new TextureMapperGL;
+        return adoptPtr(new TextureMapperGL);
 #endif
-    return new TextureMapperQt;
+    return adoptPtr(new TextureMapperQt);
 }
 
 PassRefPtr<BitmapTexture> TextureMapperQt::createTexture()

Modified: trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.h (86663 => 86664)


--- trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.h	2011-05-17 09:34:49 UTC (rev 86663)
+++ trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.h	2011-05-17 09:46:54 UTC (rev 86664)
@@ -72,7 +72,7 @@
         painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, false);
     }
 
-    static PassOwnPtr<TextureMapper> create() { return new TextureMapperQt; }
+    static PassOwnPtr<TextureMapper> create() { return adoptPtr(new TextureMapperQt); }
 private:
     inline QPainter* currentPainter() { return m_currentSurface ? m_currentSurface->painter() : m_painter; }

Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (86663 => 86664)


--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2011-05-17 09:34:49 UTC (rev 86663)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2011-05-17 09:46:54 UTC (rev 86664)
@@ -351,7 +351,7 @@
 
 PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
 {
-    return new GraphicsLayerTextureMapper(client);
+    return adoptPtr(new GraphicsLayerTextureMapper(client));
 }
 
 bool GraphicsLayerTextureMapper::addAnimation(const KeyframeValueList& valueList, const IntSize& boxSize, const Animation* anim, const String& keyframesName, double timeOffset)

Modified: trunk/Source/WebKit/qt/ChangeLog (86663 => 86664)


--- trunk/Source/WebKit/qt/ChangeLog	2011-05-17 09:34:49 UTC (rev 86663)
+++ trunk/Source/WebKit/qt/ChangeLog	2011-05-17 09:46:54 UTC (rev 86664)
@@ -1,3 +1,13 @@
+2011-05-17  Young Han Lee  <[email protected]>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Texmap][Qt] Enable strict PassOwnPtr for Qt with texmap enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=60947
+
+        * WebCoreSupport/PageClientQt.cpp:
+        (WebCore::PageClientQWidget::setRootGraphicsLayer):
+
 2011-05-16  Jon Lee  <[email protected]>
 
         Reviewed by Simon Fraser.

Modified: trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp (86663 => 86664)


--- trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp	2011-05-17 09:34:49 UTC (rev 86663)
+++ trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp	2011-05-17 09:46:54 UTC (rev 86664)
@@ -76,7 +76,7 @@
 {
     if (layer) {
         textureMapperNodeClient = adoptPtr(new TextureMapperNodeClientQt(page->mainFrame(), layer));
-        textureMapperNodeClient->setTextureMapper(new TextureMapperQt);
+        textureMapperNodeClient->setTextureMapper(adoptPtr(new TextureMapperQt));
         textureMapperNodeClient->syncRootLayer();
         return;
     }

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to