Changeset 73889 in webkit

Timestamp:

Dec 13, 2010 12:56:31 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-13 Helder Correia <​helder@sencha.com>

Reviewed by Eric Seidel.

[Qt] StillImage::draw() should use ContextShadow
​https://bugs.webkit.org/show_bug.cgi?id=50849

The branch that checks for a shadow requirement in StillImage::draw()
is executed when drawing a canvas onto a canvas with
ctx1.drawImage(canvas2, x, y). The current implementation supports
solid shadows only. And if transformations are present, the offset gets
transformed as well. Thus, ContextShadow must be used instead in order
to support blur and correct offset transformations.

• fast/canvas/canvas-draw-canvas-on-canvas-shadow-expected.txt: Added.
• fast/canvas/canvas-draw-canvas-on-canvas-shadow.html: Added.
• fast/canvas/script-tests/canvas-draw-canvas-on-canvas-shadow.js: Added.

2010-12-13 Helder Correia <​helder@sencha.com>

Reviewed by Eric Seidel.

[Qt] StillImage::draw() should use ContextShadow
​https://bugs.webkit.org/show_bug.cgi?id=50849

The branch that checks for a shadow requirement in StillImage::draw()
is executed when drawing a canvas onto a canvas with
ctx1.drawImage(canvas2, x, y). The current implementation supports
solid shadows only. And if transformations are present, the offset gets
transformed as well. Thus, ContextShadow must be used instead in order
to support blur and correct offset transformations.

Test: fast/canvas/canvas-draw-canvas-on-canvas-shadow.html

• platform/graphics/qt/StillImageQt.cpp: (WebCore::StillImage::draw):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-draw-canvas-on-canvas-shadow-expected.txt (added)
• LayoutTests/fast/canvas/canvas-draw-canvas-on-canvas-shadow.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-draw-canvas-on-canvas-shadow.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/StillImageQt.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-13  Helder Correia  <helder@sencha.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] StillImage::draw() should use ContextShadow
+        https://bugs.webkit.org/show_bug.cgi?id=50849
+
+        The branch that checks for a shadow requirement in StillImage::draw()
+        is executed when drawing a canvas onto a canvas with
+        ctx1.drawImage(canvas2, x, y). The current implementation supports
+        solid shadows only. And if transformations are present, the offset gets
+        transformed as well. Thus, ContextShadow must be used instead in order
+        to support blur and correct offset transformations.
+
+        * fast/canvas/canvas-draw-canvas-on-canvas-shadow-expected.txt: Added.
+        * fast/canvas/canvas-draw-canvas-on-canvas-shadow.html: Added.
+        * fast/canvas/script-tests/canvas-draw-canvas-on-canvas-shadow.js: Added.
+
 2010-10-28  MORITA Hajime  <morrita@google.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-13  Helder Correia  <helder@sencha.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] StillImage::draw() should use ContextShadow
+        https://bugs.webkit.org/show_bug.cgi?id=50849
+
+        The branch that checks for a shadow requirement in StillImage::draw()
+        is executed when drawing a canvas onto a canvas with
+        ctx1.drawImage(canvas2, x, y). The current implementation supports
+        solid shadows only. And if transformations are present, the offset gets
+        transformed as well. Thus, ContextShadow must be used instead in order
+        to support blur and correct offset transformations.
+
+        Test: fast/canvas/canvas-draw-canvas-on-canvas-shadow.html
+
+        * platform/graphics/qt/StillImageQt.cpp:
+        (WebCore::StillImage::draw):
+
 2010-12-12  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/platform/graphics/qt/StillImageQt.cpp

@@ -29 +29 @@
 #include "StillImageQt.h"
 
+#include "ContextShadow.h"
 #include "GraphicsContext.h"
 #include "IntSize.h"
@@ -68 +69 @@
         return;
 
-
     FloatRect normalizedSrc = src.normalized();
     FloatRect normalizedDst = dst.normalized();
@@ -77 +77 @@
     ctxt->setCompositeOperation(op);
 
-    FloatSize shadowOffset;
-    float shadowBlur;
-    Color shadowColor;
-    if (ctxt->getShadow(shadowOffset, shadowBlur, shadowColor)) {
-        FloatRect shadowImageRect(normalizedDst);
-        shadowImageRect.move(shadowOffset.width(), shadowOffset.height());
-
-        QImage shadowImage(QSize(static_cast<int>(normalizedSrc.width()), static_cast<int>(normalizedSrc.height())), QImage::Format_ARGB32_Premultiplied);
-        QPainter p(&shadowImage);
-        p.setCompositionMode(QPainter::CompositionMode_Source);
-        p.fillRect(shadowImage.rect(), shadowColor);
-        p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-        p.drawPixmap(QRect(0, 0, normalizedDst.width(), normalizedDst.height()), *m_pixmap, normalizedSrc);
-        p.end();
-        painter->drawImage(shadowImageRect, shadowImage, normalizedSrc);
+    ContextShadow* shadow = ctxt->contextShadow();
+    if (shadow->m_type != ContextShadow::NoShadow) {
+        QPainter* shadowPainter = shadow->beginShadowLayer(painter, normalizedDst);
+        if (shadowPainter) {
+            shadowPainter->setOpacity(static_cast<qreal>(shadow->m_color.alpha()) / 255);
+            shadowPainter->drawPixmap(normalizedDst, *m_pixmap, normalizedSrc);
+            shadow->endShadowLayer(painter);
+        }
     }