Changeset 109347 in webkit

Timestamp:

Mar 1, 2012 8:13:19 AM (12 years ago)

Author:

Simon Hausmann

Message:

[Qt] Fixed incorrect size pixmap creation for a new transparency layer.
​https://bugs.webkit.org/show_bug.cgi?id=79658

If QPainter does not have clipping, beginPlatformTransparencyLayer can create
wrong size pixmap, so it causes incorrect rendering.

Patch by Huang Dongsung <​luxtella@company100.net> on 2012-03-01
Reviewed by Simon Hausmann.

• platform/graphics/qt/GraphicsContextQt.cpp:

(WebCore::GraphicsContext::beginPlatformTransparencyLayer):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Huang Dongsung  <luxtella@company100.net>
+
+        [Qt] Fixed incorrect size pixmap creation for a new transparency layer.
+        https://bugs.webkit.org/show_bug.cgi?id=79658
+
+        If QPainter does not have clipping, beginPlatformTransparencyLayer can create
+        wrong size pixmap, so it causes incorrect rendering.
+
+        Reviewed by Simon Hausmann.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::beginPlatformTransparencyLayer):
+
 2012-03-01  Simon Hausmann  <simon.hausmann@nokia.com>
 

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

@@ -1069 +1069 @@
     h = device->height();
 
-    QRectF clip = m_data->clipBoundingRect();
-    QRectF deviceClip = p->transform().mapRect(clip);
-    x = int(qBound(qreal(0), deviceClip.x(), (qreal)w));
-    y = int(qBound(qreal(0), deviceClip.y(), (qreal)h));
-    w = int(qBound(qreal(0), deviceClip.width(), (qreal)w) + 2);
-    h = int(qBound(qreal(0), deviceClip.height(), (qreal)h) + 2);
+    if (p->hasClipping()) {
+        QRectF clip = m_data->clipBoundingRect();
+        QRectF deviceClip = p->transform().mapRect(clip);
+        x = int(qBound(qreal(0), deviceClip.x(), (qreal)w));
+        y = int(qBound(qreal(0), deviceClip.y(), (qreal)h));
+        w = int(qBound(qreal(0), deviceClip.width(), (qreal)w) + 2);
+        h = int(qBound(qreal(0), deviceClip.height(), (qreal)h) + 2);
+    }
 
     QPixmap emptyAlphaMask;