Changeset 63653 in webkit

Timestamp:

Jul 19, 2010 7:06:01 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-07-19 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

CSS3 background: Number of layers should be determined by background-image element count
​https://bugs.webkit.org/show_bug.cgi?id=41201

Manual test: css3-background-layer-count.html

Spec link:
​http://www.w3.org/TR/css3-background/#layering

• manual-tests/css3-background-layer-count.html: Added.
• rendering/style/FillLayer.cpp: (WebCore::FillLayer::fillUnsetProperties): Don't repeat image properties, they determine the total number of layers. (WebCore::FillLayer::cullEmptyLayers): Change culling logic to discard all layers after the first one without an image set.
• rendering/style/RenderStyle.h: (WebCore::InheritedFlags::adjustBackgroundLayers): Call fillUnsetProperties() before cullEmptyLayers() (WebCore::InheritedFlags::adjustMaskLayers): Ditto.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-19  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        CSS3 background: Number of layers should be determined by background-image element count
+        https://bugs.webkit.org/show_bug.cgi?id=41201
+
+        Manual test: css3-background-layer-count.html
+
+        Spec link:
+        http://www.w3.org/TR/css3-background/#layering
+
+        * manual-tests/css3-background-layer-count.html: Added.
+        * rendering/style/FillLayer.cpp:
+        (WebCore::FillLayer::fillUnsetProperties): Don't repeat
+        image properties, they determine the total number of layers.
+        (WebCore::FillLayer::cullEmptyLayers): Change culling logic
+        to discard all layers after the first one without an image set.
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::adjustBackgroundLayers): Call
+        fillUnsetProperties() before cullEmptyLayers()
+        (WebCore::InheritedFlags::adjustMaskLayers): Ditto.
+
 2010-07-19  Andreas Kling  <andreas.kling@nokia.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) {
@@ -244 +233 @@
 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 && !next->isImageSet() &&
-            !next->isXPositionSet() && !next->isYPositionSet() &&
-            !next->isAttachmentSet() && !next->isClipSet() &&
-            !next->isCompositeSet() && !next->isOriginSet() &&
-            !next->isRepeatXSet() && !next->isRepeatYSet()
-            && !next->isSizeSet()) {
+        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) {
             delete next;
             p->m_next = 0;

trunk/WebCore/rendering/style/RenderStyle.h

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