Changeset 63213 in webkit

Timestamp:

Jul 13, 2010 9:37:53 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-07-13 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r63192.
​http://trac.webkit.org/changeset/63192
​https://bugs.webkit.org/show_bug.cgi?id=42173

Broke fast/backgrounds/size/contain-and-cover.html (Requested
by kling on #webkit).

• manual-tests/css3-background-layer-count.html: Removed.
• rendering/style/FillLayer.cpp: (WebCore::FillLayer::cullEmptyLayers):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/css3-background-layer-count.html (deleted)
• rendering/style/FillLayer.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-13  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r63192.
+        http://trac.webkit.org/changeset/63192
+        https://bugs.webkit.org/show_bug.cgi?id=42173
+
+        Broke fast/backgrounds/size/contain-and-cover.html (Requested
+        by kling on #webkit).
+
+        * manual-tests/css3-background-layer-count.html: Removed.
+        * rendering/style/FillLayer.cpp:
+        (WebCore::FillLayer::cullEmptyLayers):
+
 2010-07-13  Marcus Bulach  <bulach@chromium.org>
 

trunk/WebCore/rendering/style/FillLayer.cpp

@@ -244 +244 @@
 void FillLayer::cullEmptyLayers()
 {
-    // CSS3 background layering: the number of background layers is determined
-    // by the number of values in the 'background-image' property.
-    // http://www.w3.org/TR/css3-background/#layering
-
     FillLayer* next;
     for (FillLayer* p = this; p; p = next) {
         next = p->m_next;
-        if (!next)
-            break;
-
-        bool anyAttributeSet = next->isXPositionSet()
-            || next->isYPositionSet()
-            || next->isAttachmentSet()
-            || next->isClipSet()
-            || next->isCompositeSet()
-            || next->isOriginSet()
-            || next->isRepeatXSet()
-            || next->isRepeatYSet()
-            || next->isSizeSet();
-
-        if (!next->isImageSet() || !anyAttributeSet) {
+        if (next && !next->isImageSet() &&
+            !next->isXPositionSet() && !next->isYPositionSet() &&
+            !next->isAttachmentSet() && !next->isClipSet() &&
+            !next->isCompositeSet() && !next->isOriginSet() &&
+            !next->isRepeatXSet() && !next->isRepeatYSet()
+            && !next->isSizeSet()) {
             delete next;
             p->m_next = 0;