Changeset 106415 in webkit

Timestamp:

Jan 31, 2012 5:21:32 PM (12 years ago)

Author:

mdelaney@apple.com

Message:

Failing 2d.shadow.enable.off.2.html on Lion
​https://bugs.webkit.org/show_bug.cgi?id=77489

Reviewed by Dan Bernstein.

Source/WebCore:

The canvas spec requires that shadows not be drawn under certain
circumstances outlined here: ​http://www.whatwg.org/specs/web-apps/current-work/#shadows
This patch adds in those checks which allows us to pass now (on Lion)
the philip canvas test that was checking that constraint.

No new tests. Unskipping the test on Lion that this patch fixes.

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::setAllAttributesToDefault):
(WebCore::CanvasRenderingContext2D::setShadow):
(WebCore::CanvasRenderingContext2D::applyShadow):
(WebCore::CanvasRenderingContext2D::shouldDrawShadows):

• html/canvas/CanvasRenderingContext2D.h:

(CanvasRenderingContext2D):

LayoutTests:

• platform/mac-lion/Skipped: We can unskip this test now that this patch has us passing this test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-lion/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (7 diffs)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-31  Matthew Delaney  <mdelaney@apple.com>
+
+        Failing 2d.shadow.enable.off.2.html on Lion
+        https://bugs.webkit.org/show_bug.cgi?id=77489
+
+        Reviewed by Dan Bernstein.
+
+        * platform/mac-lion/Skipped: We can unskip this test now that this patch has us passing this test.
+
 2012-01-31  Oliver Hunt  <oliver@apple.com>
 

trunk/LayoutTests/platform/mac-lion/Skipped

@@ -1 +1 @@
 # --- Canvas ---
-
-# <rdar://problem/9121810>
-canvas/philip/tests/2d.shadow.enable.off.2.html
 
 # This test incorrectly checks the shadow blur's distance and needs to be fixed

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-31  Matthew Delaney  <mdelaney@apple.com>
+
+        Failing 2d.shadow.enable.off.2.html on Lion
+        https://bugs.webkit.org/show_bug.cgi?id=77489
+
+        Reviewed by Dan Bernstein.
+
+        The canvas spec requires that shadows not be drawn under certain
+        circumstances outlined here: http://www.whatwg.org/specs/web-apps/current-work/#shadows
+        This patch adds in those checks which allows us to pass now (on Lion)
+        the philip canvas test that was checking that constraint.
+
+        No new tests. Unskipping the test on Lion that this patch fixes.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::setAllAttributesToDefault):
+        (WebCore::CanvasRenderingContext2D::setShadow):
+        (WebCore::CanvasRenderingContext2D::applyShadow):
+        (WebCore::CanvasRenderingContext2D::shouldDrawShadows):
+        * html/canvas/CanvasRenderingContext2D.h:
+        (CanvasRenderingContext2D):
+
 2012-01-31  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -316 +316 @@
         return;
 
-    context->setLegacyShadow(FloatSize(), 0, Color::transparent, ColorSpaceDeviceRGB);
+    applyShadow();
     context->setAlpha(1);
     context->setCompositeOperation(CompositeSourceOver);
@@ -1151 +1151 @@
         return;
 
-    c->setLegacyShadow(FloatSize(width, -height), state().m_shadowBlur, state().m_shadowColor, ColorSpaceDeviceRGB);
+    applyShadow();
 }
 
@@ -1169 +1169 @@
         return;
 
-    c->setLegacyShadow(FloatSize(width, -height), state().m_shadowBlur, state().m_shadowColor, ColorSpaceDeviceRGB);
+    applyShadow();
 }
 
@@ -1182 +1182 @@
         return;
 
-    c->setLegacyShadow(FloatSize(width, -height), state().m_shadowBlur, state().m_shadowColor, ColorSpaceDeviceRGB);
+    applyShadow();
 }
 
@@ -1195 +1195 @@
         return;
 
-    c->setLegacyShadow(FloatSize(width, -height), state().m_shadowBlur, state().m_shadowColor, ColorSpaceDeviceRGB);
+    applyShadow();
 }
 
@@ -1215 +1215 @@
     CGColorRelease(shadowColor);
 #else
-    dc->setLegacyShadow(FloatSize(width, -height), blur, state().m_shadowColor, ColorSpaceDeviceRGB);
+    applyShadow();
 #endif
 }
@@ -1233 +1233 @@
         return;
 
-    float width = state().m_shadowOffset.width();
-    float height = state().m_shadowOffset.height();
-    c->setLegacyShadow(FloatSize(width, -height), state().m_shadowBlur, state().m_shadowColor, ColorSpaceDeviceRGB);
+    if (shouldDrawShadows()) {
+        float width = state().m_shadowOffset.width();
+        float height = state().m_shadowOffset.height();
+        c->setLegacyShadow(FloatSize(width, -height), state().m_shadowBlur, state().m_shadowColor, ColorSpaceDeviceRGB);
+    } else
+        c->setLegacyShadow(FloatSize(), 0, Color::transparent, ColorSpaceDeviceRGB);
+}
+
+bool CanvasRenderingContext2D::shouldDrawShadows() const
+{
+    return alphaChannel(state().m_shadowColor) && (state().m_shadowBlur || !state().m_shadowOffset.isZero());
 }
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h

@@ -279 +279 @@
 
     void applyShadow();
+    bool shouldDrawShadows() const;
 
     void didDraw(const FloatRect&, unsigned options = CanvasDidDrawApplyAll);