Changeset 47749 in webkit

Timestamp:

Aug 25, 2009, 10:09:31 AM (16 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r47630): fast/repaint/background-generated.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=28704

Reviewed by Anders Carlsson.

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::calculateFillTileSize): Handle SizeNone.

• rendering/style/FillLayer.cpp:

(WebCore::FillLayer::FillLayer): Initialize the size type to SizeNone.

• rendering/style/FillLayer.h:

(WebCore::FillSize::FillSize): Changed assignment to initialization and

removed redundant assignment to size.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/style/FillLayer.cpp (modified) (1 diff)
• rendering/style/FillLayer.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-25  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        REGRESSION (r47630): fast/repaint/background-generated.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=28704
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::calculateFillTileSize): Handle SizeNone.
+        * rendering/style/FillLayer.cpp:
+        (WebCore::FillLayer::FillLayer): Initialize the size type to SizeNone.
+        * rendering/style/FillLayer.h:
+        (WebCore::FillSize::FillSize): Changed assignment to initialization and
+            removed redundant assignment to size.
+
 2009-08-25  Yusuke Sato  <yusukes@chromium.org>
 

trunk/WebCore/rendering/RenderBoxModelObject.cpp

@@ -543 +543 @@
         }
         case SizeNone:
-            ASSERT_NOT_REACHED();
             break;
     }

trunk/WebCore/rendering/style/FillLayer.cpp

@@ -34 +34 @@
     , m_repeat(FillLayer::initialFillRepeat(type))
     , m_composite(FillLayer::initialFillComposite(type))
-    , m_sizeType(FillLayer::initialFillSizeType(type))
+    , m_sizeType(SizeNone)
     , m_sizeLength(FillLayer::initialFillSizeLength(type))
     , m_imageSet(false)

trunk/WebCore/rendering/style/FillLayer.h

@@ -37 +37 @@
 struct FillSize {
     FillSize()
+        : type(SizeLength)
     {
-        type = SizeLength;
-        size = LengthSize();
     }
-    
+
     FillSize(EFillSizeType t, LengthSize l)
         : type(t)