Changeset 86269 in webkit

Timestamp:

May 11, 2011 2:17:50 PM (13 years ago)

Author:

noam.rosenthal@nokia.com

Message:

2011-05-11 Noam Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
​https://bugs.webkit.org/show_bug.cgi?id=60439

Patch 5/12: Implement the new TextureMapper functions for the Qt backend.
This allow non-rectangular clipping, some stub functions, and getting a unique
id for an image.

No new tests. Tests in LayoutTests/compositing cover this.

• platform/graphics/qt/TextureMapperQt.cpp: (WebCore::TextureMapperQt::beginClip): (WebCore::TextureMapperQt::endClip): (WebCore::TextureMapperQt::viewportSize): (WebCore::TextureMapperQt::setGraphicsContext): (WebCore::TextureMapperQt::graphicsContext): (WebCore::TextureMapperQt::drawTexture): (WebCore::TextureMapperQt::beginPainting): (WebCore::TextureMapperQt::endPainting): (WebCore::RGBA32PremultimpliedBufferQt::beginPaint): (WebCore::uidForImage):
• platform/graphics/qt/TextureMapperQt.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/TextureMapperQt.cpp (modified) (7 diffs)
• platform/graphics/qt/TextureMapperQt.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ -3 +3 @@
         Reviewed by Kenneth Rohde Christiansen.
 
-
         [Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
+        https://bugs.webkit.org/show_bug.cgi?id=60439
+
+        Patch 5/12: Implement the new TextureMapper functions for the Qt backend.
+        This allow non-rectangular clipping, some stub functions, and getting a unique
+        id for an image.
+
+        No new tests. Tests in LayoutTests/compositing cover this.
+
+        * platform/graphics/qt/TextureMapperQt.cpp:
+        (WebCore::TextureMapperQt::beginClip):
+        (WebCore::TextureMapperQt::endClip):
+        (WebCore::TextureMapperQt::viewportSize):
+        (WebCore::TextureMapperQt::setGraphicsContext):
+        (WebCore::TextureMapperQt::graphicsContext):
+        (WebCore::TextureMapperQt::drawTexture):
+        (WebCore::TextureMapperQt::beginPainting):
+        (WebCore::TextureMapperQt::endPainting):
+        (WebCore::RGBA32PremultimpliedBufferQt::beginPaint):
+        (WebCore::uidForImage):
+        * platform/graphics/qt/TextureMapperQt.h:
+
+2011-05-11  Noam Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Texmap] Upstream texture-mapper changes from Qt's WebKit2 branch
         https://bugs.webkit.org/show_bug.cgi?id=60439
 

trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.cpp

@@ -99 +99 @@
 }
 
-void TextureMapperQt::setClip(const IntRect& rect)
-{
-     QPainter* painter = m_currentSurface ? &m_currentSurface->m_painter : m_painter;
+void TextureMapperQt::beginClip(const TransformationMatrix& matrix, const FloatRect& rect)
+{
+     QPainter* painter = currentPainter();
+     painter->save();
+     QTransform prevTransform = painter->transform();
+     painter->setTransform(matrix, false);
      painter->setClipRect(rect);
-}
+     painter->setTransform(prevTransform, false);
+}
+
+void TextureMapperQt::endClip()
+{
+    currentPainter()->restore();
+}
+
+IntSize TextureMapperQt::viewportSize() const
+{
+    return IntSize(m_painter->device()->width(), m_painter->device()->height());
+}
+
 
 TextureMapperQt::TextureMapperQt()
@@ -112 +127 @@
 void TextureMapperQt::setGraphicsContext(GraphicsContext* context)
 {
+    m_context = context;
     m_painter = context->platformContext();
     initialize(m_painter);
+}
+
+GraphicsContext* TextureMapperQt::graphicsContext()
+{
+    return m_context;
 }
 
@@ -133 +154 @@
 
 
-void TextureMapperQt::drawTexture(const BitmapTexture& texture, const IntRect& targetRect, const TransformationMatrix& matrix, float opacity, const BitmapTexture* maskTexture)
+void TextureMapperQt::drawTexture(const BitmapTexture& texture, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, const BitmapTexture* maskTexture)
 {
     const BitmapTextureQt& textureQt = static_cast<const BitmapTextureQt&>(texture);
@@ -158 +179 @@
     painter->setOpacity(opacity);
     painter->setTransform(matrix, true);
-    painter->drawPixmap(targetRect, pixmap, textureQt.sourceRect());
+    painter->drawPixmap(targetRect, pixmap, FloatRect(textureQt.sourceRect()));
     painter->setTransform(prevTransform);
     painter->setOpacity(prevOpacity);
@@ -181 +202 @@
 {
 
+}
+
+void TextureMapperQt::beginPainting()
+{
+    m_painter->save();
+}
+
+void TextureMapperQt::endPainting()
+{
+    m_painter->restore();
 }
 
@@ -189 +220 @@
     {
         // m_image is only using during paint, it's safe to override it.
-        m_image = QImage(rect.size().width(), rect.size().height(), QImage::Format_ARGB32_Premultiplied);
+        m_image = QImage(rect.size().width(), rect.size().height(), opaque ? QImage::Format_RGB32 : QImage::Format_ARGB32_Premultiplied);
         if (!opaque)
             m_image.fill(0);
@@ -211 +242 @@
 }
 
+uint64_t uidForImage(Image* image)
+{
+    return image->nativeImageForCurrentFrame()->serialNumber();
+}
 #endif
 };

trunk/Source/WebCore/platform/graphics/qt/TextureMapperQt.h

@@ -43 +43 @@
     virtual bool isPacked() const { return m_isPacked; }
 
+    QPainter* painter() { return &m_painter; }
+
 private:
     QPainter m_painter;
@@ -54 +56 @@
     TextureMapperQt();
 
-    virtual void drawTexture(const BitmapTexture& texture, const IntRect& targetRect, const TransformationMatrix& matrix, float opacity, const BitmapTexture* maskTexture);
+    virtual void drawTexture(const BitmapTexture&, const FloatRect& targetRect, const TransformationMatrix&, float opacity, const BitmapTexture* maskTexture);
     virtual void bindSurface(BitmapTexture* surface);
-    virtual void setClip(const IntRect&);
+    virtual void beginClip(const TransformationMatrix&, const FloatRect&);
+    virtual void endClip();
     virtual void setGraphicsContext(GraphicsContext*);
+    virtual GraphicsContext* graphicsContext();
     virtual bool allowSurfaceForRoot() const { return false; }
     virtual PassRefPtr<BitmapTexture> createTexture();
+    virtual IntSize viewportSize() const;
+    virtual void beginPainting();
+    virtual void endPainting();
 
     static void initialize(QPainter* painter)
@@ -67 +74 @@
 
     static PassOwnPtr<TextureMapper> create() { return new TextureMapperQt; }
+private:
+    inline QPainter* currentPainter() { return m_currentSurface ? m_currentSurface->painter() : m_painter; }
 
-private:
     QPainter* m_painter;
+    GraphicsContext* m_context;
     RefPtr<BitmapTextureQt> m_currentSurface;
 };