Changeset 147303 in webkit

Timestamp:

Mar 31, 2013 10:54:13 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Gradient background does not get repainted when child box is expanded.
​https://bugs.webkit.org/show_bug.cgi?id=113644

Source/WebCore:

Patch by Zalan Bujtas <Alan Bujtas> on 2013-03-31
Reviewed by Antti Koivisto.

The initial value for background-size is SizeNone and remains, unless it is
set explicitly. However, when the background shorthand is used,
the size property defaults to SizeLength. The repaint
logic in mustRepaintFillLayers expects to have this value set correctly.

Test: fast/repaint/background-shorthand-with-gradient-and-height-changes.html

• rendering/RenderObject.cpp:

(WebCore::mustRepaintFillLayers): code cleanup. no functionality change.

• rendering/style/FillLayer.cpp:

(WebCore::FillLayer::FillLayer):

• rendering/style/FillLayer.h: use SizeNone as initial value.

(WebCore::FillLayer::initialFillSizeType):
(WebCore::FillLayer::initialFillSize):

LayoutTests:

Patch by Zalan Bujtas <Alan Bujtas> on 2013-03-31
Reviewed by Antti Koivisto.

• fast/repaint/background-shorthand-with-gradient-and-height-changes-expected.txt: Added.
• fast/repaint/background-shorthand-with-gradient-and-height-changes.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/background-shorthand-with-gradient-and-height-changes-expected.txt (added)
• LayoutTests/fast/repaint/background-shorthand-with-gradient-and-height-changes.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/FillLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/FillLayer.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-31  Zalan Bujtas  <zalan@apple.com>
+
+        Gradient background does not get repainted when child box is expanded.
+        https://bugs.webkit.org/show_bug.cgi?id=113644
+
+        Reviewed by Antti Koivisto.
+
+        * fast/repaint/background-shorthand-with-gradient-and-height-changes-expected.txt: Added.
+        * fast/repaint/background-shorthand-with-gradient-and-height-changes.html: Added.
+
 2013-03-31  Shinya Kawanaka  <shinyak@chromium.org> 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-31  Zalan Bujtas  <zalan@apple.com>
+
+        Gradient background does not get repainted when child box is expanded.
+        https://bugs.webkit.org/show_bug.cgi?id=113644
+
+        Reviewed by Antti Koivisto.
+        
+        The initial value for background-size is SizeNone and remains, unless it is
+        set explicitly. However, when the background shorthand is used,
+        the size property defaults to SizeLength. The repaint
+        logic in mustRepaintFillLayers expects to have this value set correctly.
+
+        Test: fast/repaint/background-shorthand-with-gradient-and-height-changes.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::mustRepaintFillLayers): code cleanup. no functionality change.
+        * rendering/style/FillLayer.cpp:
+        (WebCore::FillLayer::FillLayer):
+        * rendering/style/FillLayer.h:    use SizeNone as initial value.
+        (WebCore::FillLayer::initialFillSizeType):
+        (WebCore::FillLayer::initialFillSize):
+
 2013-03-31  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -830 +830 @@
         return true;
 
-    if (layer->size().type == SizeLength) {
-        if (layer->size().size.width().isPercent() || layer->size().size.height().isPercent())
+    EFillSizeType sizeType = layer->sizeType();
+
+    if (sizeType == Contain || sizeType == Cover)
+        return true;
+    
+    if (sizeType == SizeLength) {
+        if (layer->sizeLength().width().isPercent() || layer->sizeLength().height().isPercent())
             return true;
-    } else if (layer->size().type == Contain || layer->size().type == Cover || img->usesImageContainerSize())
+    } else if (img->usesImageContainerSize())
         return true;
 

trunk/Source/WebCore/rendering/style/FillLayer.cpp

@@ -53 +53 @@
     , m_repeatY(FillLayer::initialFillRepeatY(type))
     , m_composite(FillLayer::initialFillComposite(type))
-    , m_sizeType(SizeNone)
+    , m_sizeType(FillLayer::initialFillSizeType(type))
     , m_blendMode(FillLayer::initialFillBlendMode(type))
     , m_imageSet(false)

trunk/Source/WebCore/rendering/style/FillLayer.h

@@ -179 +179 @@
     static CompositeOperator initialFillComposite(EFillLayerType) { return CompositeSourceOver; }
     static BlendMode initialFillBlendMode(EFillLayerType) { return BlendModeNormal; }
-    static EFillSizeType initialFillSizeType(EFillLayerType) { return SizeLength; }
+    static EFillSizeType initialFillSizeType(EFillLayerType) { return SizeNone; }
     static LengthSize initialFillSizeLength(EFillLayerType) { return LengthSize(); }
-    static FillSize initialFillSize(EFillLayerType) { return FillSize(); }
+    static FillSize initialFillSize(EFillLayerType type) { return FillSize(initialFillSizeType(type), initialFillSizeLength(type)); }
     static Length initialFillXPosition(EFillLayerType) { return Length(0.0, Percent); }
     static Length initialFillYPosition(EFillLayerType) { return Length(0.0, Percent); }