Changeset 91190 in webkit

Timestamp:

Jul 18, 2011 9:54:03 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[REGRESSION] Value 'none' breaks multiple background-image display
​https://bugs.webkit.org/show_bug.cgi?id=59274

Patch by Mihnea Ovidenie <​mihnea@adobe.com> on 2011-07-18
Reviewed by Simon Fraser.

When taking fast path for simple color background, we should draw
the background only if it is the last in the list of backgrounds.
Otherwise, it will obscure the previously drawn backgrounds.

Source/WebCore:

Test: fast/backgrounds/background-fast-path-simple-color.html

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paintFillLayerExtended):

LayoutTests:

• fast/backgrounds/background-fast-path-simple-color-expected.png: Added.
• fast/backgrounds/background-fast-path-simple-color-expected.txt: Added.
• fast/backgrounds/background-fast-path-simple-color.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/backgrounds/background-fast-path-simple-color-expected.png (added)
• LayoutTests/fast/backgrounds/background-fast-path-simple-color-expected.txt (added)
• LayoutTests/fast/backgrounds/background-fast-path-simple-color.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-18  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [REGRESSION] Value 'none' breaks multiple background-image display
+        https://bugs.webkit.org/show_bug.cgi?id=59274
+
+        Reviewed by Simon Fraser.
+
+        When taking fast path for simple color background, we should draw
+        the background only if it is the last in the list of backgrounds.
+        Otherwise, it will obscure the previously drawn backgrounds.
+
+        * fast/backgrounds/background-fast-path-simple-color-expected.png: Added.
+        * fast/backgrounds/background-fast-path-simple-color-expected.txt: Added.
+        * fast/backgrounds/background-fast-path-simple-color.html: Added.
+
 2011-07-18  Yi Shen  <yi.4.shen@nokia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-18  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [REGRESSION] Value 'none' breaks multiple background-image display
+        https://bugs.webkit.org/show_bug.cgi?id=59274
+
+        Reviewed by Simon Fraser.
+
+        When taking fast path for simple color background, we should draw
+        the background only if it is the last in the list of backgrounds.
+        Otherwise, it will obscure the previously drawn backgrounds.
+
+        Test: fast/backgrounds/background-fast-path-simple-color.html
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+
 2011-07-18  Yi Shen  <yi.4.shen@nokia.com>
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -627 +627 @@
     
     // Fast path for drawing simple color backgrounds.
-    if (!isRoot && !clippedWithLocalScrolling && !shouldPaintBackgroundImage && isBorderFill) {
+    if (!isRoot && !clippedWithLocalScrolling && !shouldPaintBackgroundImage && isBorderFill && !bgLayer->next()) {
         if (!colorVisible)
             return;