Changeset 121314 in webkit

Timestamp:

Jun 26, 2012, 8:02:48 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r107836): box shadow not drawn for opaque images with an opaque background
​https://bugs.webkit.org/show_bug.cgi?id=89958

Patch by Douglas Stockwell <​dstockwell@chromium.org> on 2012-06-26
Reviewed by Simon Fraser.

Source/WebCore:

Don't attempt to draw the box shadow as part of the background if the background is
obscured.

Test: fast/box-shadow/image-box-shadow.html

• rendering/RenderImage.cpp:

(WebCore::RenderImage::boxShadowShouldBeAppliedToBackground):
(WebCore):

• rendering/RenderImage.h:

(RenderImage):

LayoutTests:

• fast/box-shadow/image-box-shadow-expected.html: Added.
• fast/box-shadow/image-box-shadow.html: Added.
• fast/box-shadow/resources/green-alpha.png: Added.
• fast/box-shadow/resources/green.jpg: Added.
• fast/box-shadow/resources/green.png: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/box-shadow/image-box-shadow-expected.html (added)
• LayoutTests/fast/box-shadow/image-box-shadow.html (added)
• LayoutTests/fast/box-shadow/resources/green-alpha.png (added)
• LayoutTests/fast/box-shadow/resources/green.jpg (added)
• LayoutTests/fast/box-shadow/resources/green.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderImage.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderImage.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-26  Douglas Stockwell  <dstockwell@chromium.org>
+
+        REGRESSION(r107836): box shadow not drawn for opaque images with an opaque background
+        https://bugs.webkit.org/show_bug.cgi?id=89958
+
+        Reviewed by Simon Fraser.
+
+        * fast/box-shadow/image-box-shadow-expected.html: Added.
+        * fast/box-shadow/image-box-shadow.html: Added.
+        * fast/box-shadow/resources/green-alpha.png: Added.
+        * fast/box-shadow/resources/green.jpg: Added.
+        * fast/box-shadow/resources/green.png: Added.
+
 2012-06-26  Kulanthaivel Palanichamy  <kulanthaivel@codeaurora.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-26  Douglas Stockwell  <dstockwell@chromium.org>
+
+        REGRESSION(r107836): box shadow not drawn for opaque images with an opaque background
+        https://bugs.webkit.org/show_bug.cgi?id=89958
+
+        Reviewed by Simon Fraser.
+
+        Don't attempt to draw the box shadow as part of the background if the background is
+        obscured.
+
+        Test: fast/box-shadow/image-box-shadow.html
+
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::boxShadowShouldBeAppliedToBackground):
+        (WebCore):
+        * rendering/RenderImage.h:
+        (RenderImage):
+
 2012-06-26  Nico Weber  <thakis@chromium.org>
 

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -454 +454 @@
 }
 
+bool RenderImage::boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance bleedAvoidance, InlineFlowBox*) const
+{
+    if (!RenderBoxModelObject::boxShadowShouldBeAppliedToBackground(bleedAvoidance))
+        return false;
+
+    return !backgroundIsObscured();
+}
+
 bool RenderImage::backgroundIsObscured() const
 {

trunk/Source/WebCore/rendering/RenderImage.h

@@ -92 +92 @@
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE;
 
+    virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const OVERRIDE;
+
     IntSize imageSizeForError(CachedImage*) const;
     void imageDimensionsChanged(bool imageSizeChanged, const IntRect* = 0);