Changeset 149918 in webkit

Timestamp:

May 10, 2013 5:59:25 PM (11 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r145680): No box shadow rendered on element with positioned child that obscures it
​https://bugs.webkit.org/show_bug.cgi?id=115840

Source/WebCore:

Reviewed by Antti Koivisto.

In r107836, we moved some box-shadow painting into the paintFillLayer code for performance.
However, in r145680 we started to skip background painting when we know the background is
obscured. This broke shadow painting in some cases.

Fix by always painting the background fill layers if we know that they will also
paint the shadow.

Test: fast/box-shadow/box-shadow-obscured-backgrounds.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::paintBackground):

LayoutTests:

Reviewed by Antti Koivisto.

• fast/box-shadow/box-shadow-obscured-backgrounds-expected.html: Added.
• fast/box-shadow/box-shadow-obscured-backgrounds.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/box-shadow/box-shadow-obscured-backgrounds-expected.html (added)
• LayoutTests/fast/box-shadow/box-shadow-obscured-backgrounds.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-10  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r145680): No box shadow rendered on element with positioned child that obscures it
+        https://bugs.webkit.org/show_bug.cgi?id=115840
+
+        Reviewed by Antti Koivisto.
+
+        * fast/box-shadow/box-shadow-obscured-backgrounds-expected.html: Added.
+        * fast/box-shadow/box-shadow-obscured-backgrounds.html: Added.
+
 2013-05-10  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-10  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r145680): No box shadow rendered on element with positioned child that obscures it
+        https://bugs.webkit.org/show_bug.cgi?id=115840
+
+        Reviewed by Antti Koivisto.
+        
+        In r107836, we moved some box-shadow painting into the paintFillLayer code for performance.
+        However, in r145680 we started to skip background painting when we know the background is
+        obscured. This broke shadow painting in some cases.
+        
+        Fix by always painting the background fill layers if we know that they will also
+        paint the shadow.
+
+        Test: fast/box-shadow/box-shadow-obscured-backgrounds.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintBackground):
+
 2013-05-10  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1141 +1141 @@
     if (isBody() && skipBodyBackground(this))
         return;
-    if (backgroundIsKnownToBeObscured())
+    if (backgroundIsKnownToBeObscured() && !boxShadowShouldBeAppliedToBackground(bleedAvoidance))
         return;
     paintFillLayers(paintInfo, style()->visitedDependentColor(CSSPropertyBackgroundColor), style()->backgroundLayers(), paintRect, bleedAvoidance);