Changeset 90020 in webkit

Timestamp:

Jun 29, 2011 8:56:52 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-29 Igor Oliveira <​igor.oliveira@openbossa.org>

Reviewed by Andreas Kling.

[Qt] GraphicsContext::clipToImageBuffer does not support scale transformation
​https://bugs.webkit.org/show_bug.cgi?id=63555

Scale alphaMask if GraphicsContext is scaled

• platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::pushTransparencyLayerInternal):
• platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBuffer::clip):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsContextQt.cpp (modified) (1 diff)
• platform/graphics/qt/ImageBufferQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-29  Igor Oliveira  <igor.oliveira@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] GraphicsContext::clipToImageBuffer does not support scale transformation
+        https://bugs.webkit.org/show_bug.cgi?id=63555
+
+        Scale alphaMask if GraphicsContext is scaled
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::pushTransparencyLayerInternal):
+        * platform/graphics/qt/ImageBufferQt.cpp:
+        (WebCore::ImageBuffer::clip):
+
 2011-06-29  Andrey Kosyakov  <caseq@chromium.org>
 

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

@@ -951 +951 @@
 {
     QPainter* p = m_data->p();
-    m_data->layers.push(new TransparencyLayer(p, p->transform().mapRect(rect), 1.0, alphaMask));
+
+    QRect deviceClip = p->transform().mapRect(rect);
+    if (alphaMask.width() != deviceClip.width() || alphaMask.height() != deviceClip.height())
+        alphaMask = alphaMask.scaled(deviceClip.width(), deviceClip.height());
+
+    m_data->layers.push(new TransparencyLayer(p, deviceClip, 1.0, alphaMask));
 }
 

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

@@ -162 +162 @@
     IntRect rect = enclosingIntRect(floatRect);
     QPixmap alphaMask = *nativeImage;
-    if (alphaMask.width() != rect.width() || alphaMask.height() != rect.height())
-        alphaMask = alphaMask.scaled(rect.width(), rect.height());
 
     context->pushTransparencyLayerInternal(rect, 1.0, alphaMask);