Commit ffe28bf6 authored by mitz@apple.com's avatar mitz@apple.com

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.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@47749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 697b2ef0
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>
Reviewed by Darin Fisher.
......@@ -542,7 +542,6 @@ IntSize RenderBoxModelObject::calculateFillTileSize(const FillLayer* fillLayer,
return IntSize(max<int>(1, imageIntrinsicSize.width() * scaleFactor), max<int>(1, imageIntrinsicSize.height() * scaleFactor));
}
case SizeNone:
ASSERT_NOT_REACHED();
break;
}
return image->imageSize(this, style()->effectiveZoom());
......
......@@ -33,7 +33,7 @@ FillLayer::FillLayer(EFillLayerType type)
, m_origin(FillLayer::initialFillOrigin(type))
, 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)
, m_attachmentSet(false)
......
......@@ -36,11 +36,10 @@ namespace WebCore {
struct FillSize {
FillSize()
: type(SizeLength)
{
type = SizeLength;
size = LengthSize();
}
FillSize(EFillSizeType t, LengthSize l)
: type(t)
, size(l)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment