Changeset 64810 in webkit

Timestamp:

Aug 5, 2010 6:54:40 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-05 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r63653.
​http://trac.webkit.org/changeset/63653
​https://bugs.webkit.org/show_bug.cgi?id=43592

regressed multiple background-images (Requested by smfr on
#webkit).

• manual-tests/css3-background-layer-count.html: Removed.
• rendering/style/FillLayer.cpp: (WebCore::FillLayer::fillUnsetProperties): (WebCore::FillLayer::cullEmptyLayers):
• rendering/style/RenderStyle.h: (WebCore::InheritedFlags::adjustBackgroundLayers): (WebCore::InheritedFlags::adjustMaskLayers):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r63653.
+        http://trac.webkit.org/changeset/63653
+        https://bugs.webkit.org/show_bug.cgi?id=43592
+
+        regressed multiple background-images (Requested by smfr on
+        #webkit).
+
+        * manual-tests/css3-background-layer-count.html: Removed.
+        * rendering/style/FillLayer.cpp:
+        (WebCore::FillLayer::fillUnsetProperties):
+        (WebCore::FillLayer::cullEmptyLayers):
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::adjustBackgroundLayers):
+        (WebCore::InheritedFlags::adjustMaskLayers):
+
 2010-08-05  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/rendering/style/FillLayer.cpp

@@ -130 +130 @@
 {
     FillLayer* curr;
+    for (curr = this; curr && curr->isImageSet(); curr = curr->next()) { }
+    if (curr && curr != this) {
+        // We need to fill in the remaining values with the pattern specified.
+        for (FillLayer* pattern = this; curr; curr = curr->next()) {
+            curr->m_image = pattern->m_image;
+            pattern = pattern->next();
+            if (pattern == curr || !pattern)
+                pattern = this;
+        }
+    }
+    
     for (curr = this; curr && curr->isXPositionSet(); curr = curr->next()) { }
     if (curr && curr != this) {
@@ -233 +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;

trunk/WebCore/rendering/style/RenderStyle.h

@@ -874 +874 @@
     {
         if (backgroundLayers()->next()) {
+            accessBackgroundLayers()->cullEmptyLayers();
             accessBackgroundLayers()->fillUnsetProperties();
-            accessBackgroundLayers()->cullEmptyLayers();
         }
     }
@@ -885 +885 @@
     {
         if (maskLayers()->next()) {
+            accessMaskLayers()->cullEmptyLayers();
             accessMaskLayers()->fillUnsetProperties();
-            accessMaskLayers()->cullEmptyLayers();
         }
     }