Unreviewed, rolling out r98483.
authorjchaffraix@webkit.org <jchaffraix@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Oct 2011 18:58:59 +0000 (18:58 +0000)
committerjchaffraix@webkit.org <jchaffraix@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Oct 2011 18:58:59 +0000 (18:58 +0000)
http://trac.webkit.org/changeset/98483
https://bugs.webkit.org/show_bug.cgi?id=47156

Change is causing some crashes and ASSERTs.

Source/WebCore:

* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::lookupImageForSize):
(WebCore::CachedImage::lookupImageForRenderer):
(WebCore::CachedImage::lookupOrCreateImageForRenderer):
(WebCore::CachedImage::setContainerSizeForRenderer):
(WebCore::CachedImage::imageSizeForRenderer):
(WebCore::CachedImage::computeIntrinsicDimensions):
(WebCore::CachedImage::createImage):
* loader/cache/CachedImage.h:
* page/ChromeClient.h:
* rendering/ImageBySizeCache.cpp:
(WebCore::ImageBySizeCache::addClient):
(WebCore::ImageBySizeCache::removeClient):
(WebCore::ImageBySizeCache::imageForSize):
(WebCore::ImageBySizeCache::sizeForClient):
* rendering/ImageBySizeCache.h:
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::calculateFillTileSize):
(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
(WebCore::RenderBoxModelObject::paintNinePieceImage):
* rendering/RenderBoxModelObject.h:
* rendering/RenderImage.cpp:
(WebCore::RenderImage::RenderImage):
(WebCore::RenderImage::imageDimensionsChanged):
(WebCore::RenderImage::isLogicalWidthSpecified):
(WebCore::RenderImage::isLogicalHeightSpecified):
(WebCore::RenderImage::computeReplacedLogicalWidth):
(WebCore::RenderImage::computeReplacedLogicalHeight):
(WebCore::RenderImage::calcAspectRatioLogicalWidth):
(WebCore::RenderImage::calcAspectRatioLogicalHeight):
* rendering/RenderImage.h:
* rendering/RenderImageResource.cpp:
(WebCore::RenderImageResource::setContainerSizeForRenderer):
* rendering/RenderImageResourceStyleImage.cpp:
* rendering/RenderImageResourceStyleImage.h:
(WebCore::RenderImageResourceStyleImage::image):
(WebCore::RenderImageResourceStyleImage::setContainerSizeForRenderer):
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::computePreferredLogicalWidths):
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::computeIntrinsicLogicalWidth):
(WebCore::RenderReplaced::computeIntrinsicLogicalHeight):
(WebCore::RenderReplaced::computeReplacedLogicalWidth):
* rendering/style/StyleCachedImage.cpp:
(WebCore::StyleCachedImage::computeIntrinsicDimensions):
(WebCore::StyleCachedImage::setContainerSizeForRenderer):
(WebCore::StyleCachedImage::addClient):
(WebCore::StyleCachedImage::removeClient):
* rendering/style/StyleCachedImage.h:
* rendering/style/StyleGeneratedImage.h:
(WebCore::StyleGeneratedImage::setContainerSizeForRenderer):
* rendering/style/StyleImage.h:
* rendering/style/StylePendingImage.h:
(WebCore::StylePendingImage::setContainerSizeForRenderer):
* rendering/svg/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::layout):
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::computeIntrinsicWidth):
(WebCore::RenderSVGRoot::computeIntrinsicHeight):
(WebCore::RenderSVGRoot::computeReplacedLogicalWidth):
(WebCore::RenderSVGRoot::computeReplacedLogicalHeight):
(WebCore::RenderSVGRoot::layout):
(WebCore::RenderSVGRoot::paint):
(WebCore::RenderSVGRoot::calcViewport):
(WebCore::RenderSVGRoot::computeRectForRepaint):
* rendering/svg/RenderSVGRoot.h:
* svg/SVGLength.cpp:
(WebCore::SVGLength::determineViewport):
* svg/SVGSVGElement.cpp:
(WebCore::SVGSVGElement::SVGSVGElement):
(WebCore::SVGSVGElement::relativeWidthValue):
(WebCore::SVGSVGElement::relativeHeightValue):
(WebCore::SVGSVGElement::currentViewBoxRect):
* svg/SVGSVGElement.h:
(WebCore::SVGSVGElement::setContainerSize):
(WebCore::SVGSVGElement::containerSize):
(WebCore::SVGSVGElement::hasSetContainerSize):
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::setContainerSize):
(WebCore::SVGImage::usesContainerSize):
(WebCore::SVGImage::size):
(WebCore::SVGImage::hasRelativeWidth):
(WebCore::SVGImage::hasRelativeHeight):
(WebCore::SVGImage::draw):
(WebCore::SVGImage::computeIntrinsicDimensions):
(WebCore::SVGImage::dataChanged):
* svg/graphics/SVGImage.h:

LayoutTests:

* css2.1/20110323/background-intrinsic-001.htm: Removed.
* css2.1/20110323/background-intrinsic-002.htm: Removed.
* css2.1/20110323/background-intrinsic-003.htm: Removed.
* css2.1/20110323/background-intrinsic-004.htm: Removed.
* css2.1/20110323/background-intrinsic-005.htm: Removed.
* css2.1/20110323/background-intrinsic-006.htm: Removed.
* css2.1/20110323/background-intrinsic-007.htm: Removed.
* css2.1/20110323/background-intrinsic-008.htm: Removed.
* css2.1/20110323/background-intrinsic-009.htm: Removed.
* css2.1/20110323/resources/green-intrinsic-height-ratio.svg: Removed.
* css2.1/20110323/resources/green-intrinsic-height.svg: Removed.
* css2.1/20110323/resources/green-intrinsic-none.svg: Removed.
* css2.1/20110323/resources/green-intrinsic-ratio-landscape.svg: Removed.
* css2.1/20110323/resources/green-intrinsic-ratio-portrait.svg: Removed.
* css2.1/20110323/resources/green-intrinsic-width-height.svg: Removed.
* css2.1/20110323/resources/green-intrinsic-width-pc-height-pc.svg: Removed.
* css2.1/20110323/resources/green-intrinsic-width-ratio.svg: Removed.
* css2.1/20110323/resources/green-intrinsic-width.svg: Removed.
* css2.1/20110323/resources/red-intrinsic-height-ratio.svg: Removed.
* css2.1/20110323/resources/red-intrinsic-height.svg: Removed.
* css2.1/20110323/resources/red-intrinsic-none.svg: Removed.
* css2.1/20110323/resources/red-intrinsic-ratio-landscape.svg: Removed.
* css2.1/20110323/resources/red-intrinsic-ratio-portrait.svg: Removed.
* css2.1/20110323/resources/red-intrinsic-width-height.svg: Removed.
* css2.1/20110323/resources/red-intrinsic-width-pc-height-pc.svg: Removed.
* css2.1/20110323/resources/red-intrinsic-width-ratio.svg: Removed.
* css2.1/20110323/resources/red-intrinsic-width.svg: Removed.
* fast/backgrounds/size/contain-and-cover-zoomed.html: Removed.
* fast/images/percent-height-image-expected.txt:
* fast/images/percent-height-image.html:
* platform/mac-snowleopard/svg/zoom/page/relative-sized-document-scrollbars-expected.png: Added.
* platform/mac-snowleopard/svg/zoom/page/zoom-foreignObject-expected.png: Added.
* platform/mac/css1/text_properties/vertical_align-expected.txt:
* platform/mac/css2.1/20110323/background-intrinsic-001-expected.png: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-001-expected.txt: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-002-expected.png: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-002-expected.txt: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-003-expected.png: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-003-expected.txt: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-004-expected.png: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-004-expected.txt: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-005-expected.png: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-005-expected.txt: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-006-expected.png: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-006-expected.txt: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-007-expected.png: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-007-expected.txt: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-008-expected.png: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-008-expected.txt: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-009-expected.png: Removed.
* platform/mac/css2.1/20110323/background-intrinsic-009-expected.txt: Removed.
* platform/mac/fast/backgrounds/size/contain-and-cover-expected.png:
* platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.png: Removed.
* platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.txt: Removed.
* platform/mac/fast/block/float/015-expected.png:
* platform/mac/fast/block/float/015-expected.txt:
* platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.png:
* platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt:
* platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.png:
* platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.txt:
* platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png: Removed.
* platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.txt: Removed.
* platform/mac/svg/as-background-image/background-image-tiled-expected.png: Removed.
* platform/mac/svg/as-background-image/background-image-tiled-expected.txt: Removed.
* platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.png: Removed.
* platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.txt: Removed.
* platform/mac/svg/as-background-image/svg-as-background-4-expected.png:
* platform/mac/svg/as-border-image/svg-as-border-image-expected.png:
* platform/mac/svg/as-image/animated-svg-as-image-expected.png:
* platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png: Removed.
* platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.txt: Removed.
* platform/mac/svg/as-image/same-image-two-instances-expected.png: Removed.
* platform/mac/svg/as-image/same-image-two-instances-expected.txt: Removed.
* platform/mac/svg/as-image/svg-as-relative-image-expected.png:
* platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png: Removed.
* platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.txt: Removed.
* platform/mac/svg/as-image/svg-image-change-content-size-expected.png: Removed.
* platform/mac/svg/as-image/svg-image-change-content-size-expected.txt: Removed.
* platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.png:
* platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.txt:
* platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.png: Removed.
* platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.txt: Removed.
* platform/mac/svg/zoom/page/zoom-background-images-expected.png: Removed.
* platform/mac/svg/zoom/page/zoom-background-images-expected.txt: Removed.
* platform/mac/svg/zoom/page/zoom-foreignObject-expected.png:
* platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt:
* platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png: Removed.
* platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt: Removed.
* platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png: Removed.
* platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.txt: Removed.
* platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png: Removed.
* platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.txt: Removed.
* svg/as-background-image/background-image-preserveaspectRatio-support.html: Removed.
* svg/as-background-image/background-image-tiled.html: Removed.
* svg/as-background-image/resources/construction-tape.svg: Removed.
* svg/as-background-image/resources/hearts.svg:
* svg/as-background-image/same-image-two-instances-background-image.html: Removed.
* svg/as-image/img-preserveAspectRatio-support-1.html: Removed.
* svg/as-image/resources/circle-default-meet.svg: Removed.
* svg/as-image/resources/circle-default-none.svg: Removed.
* svg/as-image/resources/circle-default-slice.svg: Removed.
* svg/as-image/resources/circle-nosize.svg: Removed.
* svg/as-image/resources/circle-viewbox-default.svg: Removed.
* svg/as-image/resources/circle-viewbox-meet.svg: Removed.
* svg/as-image/resources/circle-viewbox-none.svg: Removed.
* svg/as-image/resources/circle-viewbox-slice.svg: Removed.
* svg/as-image/resources/green-relative-size-rect.svg:
* svg/as-image/same-image-two-instances.html: Removed.
* svg/as-image/svg-as-relative-image-with-explicit-size.html: Removed.
* svg/as-image/svg-image-change-content-size.xhtml: Removed.
* svg/zoom/page/resources/relative-sized-background-with-viewBox.svg: Removed.
* svg/zoom/page/zoom-background-image-tiled.html: Removed.
* svg/zoom/page/zoom-background-images.html: Removed.
* svg/zoom/page/zoom-img-preserveAspectRatio-support-1.html: Removed.
* svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox.html: Removed.
* svg/zoom/page/zoom-svg-as-background-with-relative-size.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@98508 268f45cc-cd09-0410-ab3c-d52691b4dbfc

145 files changed:
LayoutTests/ChangeLog
LayoutTests/css2.1/20110323/background-intrinsic-001.htm [deleted file]
LayoutTests/css2.1/20110323/background-intrinsic-002.htm [deleted file]
LayoutTests/css2.1/20110323/background-intrinsic-003.htm [deleted file]
LayoutTests/css2.1/20110323/background-intrinsic-004.htm [deleted file]
LayoutTests/css2.1/20110323/background-intrinsic-005.htm [deleted file]
LayoutTests/css2.1/20110323/background-intrinsic-006.htm [deleted file]
LayoutTests/css2.1/20110323/background-intrinsic-007.htm [deleted file]
LayoutTests/css2.1/20110323/background-intrinsic-008.htm [deleted file]
LayoutTests/css2.1/20110323/background-intrinsic-009.htm [deleted file]
LayoutTests/css2.1/20110323/resources/green-intrinsic-height-ratio.svg [deleted file]
LayoutTests/css2.1/20110323/resources/green-intrinsic-height.svg [deleted file]
LayoutTests/css2.1/20110323/resources/green-intrinsic-none.svg [deleted file]
LayoutTests/css2.1/20110323/resources/green-intrinsic-ratio-landscape.svg [deleted file]
LayoutTests/css2.1/20110323/resources/green-intrinsic-ratio-portrait.svg [deleted file]
LayoutTests/css2.1/20110323/resources/green-intrinsic-width-height.svg [deleted file]
LayoutTests/css2.1/20110323/resources/green-intrinsic-width-pc-height-pc.svg [deleted file]
LayoutTests/css2.1/20110323/resources/green-intrinsic-width-ratio.svg [deleted file]
LayoutTests/css2.1/20110323/resources/green-intrinsic-width.svg [deleted file]
LayoutTests/css2.1/20110323/resources/red-intrinsic-height-ratio.svg [deleted file]
LayoutTests/css2.1/20110323/resources/red-intrinsic-height.svg [deleted file]
LayoutTests/css2.1/20110323/resources/red-intrinsic-none.svg [deleted file]
LayoutTests/css2.1/20110323/resources/red-intrinsic-ratio-landscape.svg [deleted file]
LayoutTests/css2.1/20110323/resources/red-intrinsic-ratio-portrait.svg [deleted file]
LayoutTests/css2.1/20110323/resources/red-intrinsic-width-height.svg [deleted file]
LayoutTests/css2.1/20110323/resources/red-intrinsic-width-pc-height-pc.svg [deleted file]
LayoutTests/css2.1/20110323/resources/red-intrinsic-width-ratio.svg [deleted file]
LayoutTests/css2.1/20110323/resources/red-intrinsic-width.svg [deleted file]
LayoutTests/fast/backgrounds/size/contain-and-cover-zoomed.html [deleted file]
LayoutTests/fast/images/percent-height-image-expected.txt
LayoutTests/fast/images/percent-height-image.html
LayoutTests/platform/mac-snowleopard/svg/zoom/page/relative-sized-document-scrollbars-expected.png [new file with mode: 0644]
LayoutTests/platform/mac-snowleopard/svg/zoom/page/zoom-foreignObject-expected.png [new file with mode: 0644]
LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.txt
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-001-expected.png [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-001-expected.txt [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-002-expected.png [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-002-expected.txt [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-003-expected.png [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-003-expected.txt [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-004-expected.png [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-004-expected.txt [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-005-expected.png [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-005-expected.txt [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-006-expected.png [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-006-expected.txt [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-007-expected.png [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-007-expected.txt [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-008-expected.png [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-008-expected.txt [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-009-expected.png [deleted file]
LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-009-expected.txt [deleted file]
LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-expected.png
LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.png [deleted file]
LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.txt [deleted file]
LayoutTests/platform/mac/fast/block/float/015-expected.png
LayoutTests/platform/mac/fast/block/float/015-expected.txt
LayoutTests/platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.png
LayoutTests/platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt
LayoutTests/platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.png
LayoutTests/platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.txt
LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png [deleted file]
LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.txt [deleted file]
LayoutTests/platform/mac/svg/as-background-image/background-image-tiled-expected.png [deleted file]
LayoutTests/platform/mac/svg/as-background-image/background-image-tiled-expected.txt [deleted file]
LayoutTests/platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.png [deleted file]
LayoutTests/platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.txt [deleted file]
LayoutTests/platform/mac/svg/as-background-image/svg-as-background-4-expected.png
LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-expected.png
LayoutTests/platform/mac/svg/as-image/animated-svg-as-image-expected.png
LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png [deleted file]
LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.txt [deleted file]
LayoutTests/platform/mac/svg/as-image/same-image-two-instances-expected.png [deleted file]
LayoutTests/platform/mac/svg/as-image/same-image-two-instances-expected.txt [deleted file]
LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-expected.png
LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png [deleted file]
LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.txt [deleted file]
LayoutTests/platform/mac/svg/as-image/svg-image-change-content-size-expected.png [deleted file]
LayoutTests/platform/mac/svg/as-image/svg-image-change-content-size-expected.txt [deleted file]
LayoutTests/platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.png
LayoutTests/platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.txt
LayoutTests/platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.png [deleted file]
LayoutTests/platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.txt [deleted file]
LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.png [deleted file]
LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.txt [deleted file]
LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.png
LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt
LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png [deleted file]
LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt [deleted file]
LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png [deleted file]
LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.txt [deleted file]
LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png [deleted file]
LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.txt [deleted file]
LayoutTests/svg/as-background-image/background-image-preserveaspectRatio-support.html [deleted file]
LayoutTests/svg/as-background-image/background-image-tiled.html [deleted file]
LayoutTests/svg/as-background-image/resources/construction-tape.svg [deleted file]
LayoutTests/svg/as-background-image/resources/hearts.svg
LayoutTests/svg/as-background-image/same-image-two-instances-background-image.html [deleted file]
LayoutTests/svg/as-image/img-preserveAspectRatio-support-1.html [deleted file]
LayoutTests/svg/as-image/resources/circle-default-meet.svg [deleted file]
LayoutTests/svg/as-image/resources/circle-default-none.svg [deleted file]
LayoutTests/svg/as-image/resources/circle-default-slice.svg [deleted file]
LayoutTests/svg/as-image/resources/circle-nosize.svg [deleted file]
LayoutTests/svg/as-image/resources/circle-viewbox-default.svg [deleted file]
LayoutTests/svg/as-image/resources/circle-viewbox-meet.svg [deleted file]
LayoutTests/svg/as-image/resources/circle-viewbox-none.svg [deleted file]
LayoutTests/svg/as-image/resources/circle-viewbox-slice.svg [deleted file]
LayoutTests/svg/as-image/resources/green-relative-size-rect.svg
LayoutTests/svg/as-image/same-image-two-instances.html [deleted file]
LayoutTests/svg/as-image/svg-as-relative-image-with-explicit-size.html [deleted file]
LayoutTests/svg/as-image/svg-image-change-content-size.xhtml [deleted file]
LayoutTests/svg/zoom/page/resources/relative-sized-background-with-viewBox.svg [deleted file]
LayoutTests/svg/zoom/page/zoom-background-image-tiled.html [deleted file]
LayoutTests/svg/zoom/page/zoom-background-images.html [deleted file]
LayoutTests/svg/zoom/page/zoom-img-preserveAspectRatio-support-1.html [deleted file]
LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox.html [deleted file]
LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/loader/cache/CachedImage.cpp
Source/WebCore/loader/cache/CachedImage.h
Source/WebCore/page/ChromeClient.h
Source/WebCore/rendering/ImageBySizeCache.cpp
Source/WebCore/rendering/ImageBySizeCache.h
Source/WebCore/rendering/RenderBoxModelObject.cpp
Source/WebCore/rendering/RenderBoxModelObject.h
Source/WebCore/rendering/RenderImage.cpp
Source/WebCore/rendering/RenderImage.h
Source/WebCore/rendering/RenderImageResource.cpp
Source/WebCore/rendering/RenderImageResourceStyleImage.cpp
Source/WebCore/rendering/RenderImageResourceStyleImage.h
Source/WebCore/rendering/RenderListMarker.cpp
Source/WebCore/rendering/RenderReplaced.cpp
Source/WebCore/rendering/style/StyleCachedImage.cpp
Source/WebCore/rendering/style/StyleCachedImage.h
Source/WebCore/rendering/style/StyleGeneratedImage.h
Source/WebCore/rendering/style/StyleImage.h
Source/WebCore/rendering/style/StylePendingImage.h
Source/WebCore/rendering/svg/RenderSVGImage.cpp
Source/WebCore/rendering/svg/RenderSVGRoot.cpp
Source/WebCore/rendering/svg/RenderSVGRoot.h
Source/WebCore/svg/SVGLength.cpp
Source/WebCore/svg/SVGSVGElement.cpp
Source/WebCore/svg/SVGSVGElement.h
Source/WebCore/svg/graphics/SVGImage.cpp
Source/WebCore/svg/graphics/SVGImage.h

index 2a5872289a95e63893b2abf88ce77c92c70f7a00..7f58c57241b4fbc88931804311de1994fae33df8 100644 (file)
@@ -1,3 +1,128 @@
+2011-10-26  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Unreviewed, rolling out r98483.
+        http://trac.webkit.org/changeset/98483
+        https://bugs.webkit.org/show_bug.cgi?id=47156
+
+        Change is causing some crashes and ASSERTs.
+
+        * css2.1/20110323/background-intrinsic-001.htm: Removed.
+        * css2.1/20110323/background-intrinsic-002.htm: Removed.
+        * css2.1/20110323/background-intrinsic-003.htm: Removed.
+        * css2.1/20110323/background-intrinsic-004.htm: Removed.
+        * css2.1/20110323/background-intrinsic-005.htm: Removed.
+        * css2.1/20110323/background-intrinsic-006.htm: Removed.
+        * css2.1/20110323/background-intrinsic-007.htm: Removed.
+        * css2.1/20110323/background-intrinsic-008.htm: Removed.
+        * css2.1/20110323/background-intrinsic-009.htm: Removed.
+        * css2.1/20110323/resources/green-intrinsic-height-ratio.svg: Removed.
+        * css2.1/20110323/resources/green-intrinsic-height.svg: Removed.
+        * css2.1/20110323/resources/green-intrinsic-none.svg: Removed.
+        * css2.1/20110323/resources/green-intrinsic-ratio-landscape.svg: Removed.
+        * css2.1/20110323/resources/green-intrinsic-ratio-portrait.svg: Removed.
+        * css2.1/20110323/resources/green-intrinsic-width-height.svg: Removed.
+        * css2.1/20110323/resources/green-intrinsic-width-pc-height-pc.svg: Removed.
+        * css2.1/20110323/resources/green-intrinsic-width-ratio.svg: Removed.
+        * css2.1/20110323/resources/green-intrinsic-width.svg: Removed.
+        * css2.1/20110323/resources/red-intrinsic-height-ratio.svg: Removed.
+        * css2.1/20110323/resources/red-intrinsic-height.svg: Removed.
+        * css2.1/20110323/resources/red-intrinsic-none.svg: Removed.
+        * css2.1/20110323/resources/red-intrinsic-ratio-landscape.svg: Removed.
+        * css2.1/20110323/resources/red-intrinsic-ratio-portrait.svg: Removed.
+        * css2.1/20110323/resources/red-intrinsic-width-height.svg: Removed.
+        * css2.1/20110323/resources/red-intrinsic-width-pc-height-pc.svg: Removed.
+        * css2.1/20110323/resources/red-intrinsic-width-ratio.svg: Removed.
+        * css2.1/20110323/resources/red-intrinsic-width.svg: Removed.
+        * fast/backgrounds/size/contain-and-cover-zoomed.html: Removed.
+        * fast/images/percent-height-image-expected.txt:
+        * fast/images/percent-height-image.html:
+        * platform/mac-snowleopard/svg/zoom/page/relative-sized-document-scrollbars-expected.png: Added.
+        * platform/mac-snowleopard/svg/zoom/page/zoom-foreignObject-expected.png: Added.
+        * platform/mac/css1/text_properties/vertical_align-expected.txt:
+        * platform/mac/css2.1/20110323/background-intrinsic-001-expected.png: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-001-expected.txt: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-002-expected.png: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-002-expected.txt: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-003-expected.png: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-003-expected.txt: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-004-expected.png: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-004-expected.txt: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-005-expected.png: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-005-expected.txt: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-006-expected.png: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-006-expected.txt: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-007-expected.png: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-007-expected.txt: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-008-expected.png: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-008-expected.txt: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-009-expected.png: Removed.
+        * platform/mac/css2.1/20110323/background-intrinsic-009-expected.txt: Removed.
+        * platform/mac/fast/backgrounds/size/contain-and-cover-expected.png:
+        * platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.png: Removed.
+        * platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.txt: Removed.
+        * platform/mac/fast/block/float/015-expected.png:
+        * platform/mac/fast/block/float/015-expected.txt:
+        * platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.png:
+        * platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt:
+        * platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.png:
+        * platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.txt:
+        * platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png: Removed.
+        * platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.txt: Removed.
+        * platform/mac/svg/as-background-image/background-image-tiled-expected.png: Removed.
+        * platform/mac/svg/as-background-image/background-image-tiled-expected.txt: Removed.
+        * platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.png: Removed.
+        * platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.txt: Removed.
+        * platform/mac/svg/as-background-image/svg-as-background-4-expected.png:
+        * platform/mac/svg/as-border-image/svg-as-border-image-expected.png:
+        * platform/mac/svg/as-image/animated-svg-as-image-expected.png:
+        * platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png: Removed.
+        * platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.txt: Removed.
+        * platform/mac/svg/as-image/same-image-two-instances-expected.png: Removed.
+        * platform/mac/svg/as-image/same-image-two-instances-expected.txt: Removed.
+        * platform/mac/svg/as-image/svg-as-relative-image-expected.png:
+        * platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png: Removed.
+        * platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.txt: Removed.
+        * platform/mac/svg/as-image/svg-image-change-content-size-expected.png: Removed.
+        * platform/mac/svg/as-image/svg-image-change-content-size-expected.txt: Removed.
+        * platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.png:
+        * platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.txt:
+        * platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.png: Removed.
+        * platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.txt: Removed.
+        * platform/mac/svg/zoom/page/zoom-background-images-expected.png: Removed.
+        * platform/mac/svg/zoom/page/zoom-background-images-expected.txt: Removed.
+        * platform/mac/svg/zoom/page/zoom-foreignObject-expected.png:
+        * platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt:
+        * platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png: Removed.
+        * platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt: Removed.
+        * platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png: Removed.
+        * platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.txt: Removed.
+        * platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png: Removed.
+        * platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.txt: Removed.
+        * svg/as-background-image/background-image-preserveaspectRatio-support.html: Removed.
+        * svg/as-background-image/background-image-tiled.html: Removed.
+        * svg/as-background-image/resources/construction-tape.svg: Removed.
+        * svg/as-background-image/resources/hearts.svg:
+        * svg/as-background-image/same-image-two-instances-background-image.html: Removed.
+        * svg/as-image/img-preserveAspectRatio-support-1.html: Removed.
+        * svg/as-image/resources/circle-default-meet.svg: Removed.
+        * svg/as-image/resources/circle-default-none.svg: Removed.
+        * svg/as-image/resources/circle-default-slice.svg: Removed.
+        * svg/as-image/resources/circle-nosize.svg: Removed.
+        * svg/as-image/resources/circle-viewbox-default.svg: Removed.
+        * svg/as-image/resources/circle-viewbox-meet.svg: Removed.
+        * svg/as-image/resources/circle-viewbox-none.svg: Removed.
+        * svg/as-image/resources/circle-viewbox-slice.svg: Removed.
+        * svg/as-image/resources/green-relative-size-rect.svg:
+        * svg/as-image/same-image-two-instances.html: Removed.
+        * svg/as-image/svg-as-relative-image-with-explicit-size.html: Removed.
+        * svg/as-image/svg-image-change-content-size.xhtml: Removed.
+        * svg/zoom/page/resources/relative-sized-background-with-viewBox.svg: Removed.
+        * svg/zoom/page/zoom-background-image-tiled.html: Removed.
+        * svg/zoom/page/zoom-background-images.html: Removed.
+        * svg/zoom/page/zoom-img-preserveAspectRatio-support-1.html: Removed.
+        * svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox.html: Removed.
+        * svg/zoom/page/zoom-svg-as-background-with-relative-size.html: Removed.
+
 2011-10-26  Eric Carlson  <eric.carlson@apple.com>
 
         Constructors for all TextTrack interfaces should be available on DOMWindow
diff --git a/LayoutTests/css2.1/20110323/background-intrinsic-001.htm b/LayoutTests/css2.1/20110323/background-intrinsic-001.htm
deleted file mode 100644 (file)
index c24cc28..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <link rel="reference" href="background-intrinsic-ref.xht">
-  <title>CSS Test: Background Intrinsic Sizes: No intrinsic size</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties">
-  <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size">
-  <meta name="flags" content="svg">
-  <meta name="assert" content="A background image with no intrinsic size covers     the entire padding box.">
-  <style type="text/css">
-    /* Setup. Use 5:6 ratio because it's weird and unlikely to be hard-coded anywhere. */
-    div {
-      position: relative;
-    }
-    .cover, .limit {
-      width: 120px;
-      height: 120px;
-      margin: 0.5em;
-      background: green; /* Used to match reference; remove for debugging. */
-    }
-    .control {
-      position: absolute;
-      top: 10px; bottom: 10px;
-      left: 10px; right: 30px;
-    }
-    .cover .control {
-      background: red;
-    }
-    .limit .control {
-      background: green;
-    }
-    .test {
-      /* 80x100 bgpos area */
-      height: 80px;
-      width: 60px;
-      padding: 10px;
-      /* 100 x 120 bgpaint area */
-      border: 10px solid transparent;
-    }
-
-    /* Test */
-    .cover .test {
-      background: no-repeat url(resources/green-intrinsic-none.svg);
-    }
-    .limit .test {
-      background: no-repeat url(resources/red-intrinsic-none.svg);
-    }
-  </style>
- </head>
- <body>
-  <p>There must be two green boxes below and no red.</p>
-
-  <div class="cover">
-    <div class="control"></div>
-    <div class="test"></div>
-  </div>
-
-  <div class="limit">
-    <div class="test"></div>
-    <div class="control"></div>
-  </div>
-
- </body>
-</html>
diff --git a/LayoutTests/css2.1/20110323/background-intrinsic-002.htm b/LayoutTests/css2.1/20110323/background-intrinsic-002.htm
deleted file mode 100644 (file)
index c49d4b7..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <link rel="reference" href="background-intrinsic-ref.xht">
-  <title>CSS Test: Background Intrinsic Sizes: Intrinsic Width</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties">
-  <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size">
-  <meta name="flags" content="svg">
-  <meta name="assert" content="A background image with only an intrinsic width     covers its intrinsic width and the height of the padding box.">
-  <style type="text/css">
-    /* Setup. Use 5:6 ratio because it's weird and unlikely to be hard-coded anywhere. */
-    div {
-      position: relative;
-    }
-    .cover, .limit {
-      width: 120px;
-      height: 120px;
-      margin: 0.5em;
-      background: green; /* Used to match reference; remove for debugging. */
-    }
-    .control {
-      position: absolute;
-      top: 10px; bottom: 10px;
-      left: 10px; right: 30px;
-    }
-    .cover .control {
-      background: red;
-    }
-    .limit .control {
-      background: green;
-    }
-    .test {
-      /* 80x100 bgpos area */
-      height: 80px;
-      width: 60px;
-      padding: 10px;
-      border: 10px solid transparent;
-    }
-
-    /* Test */
-    .cover .test {
-      background: no-repeat url(resources/green-intrinsic-width.svg);
-    }
-    .limit .test {
-      background: no-repeat url(resources/red-intrinsic-width.svg);
-    }
-    .control {
-      width: 60px;
-    }
-  </style>
- </head>
- <body>
-  <p>There must be two green boxes below and no red.</p>
-
-  <div class="cover">
-    <div class="control"></div>
-    <div class="test"></div>
-  </div>
-
-  <div class="limit">
-    <div class="test"></div>
-    <div class="control"></div>
-  </div>
-
- </body>
-</html>
diff --git a/LayoutTests/css2.1/20110323/background-intrinsic-003.htm b/LayoutTests/css2.1/20110323/background-intrinsic-003.htm
deleted file mode 100644 (file)
index 551c6c9..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <link rel="reference" href="background-intrinsic-ref.xht">
-  <title>CSS Test: Background Intrinsic Sizes: Intrinsic Height</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties">
-  <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size">
-  <meta name="flags" content="svg">
-  <meta name="assert" content="A background image with only an intrinsic height     covers its intrinsic height and the width of the padding box.">
-  <style type="text/css">
-    /* Setup. Use 5:6 ratio because it's weird and unlikely to be hard-coded anywhere. */
-    div {
-      position: relative;
-    }
-    .cover, .limit {
-      width: 120px;
-      height: 120px;
-      margin: 0.5em;
-      background: green; /* Used to match reference; remove for debugging. */
-    }
-    .control {
-      position: absolute;
-      top: 10px; bottom: 10px;
-      left: 10px; right: 30px;
-    }
-    .cover .control {
-      background: red;
-    }
-    .limit .control {
-      background: green;
-    }
-    .test {
-      /* 80x100 bgpos area */
-      height: 80px;
-      width: 60px;
-      padding: 10px;
-      border: 10px solid transparent;
-    }
-
-    /* Test */
-    .cover .test {
-      background: no-repeat url(resources/green-intrinsic-height.svg);
-    }
-    .limit .test {
-      background: no-repeat url(resources/red-intrinsic-height.svg);
-    }
-    .control {
-      height: 60px;
-    }
-  </style>
- </head>
- <body>
-  <p>There must be two green boxes below and no red.</p>
-
-  <div class="cover">
-    <div class="control"></div>
-    <div class="test"></div>
-  </div>
-
-  <div class="limit">
-    <div class="test"></div>
-    <div class="control"></div>
-  </div>
-
- </body>
-</html>
diff --git a/LayoutTests/css2.1/20110323/background-intrinsic-004.htm b/LayoutTests/css2.1/20110323/background-intrinsic-004.htm
deleted file mode 100644 (file)
index d038bac..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <link rel="reference" href="background-intrinsic-ref.xht">
-  <title>CSS Test: Background Intrinsic Sizes: Intrinsic Ratio (Match Heights)</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties">
-  <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size">
-  <meta name="flags" content="may svg">
-  <meta name="assert" content="A background image with only an intrinsic ratio     covers largest rectangle at that ratio that exceeds neither the height nor     width of the background positioning area.">
-  <style type="text/css">
-    /* Setup. Use 5:6 ratio because it's weird and unlikely to be hard-coded anywhere. */
-    div {
-      position: relative;
-    }
-    .cover, .limit {
-      width: 120px;
-      height: 120px;
-      margin: 0.5em;
-      background: green; /* Used to match reference; remove for debugging. */
-    }
-    .control {
-      position: absolute;
-      top: 10px; bottom: 10px;
-      left: 10px; right: 30px;
-    }
-    .cover .control {
-      background: red;
-    }
-    .limit .control {
-      background: green;
-    }
-    .test {
-      /* 80x100 bgpos area */
-      height: 80px;
-      width: 60px;
-      padding: 10px;
-      border: 10px solid transparent;
-    }
-
-    /* Test */
-    .cover .test {
-      background: no-repeat url(resources/green-intrinsic-ratio-portrait.svg);
-    }
-    .limit .test {
-      background: no-repeat url(resources/red-intrinsic-ratio-portrait.svg);
-    }
-    .cover .control {
-      width: 66px;
-    }
-    .limit .control {
-      width: 67px;
-    }
-  </style>
- </head>
- <body>
-  <p>There must be two green boxes below and no red.</p>
-
-  <div class="cover">
-    <div class="control"></div>
-    <div class="test"></div>
-  </div>
-
-  <div class="limit">
-    <div class="test"></div>
-    <div class="control"></div>
-  </div>
-
- </body>
-</html>
diff --git a/LayoutTests/css2.1/20110323/background-intrinsic-005.htm b/LayoutTests/css2.1/20110323/background-intrinsic-005.htm
deleted file mode 100644 (file)
index 36484f1..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <link rel="reference" href="background-intrinsic-ref.xht">
-  <title>CSS Test: Background Intrinsic Sizes: Intrinsic Ratio (Match Widths)</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties">
-  <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size">
-  <meta name="flags" content="may svg">
-  <meta name="assert" content="A background image with only an intrinsic ratio     covers largest rectangle at that ratio that exceeds neither the height nor     width of the background positioning area.">
-  <style type="text/css">
-    /* Setup. Use 5:6 ratio because it's weird and unlikely to be hard-coded anywhere. */
-    div {
-      position: relative;
-    }
-    .cover, .limit {
-      width: 120px;
-      height: 120px;
-      margin: 0.5em;
-      background: green; /* Used to match reference; remove for debugging. */
-    }
-    .control {
-      position: absolute;
-      top: 10px; bottom: 10px;
-      left: 10px; right: 30px;
-    }
-    .cover .control {
-      background: red;
-    }
-    .limit .control {
-      background: green;
-    }
-    .test {
-      /* 80x100 bgpos area */
-      height: 80px;
-      width: 60px;
-      padding: 10px;
-      border: 10px solid transparent;
-    }
-
-    /* Test */
-    .cover .test {
-      background: no-repeat url(resources/green-intrinsic-ratio-landscape.svg);
-    }
-    .limit .test {
-      background: no-repeat url(resources/red-intrinsic-ratio-landscape.svg);
-    }
-    .cover .control {
-      height: 53px;
-    }
-    .limit .control {
-      height: 54px;
-    }
-  </style>
- </head>
- <body>
-  <p>There must be two green boxes below and no red.</p>
-
-  <div class="cover">
-    <div class="control"></div>
-    <div class="test"></div>
-  </div>
-
-  <div class="limit">
-    <div class="test"></div>
-    <div class="control"></div>
-  </div>
-
- </body>
-</html>
diff --git a/LayoutTests/css2.1/20110323/background-intrinsic-006.htm b/LayoutTests/css2.1/20110323/background-intrinsic-006.htm
deleted file mode 100644 (file)
index c21e796..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <link rel="reference" href="background-intrinsic-ref.xht">
-  <title>CSS Test: Background Intrinsic Sizes: Intrinsic Percentage Width and Height</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties">
-  <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size">
-  <meta name="flags" content="svg">
-  <meta name="assert" content="A background image with only an intrinsic ratio     covers largest rectangle at that ratio that exceeds neither the height nor     width of the background positioning area.">
-  <style type="text/css">
-    /* Setup. Use 5:6 ratio because it's weird and unlikely to be hard-coded anywhere. */
-    div {
-      position: relative;
-    }
-    .cover, .limit {
-      width: 120px;
-      height: 120px;
-      margin: 0.5em;
-      background: green; /* Used to match reference; remove for debugging. */
-    }
-    .control {
-      position: absolute;
-      top: 10px; bottom: 10px;
-      left: 10px; right: 30px;
-    }
-    .cover .control {
-      background: red;
-    }
-    .limit .control {
-      background: green;
-    }
-    .test {
-      /* 80x100 bgpos area */
-      height: 80px;
-      width: 60px;
-      padding: 10px;
-      border: 10px solid transparent;
-    }
-
-    /* Test */
-    .cover .test {
-      background: no-repeat url(resources/green-intrinsic-width-pc-height-pc.svg);
-    }
-    .limit .test {
-      background: no-repeat url(resources/red-intrinsic-width-pc-height-pc.svg);
-    }
-    .control {
-      width: 32px;
-      height: 60px;
-    }
-  </style>
- </head>
- <body>
-  <p>There must be two green boxes below and no red.</p>
-
-  <div class="cover">
-    <div class="control"></div>
-    <div class="test"></div>
-  </div>
-
-  <div class="limit">
-    <div class="test"></div>
-    <div class="control"></div>
-  </div>
-
- </body>
-</html>
diff --git a/LayoutTests/css2.1/20110323/background-intrinsic-007.htm b/LayoutTests/css2.1/20110323/background-intrinsic-007.htm
deleted file mode 100644 (file)
index fcd0127..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <link rel="reference" href="background-intrinsic-ref.xht">
-  <title>CSS Test: Background Intrinsic Sizes: Intrinsic Width and Ratio</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties">
-  <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size">
-  <meta name="flags" content="svg">
-  <meta name="assert" content="A missing background image height is calculated     from the width and the ratio.">
-  <style type="text/css">
-    /* Setup. Use 5:6 ratio because it's weird and unlikely to be hard-coded anywhere. */
-    div {
-      position: relative;
-    }
-    .cover, .limit {
-      width: 120px;
-      height: 120px;
-      margin: 0.5em;
-      background: green; /* Used to match reference; remove for debugging. */
-    }
-    .control {
-      position: absolute;
-      top: 10px; bottom: 10px;
-      left: 10px; right: 30px;
-    }
-    .cover .control {
-      background: red;
-    }
-    .limit .control {
-      background: green;
-    }
-    .test {
-      /* 80x100 bgpos area */
-      height: 80px;
-      width: 60px;
-      padding: 10px;
-      border: 10px solid transparent;
-    }
-
-    /* Test */
-    .cover .test {
-      background: no-repeat url(resources/green-intrinsic-width-ratio.svg);
-    }
-    .limit .test {
-      background: no-repeat url(resources/red-intrinsic-width-ratio.svg);
-    }
-    .control {
-      width: 40px;
-      height: 60px;
-    }
-  </style>
- </head>
- <body>
-  <p>There must be two green boxes below and no red.</p>
-
-  <div class="cover">
-    <div class="control"></div>
-    <div class="test"></div>
-  </div>
-
-  <div class="limit">
-    <div class="test"></div>
-    <div class="control"></div>
-  </div>
-
- </body>
-</html>
diff --git a/LayoutTests/css2.1/20110323/background-intrinsic-008.htm b/LayoutTests/css2.1/20110323/background-intrinsic-008.htm
deleted file mode 100644 (file)
index 2ac1d1b..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <link rel="reference" href="background-intrinsic-ref.xht">
-  <title>CSS Test: Background Intrinsic Sizes: Intrinsic Height and Ratio</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties">
-  <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size">
-  <meta name="flags" content="svg">
-  <meta name="assert" content="A missing background image width is calculated     from the height and the ratio.">
-  <style type="text/css">
-    /* Setup. Use 5:6 ratio because it's weird and unlikely to be hard-coded anywhere. */
-    div {
-      position: relative;
-    }
-    .cover, .limit {
-      width: 120px;
-      height: 120px;
-      margin: 0.5em;
-      background: green; /* Used to match reference; remove for debugging. */
-    }
-    .control {
-      position: absolute;
-      top: 10px; bottom: 10px;
-      left: 10px; right: 30px;
-    }
-    .cover .control {
-      background: red;
-    }
-    .limit .control {
-      background: green;
-    }
-    .test {
-      /* 80x100 bgpos area */
-      height: 80px;
-      width: 60px;
-      padding: 10px;
-      border: 10px solid transparent;
-    }
-
-    /* Test */
-    .cover .test {
-      background: no-repeat url(resources/green-intrinsic-height-ratio.svg);
-    }
-    .limit .test {
-      background: no-repeat url(resources/red-intrinsic-height-ratio.svg);
-    }
-    .control {
-      width: 40px;
-      height: 60px;
-    }
-  </style>
- </head>
- <body>
-  <p>There must be two green boxes below and no red.</p>
-
-  <div class="cover">
-    <div class="control"></div>
-    <div class="test"></div>
-  </div>
-
-  <div class="limit">
-    <div class="test"></div>
-    <div class="control"></div>
-  </div>
-
- </body>
-</html>
diff --git a/LayoutTests/css2.1/20110323/background-intrinsic-009.htm b/LayoutTests/css2.1/20110323/background-intrinsic-009.htm
deleted file mode 100644 (file)
index d62705c..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <link rel="reference" href="background-intrinsic-ref.xht">
-  <title>CSS Test: Background Intrinsic Sizes: Intrinsic Width and Height (Vector)</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/colors.html#background-properties">
-  <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size">
-  <meta name="flags" content="svg">
-  <meta name="assert" content="A background with an intrinsic width and height     is drawn at that size.">
-  <style type="text/css">
-    /* Setup. Use 5:6 ratio because it's weird and unlikely to be hard-coded anywhere. */
-    div {
-      position: relative;
-    }
-    .cover, .limit {
-      width: 120px;
-      height: 120px;
-      margin: 0.5em;
-      background: green; /* Used to match reference; remove for debugging. */
-    }
-    .control {
-      position: absolute;
-      top: 10px; bottom: 10px;
-      left: 10px; right: 30px;
-    }
-    .cover .control {
-      background: red;
-    }
-    .limit .control {
-      background: green;
-    }
-    .test {
-      /* 80x100 bgpos area */
-      height: 80px;
-      width: 60px;
-      padding: 10px;
-      border: 10px solid transparent;
-    }
-
-    /* Test */
-    .cover .test {
-      background: no-repeat url(resources/green-intrinsic-width-height.svg);
-    }
-    .limit .test {
-      background: no-repeat url(resources/red-intrinsic-width-height.svg);
-    }
-    .control {
-      width: 40px;
-      height: 60px;
-    }
-  </style>
- </head>
- <body>
-  <p>There must be two green boxes below and no red.</p>
-
-  <div class="cover">
-    <div class="control"></div>
-    <div class="test"></div>
-  </div>
-
-  <div class="limit">
-    <div class="test"></div>
-    <div class="control"></div>
-  </div>
-
- </body>
-</html>
diff --git a/LayoutTests/css2.1/20110323/resources/green-intrinsic-height-ratio.svg b/LayoutTests/css2.1/20110323/resources/green-intrinsic-height-ratio.svg
deleted file mode 100644 (file)
index 6a0495b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic ratio and height -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     height="60" viewBox="0 0 4 6">
-  <rect width="100%" height="100%" fill="green"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/green-intrinsic-height.svg b/LayoutTests/css2.1/20110323/resources/green-intrinsic-height.svg
deleted file mode 100644 (file)
index 04f7787..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic height -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     height="60">
-  <rect width="100%" height="100%" fill="green"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/green-intrinsic-none.svg b/LayoutTests/css2.1/20110323/resources/green-intrinsic-none.svg
deleted file mode 100644 (file)
index 8f1cf0a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- no intrinsic size -->
-<svg xmlns="http://www.w3.org/2000/svg">
-  <rect width="100%" height="100%" fill="green"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/green-intrinsic-ratio-landscape.svg b/LayoutTests/css2.1/20110323/resources/green-intrinsic-ratio-landscape.svg
deleted file mode 100644 (file)
index 4c2e75b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic ratio (landscape) -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     viewBox="0 0 6 4">
-  <rect width="100%" height="100%" fill="green"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/green-intrinsic-ratio-portrait.svg b/LayoutTests/css2.1/20110323/resources/green-intrinsic-ratio-portrait.svg
deleted file mode 100644 (file)
index 0ec89f8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic ratio (portrait) -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     viewBox="0 0 4 6">
-  <rect width="100%" height="100%" fill="green"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/green-intrinsic-width-height.svg b/LayoutTests/css2.1/20110323/resources/green-intrinsic-width-height.svg
deleted file mode 100644 (file)
index 2c5d164..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic height -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="40" height="60">
-  <rect width="100%" height="100%" fill="green"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/green-intrinsic-width-pc-height-pc.svg b/LayoutTests/css2.1/20110323/resources/green-intrinsic-width-pc-height-pc.svg
deleted file mode 100644 (file)
index 6fc18f3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic height -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="40%" height="60%">
-  <rect width="100%" height="100%" fill="green"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/green-intrinsic-width-ratio.svg b/LayoutTests/css2.1/20110323/resources/green-intrinsic-width-ratio.svg
deleted file mode 100644 (file)
index 9e44203..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic ratio and height -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="40" viewBox="0 0 4 6">
-  <rect width="100%" height="100%" fill="green"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/green-intrinsic-width.svg b/LayoutTests/css2.1/20110323/resources/green-intrinsic-width.svg
deleted file mode 100644 (file)
index dd72952..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic width -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="60">
-  <rect width="100%" height="100%" fill="green"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/red-intrinsic-height-ratio.svg b/LayoutTests/css2.1/20110323/resources/red-intrinsic-height-ratio.svg
deleted file mode 100644 (file)
index 55063b9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic ratio and height -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     height="60" viewBox="0 0 4 6">
-  <rect width="100%" height="100%" fill="red"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/red-intrinsic-height.svg b/LayoutTests/css2.1/20110323/resources/red-intrinsic-height.svg
deleted file mode 100644 (file)
index 9e446e0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic height -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     height="60">
-  <rect width="100%" height="100%" fill="red"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/red-intrinsic-none.svg b/LayoutTests/css2.1/20110323/resources/red-intrinsic-none.svg
deleted file mode 100644 (file)
index 078e34a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- no intrinsic size -->
-<svg xmlns="http://www.w3.org/2000/svg">
-  <rect width="100%" height="100%" fill="red"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/red-intrinsic-ratio-landscape.svg b/LayoutTests/css2.1/20110323/resources/red-intrinsic-ratio-landscape.svg
deleted file mode 100644 (file)
index 8fafa8c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic ratio (landscape) -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     viewBox="0 0 6 4">
-  <rect width="100%" height="100%" fill="red"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/red-intrinsic-ratio-portrait.svg b/LayoutTests/css2.1/20110323/resources/red-intrinsic-ratio-portrait.svg
deleted file mode 100644 (file)
index 962bc5d..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic ratio (portrait) -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     viewBox="0 0 4 6">
-  <rect width="100%" height="100%" fill="red"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/red-intrinsic-width-height.svg b/LayoutTests/css2.1/20110323/resources/red-intrinsic-width-height.svg
deleted file mode 100644 (file)
index b3c8e47..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic height -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="40" height="60">
-  <rect width="100%" height="100%" fill="red"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/red-intrinsic-width-pc-height-pc.svg b/LayoutTests/css2.1/20110323/resources/red-intrinsic-width-pc-height-pc.svg
deleted file mode 100644 (file)
index 361a8af..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic height -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="40%" height="60%">
-  <rect width="100%" height="100%" fill="red"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/red-intrinsic-width-ratio.svg b/LayoutTests/css2.1/20110323/resources/red-intrinsic-width-ratio.svg
deleted file mode 100644 (file)
index 2d0e67e..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic ratio and width -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="40" viewBox="0 0 4 6">
-  <rect width="100%" height="100%" fill="red"/>
-</svg>
diff --git a/LayoutTests/css2.1/20110323/resources/red-intrinsic-width.svg b/LayoutTests/css2.1/20110323/resources/red-intrinsic-width.svg
deleted file mode 100644 (file)
index fd49e23..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- only intrinsic width -->
-<svg xmlns="http://www.w3.org/2000/svg"
-  width="60">
-  <rect width="100%" height="100%" fill="red"/>
-</svg>
diff --git a/LayoutTests/fast/backgrounds/size/contain-and-cover-zoomed.html b/LayoutTests/fast/backgrounds/size/contain-and-cover-zoomed.html
deleted file mode 100644 (file)
index 961ab5a..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<style>
-    body {
-        margin: 0;
-        overflow: hidden;
-    }
-
-    div {
-        background-image:
-            url(resources/SquirrelFish.svg),
-            url(../../block/positioning/resources/icon-gold.png),
-            url(resources/flower.jpg),
-            -webkit-gradient(linear, left top, right bottom, from(black), color-stop(50%, transparent), to(black));
-        background-repeat: no-repeat;
-        border: solid;
-        margin: 2px;
-        float: left;
-        background-color: lightblue;
-    }
-
-    div.landscape {
-        width: 390px;
-        height: 140px;
-    }
-
-    div.portrait {
-        width: 190px;
-        height: 290px;
-    }
-
-    div.contain {
-        background-size: contain;
-    }
-
-    div.cover {
-        background-size: cover;
-    }
-
-    div.contain-cover {
-        background-size: contain, cover;
-    }
-
-    div.cover-contain {
-        background-size: cover, contain;
-    }
-
-</style>
-<div class="landscape contain"></div>
-<div class="landscape contain-cover"></div>
-<div class="landscape cover"></div>
-<div class="landscape cover-contain"></div>
-<div class="portrait contain"></div>
-<div class="portrait contain-cover"></div>
-<div class="portrait cover"></div>
-<div class="portrait cover-contain"></div>
-
-<script>
-    if (window.layoutTestController) {
-        for (var i = 0; i < 4; ++i) {
-            eventSender.zoomPageOut();
-        }
-    }
-</script>
index d9eb64a8cd0bb5bc435950cc0a8e00a70d5d209e..f28430ece58f5226f534284133f096908edd8f94 100644 (file)
@@ -1,4 +1,4 @@
 Tests that an image with height 100% inside a floated div keeps its intrinsic height.
 See Bug: http://bugs.webkit.org/show_bug.cgi?id=45439
 
-PASS
+FAIL: image height was 600 expected 20
index 884041df7a183131f77fa8c4950ea649fa94e9b9..f0f7c3ab767316d8fcb80e721a0c4665fd49c07b 100644 (file)
@@ -4,23 +4,18 @@
     See Bug: http://bugs.webkit.org/show_bug.cgi?id=45439</div>\r
 <div style="float: left;">\r
     <!-- src is a 20 x 20 PNG -->\r
-    <img style="height: 100%; width: 100%;" onload="check()" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAMAAAC6V+0/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMAUExURQ//W/8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPzdRA4AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjLX7mlDAAAAaUlEQVQoU23QQQ4AIQgDQPD/j5ZSCkYlxsPoSlnzT5mvu8yBjoPcULaAYG60RFxrDHsQVshvY6URsw8WjY2isnuZ3lTfudn5NEVFYmbN0BjWcYWVpU44kbKc2Hbg2KBMMyC85ph/HfipDQwyAn26rjFKAAAAAElFTkSuQmCC"/>\r
+    <img style="height: 100%; width: 100%;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAMAAAC6V+0/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMAUExURQ//W/8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPzdRA4AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjLX7mlDAAAAaUlEQVQoU23QQQ4AIQgDQPD/j5ZSCkYlxsPoSlnzT5mvu8yBjoPcULaAYG60RFxrDHsQVshvY6URsw8WjY2isnuZ3lTfudn5NEVFYmbN0BjWcYWVpU44kbKc2Hbg2KBMMyC85ph/HfipDQwyAn26rjFKAAAAAElFTkSuQmCC"/>\r
 </div>\r
 <pre></pre>\r
 <script>\r
-    if (window.layoutTestController) {\r
-        layoutTestController.waitUntilDone();\r
+    if (window.layoutTestController)\r
         layoutTestController.dumpAsText();\r
-    }\r
 \r
-    function check() {\r
-        var expected = 20;\r
-        var actual = document.querySelector("img").offsetHeight;\r
-        var out = document.querySelector("pre");\r
-        if (actual == expected)\r
-            out.textContent = "PASS";\r
-        else\r
-            out.textContent = "FAIL: image height was " + actual + " expected " + expected;\r
-        layoutTestController.notifyDone();\r
-    }\r
+    var expected = 20;\r
+    var actual = document.querySelector("img").offsetHeight;\r
+    var out = document.querySelector("pre");\r
+    if (actual == expected)\r
+        out.textContent = "PASS";\r
+    else\r
+        out.textContent = "FAIL: image height was " + actual + " expected " + expected;\r
 </script>\r
diff --git a/LayoutTests/platform/mac-snowleopard/svg/zoom/page/relative-sized-document-scrollbars-expected.png b/LayoutTests/platform/mac-snowleopard/svg/zoom/page/relative-sized-document-scrollbars-expected.png
new file mode 100644 (file)
index 0000000..785d12d
Binary files /dev/null and b/LayoutTests/platform/mac-snowleopard/svg/zoom/page/relative-sized-document-scrollbars-expected.png differ
diff --git a/LayoutTests/platform/mac-snowleopard/svg/zoom/page/zoom-foreignObject-expected.png b/LayoutTests/platform/mac-snowleopard/svg/zoom/page/zoom-foreignObject-expected.png
new file mode 100644 (file)
index 0000000..a173a92
Binary files /dev/null and b/LayoutTests/platform/mac-snowleopard/svg/zoom/page/zoom-foreignObject-expected.png differ
index 6e832227a87ba23b5bd5e0fae82ccff2698210e5..9d50c15ca19f37a7084b02ec27160210424b2a66 100644 (file)
@@ -172,26 +172,26 @@ layer at (0,0) size 785x4407
         RenderImage {IMG} at (74,122) size 6x20
         RenderText {#text} at (80,122) size 101x22
           text run at (80,122) width 101: " all of which "
-        RenderImage {IMG} at (181,122) size 20x65
-        RenderText {#text} at (201,122) size 5x22
-          text run at (201,122) width 5: " "
+        RenderImage {IMG} at (181,122) size 19x65
+        RenderText {#text} at (200,122) size 5x22
+          text run at (200,122) width 5: " "
         RenderInline {SPAN} at (0,0) size 262x43
-          RenderText {#text} at (206,105) size 262x43
-            text run at (206,105) width 262: "should be aligned"
-        RenderText {#text} at (468,122) size 5x22
-          text run at (468,122) width 5: " "
-        RenderImage {IMG} at (473,122) size 11x35
-        RenderText {#text} at (484,122) size 123x22
-          text run at (484,122) width 123: " with the top of "
-        RenderImage {IMG} at (607,122) size 9x30
-        RenderText {#text} at (616,122) size 5x22
-          text run at (616,122) width 5: " "
-        RenderInline {SPAN} at (0,0) size 733x144
-          RenderText {#text} at (621,114) size 19x32
-            text run at (621,114) width 19: "a "
-          RenderInline {SPAN} at (0,0) size 733x194
-            RenderText {#text} at (640,75) size 733x194
-              text run at (640,75) width 93: "14-"
+          RenderText {#text} at (205,105) size 262x43
+            text run at (205,105) width 262: "should be aligned"
+        RenderText {#text} at (467,122) size 5x22
+          text run at (467,122) width 5: " "
+        RenderImage {IMG} at (472,122) size 10x35
+        RenderText {#text} at (482,122) size 123x22
+          text run at (482,122) width 123: " with the top of "
+        RenderImage {IMG} at (605,122) size 9x30
+        RenderText {#text} at (614,122) size 5x22
+          text run at (614,122) width 5: " "
+        RenderInline {SPAN} at (0,0) size 731x144
+          RenderText {#text} at (619,114) size 19x32
+            text run at (619,114) width 19: "a "
+          RenderInline {SPAN} at (0,0) size 731x194
+            RenderText {#text} at (638,75) size 731x194
+              text run at (638,75) width 93: "14-"
               text run at (0,187) width 143: "point"
           RenderText {#text} at (143,226) size 144x32
             text run at (143,226) width 144: " text element"
@@ -205,15 +205,15 @@ layer at (0,0) size 785x4407
             text run at (312,237) width 189: "regardless of the line in which"
         RenderText {#text} at (501,234) size 5x22
           text run at (501,234) width 5: " "
-        RenderImage {IMG} at (506,234) size 5x15
-        RenderText {#text} at (511,234) size 5x22
-          text run at (511,234) width 5: " "
+        RenderImage {IMG} at (506,234) size 4x15
+        RenderText {#text} at (510,234) size 5x22
+          text run at (510,234) width 5: " "
         RenderInline {BIG} at (0,0) size 156x24
-          RenderText {#text} at (516,232) size 156x24
-            text run at (516,232) width 156: "the images appear."
-        RenderText {#text} at (672,234) size 5x22
-          text run at (672,234) width 5: " "
-        RenderImage {IMG} at (677,234) size 27x90
+          RenderText {#text} at (515,232) size 156x24
+            text run at (515,232) width 156: "the images appear."
+        RenderText {#text} at (671,234) size 5x22
+          text run at (671,234) width 5: " "
+        RenderImage {IMG} at (676,234) size 27x90
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,1784) size 769x36
         RenderText {#text} at (0,0) size 749x36
@@ -245,28 +245,28 @@ layer at (0,0) size 785x4407
         RenderText {#text} at (696,22) size 732x94
           text run at (696,22) width 36: " all of"
           text run at (0,98) width 43: "which "
-        RenderImage {IMG} at (43,77) size 20x65
-        RenderText {#text} at (63,98) size 119x18
-          text run at (63,98) width 119: " should be aligned "
-        RenderImage {IMG} at (182,92) size 11x35
-        RenderText {#text} at (193,98) size 4x18
-          text run at (193,98) width 4: " "
+        RenderImage {IMG} at (43,77) size 19x65
+        RenderText {#text} at (62,98) size 119x18
+          text run at (62,98) width 119: " should be aligned "
+        RenderImage {IMG} at (181,92) size 10x35
+        RenderText {#text} at (191,98) size 4x18
+          text run at (191,98) width 4: " "
         RenderInline {SPAN} at (0,0) size 236x37
-          RenderText {#text} at (197,83) size 236x37
-            text run at (197,83) width 236: "with the middle of"
-        RenderText {#text} at (433,98) size 4x18
-          text run at (433,98) width 4: " "
-        RenderImage {IMG} at (437,84) size 15x50
-        RenderText {#text} at (452,98) size 4x18
-          text run at (452,98) width 4: " "
-        RenderInline {SPAN} at (0,0) size 720x106
-          RenderText {#text} at (456,90) size 17x28
-            text run at (456,90) width 17: "a "
+          RenderText {#text} at (195,83) size 236x37
+            text run at (195,83) width 236: "with the middle of"
+        RenderText {#text} at (431,98) size 4x18
+          text run at (431,98) width 4: " "
+        RenderImage {IMG} at (435,84) size 15x50
+        RenderText {#text} at (450,98) size 4x18
+          text run at (450,98) width 4: " "
+        RenderInline {SPAN} at (0,0) size 718x106
+          RenderText {#text} at (454,90) size 17x28
+            text run at (454,90) width 17: "a "
           RenderInline {SPAN} at (0,0) size 204x69
-            RenderText {#text} at (473,58) size 204x69
-              text run at (473,58) width 204: "14-point"
-          RenderText {#text} at (677,90) size 720x106
-            text run at (677,90) width 43: " text"
+            RenderText {#text} at (471,58) size 204x69
+              text run at (471,58) width 204: "14-point"
+          RenderText {#text} at (675,90) size 718x106
+            text run at (675,90) width 43: " text"
             text run at (0,168) width 78: "element"
         RenderText {#text} at (78,176) size 4x18
           text run at (78,176) width 4: " "
@@ -278,15 +278,15 @@ layer at (0,0) size 785x4407
             text run at (101,176) width 189: "regardless of the line in which"
         RenderText {#text} at (290,176) size 4x18
           text run at (290,176) width 4: " "
-        RenderImage {IMG} at (294,180) size 5x15
-        RenderText {#text} at (299,176) size 4x18
-          text run at (299,176) width 4: " "
+        RenderImage {IMG} at (294,180) size 4x15
+        RenderText {#text} at (298,176) size 4x18
+          text run at (298,176) width 4: " "
         RenderInline {BIG} at (0,0) size 156x24
-          RenderText {#text} at (303,171) size 156x24
-            text run at (303,171) width 156: "the images appear."
-        RenderText {#text} at (459,176) size 4x18
-          text run at (459,176) width 4: " "
-        RenderImage {IMG} at (463,142) size 27x90
+          RenderText {#text} at (302,171) size 156x24
+            text run at (302,171) width 156: "the images appear."
+        RenderText {#text} at (458,176) size 4x18
+          text run at (458,176) width 4: " "
+        RenderImage {IMG} at (462,142) size 27x90
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,2084) size 769x36
         RenderText {#text} at (0,0) size 733x36
@@ -340,36 +340,36 @@ layer at (0,0) size 785x4407
             text run at (71,46) width 75: "all of which"
         RenderText {#text} at (146,46) size 4x18
           text run at (146,46) width 4: " "
-        RenderImage {IMG} at (150,46) size 20x65
-        RenderText {#text} at (170,46) size 4x18
-          text run at (170,46) width 4: " "
+        RenderImage {IMG} at (150,46) size 19x65
+        RenderText {#text} at (169,46) size 4x18
+          text run at (169,46) width 4: " "
         RenderInline {SPAN} at (0,0) size 111x18
-          RenderText {#text} at (174,46) size 111x18
-            text run at (174,46) width 111: "should be aligned"
-        RenderText {#text} at (285,46) size 4x18
-          text run at (285,46) width 4: " "
-        RenderImage {IMG} at (289,46) size 11x35
-        RenderText {#text} at (300,46) size 4x18
-          text run at (300,46) width 4: " "
+          RenderText {#text} at (173,46) size 111x18
+            text run at (173,46) width 111: "should be aligned"
+        RenderText {#text} at (284,46) size 4x18
+          text run at (284,46) width 4: " "
+        RenderImage {IMG} at (288,46) size 10x35
+        RenderText {#text} at (298,46) size 4x18
+          text run at (298,46) width 4: " "
         RenderInline {SPAN} at (0,0) size 188x37
-          RenderText {#text} at (304,46) size 188x37
-            text run at (304,46) width 188: "with the top of"
-        RenderText {#text} at (492,46) size 4x18
-          text run at (492,46) width 4: " "
-        RenderImage {IMG} at (496,46) size 15x50
-        RenderText {#text} at (511,46) size 4x18
-          text run at (511,46) width 4: " "
+          RenderText {#text} at (302,46) size 188x37
+            text run at (302,46) width 188: "with the top of"
+        RenderText {#text} at (490,46) size 4x18
+          text run at (490,46) width 4: " "
+        RenderImage {IMG} at (494,46) size 15x50
+        RenderText {#text} at (509,46) size 4x18
+          text run at (509,46) width 4: " "
         RenderInline {SPAN} at (0,0) size 128x18
-          RenderText {#text} at (515,46) size 128x18
-            text run at (515,46) width 128: "the tallest element in"
-        RenderText {#text} at (643,46) size 4x18
-          text run at (643,46) width 4: " "
-        RenderImage {IMG} at (647,46) size 5x15
-        RenderText {#text} at (652,46) size 4x18
-          text run at (652,46) width 4: " "
-        RenderInline {BIG} at (0,0) size 744x89
-          RenderText {#text} at (656,46) size 744x89
-            text run at (656,46) width 88: "whichever"
+          RenderText {#text} at (513,46) size 128x18
+            text run at (513,46) width 128: "the tallest element in"
+        RenderText {#text} at (641,46) size 4x18
+          text run at (641,46) width 4: " "
+        RenderImage {IMG} at (645,46) size 4x15
+        RenderText {#text} at (649,46) size 4x18
+          text run at (649,46) width 4: " "
+        RenderInline {BIG} at (0,0) size 741x89
+          RenderText {#text} at (653,46) size 741x89
+            text run at (653,46) width 88: "whichever"
             text run at (0,111) width 208: "line the elements appear."
         RenderText {#text} at (208,111) size 4x18
           text run at (208,111) width 4: " "
@@ -516,26 +516,26 @@ layer at (0,0) size 785x4407
                 RenderImage {IMG} at (74,122) size 6x20
                 RenderText {#text} at (80,122) size 101x22
                   text run at (80,122) width 101: " all of which "
-                RenderImage {IMG} at (181,122) size 20x65
-                RenderText {#text} at (201,122) size 5x22
-                  text run at (201,122) width 5: " "
+                RenderImage {IMG} at (181,122) size 19x65
+                RenderText {#text} at (200,122) size 5x22
+                  text run at (200,122) width 5: " "
                 RenderInline {SPAN} at (0,0) size 262x43
-                  RenderText {#text} at (206,105) size 262x43
-                    text run at (206,105) width 262: "should be aligned"
-                RenderText {#text} at (468,122) size 5x22
-                  text run at (468,122) width 5: " "
-                RenderImage {IMG} at (473,122) size 11x35
-                RenderText {#text} at (484,122) size 123x22
-                  text run at (484,122) width 123: " with the top of "
-                RenderImage {IMG} at (607,122) size 9x30
-                RenderText {#text} at (616,122) size 5x22
-                  text run at (616,122) width 5: " "
-                RenderInline {SPAN} at (0,0) size 733x144
-                  RenderText {#text} at (621,114) size 19x32
-                    text run at (621,114) width 19: "a "
-                  RenderInline {SPAN} at (0,0) size 733x194
-                    RenderText {#text} at (640,75) size 733x194
-                      text run at (640,75) width 93: "14-"
+                  RenderText {#text} at (205,105) size 262x43
+                    text run at (205,105) width 262: "should be aligned"
+                RenderText {#text} at (467,122) size 5x22
+                  text run at (467,122) width 5: " "
+                RenderImage {IMG} at (472,122) size 10x35
+                RenderText {#text} at (482,122) size 123x22
+                  text run at (482,122) width 123: " with the top of "
+                RenderImage {IMG} at (605,122) size 9x30
+                RenderText {#text} at (614,122) size 5x22
+                  text run at (614,122) width 5: " "
+                RenderInline {SPAN} at (0,0) size 731x144
+                  RenderText {#text} at (619,114) size 19x32
+                    text run at (619,114) width 19: "a "
+                  RenderInline {SPAN} at (0,0) size 731x194
+                    RenderText {#text} at (638,75) size 731x194
+                      text run at (638,75) width 93: "14-"
                       text run at (0,187) width 143: "point"
                   RenderText {#text} at (143,226) size 144x32
                     text run at (143,226) width 144: " text element"
@@ -549,15 +549,15 @@ layer at (0,0) size 785x4407
                     text run at (312,237) width 189: "regardless of the line in which"
                 RenderText {#text} at (501,234) size 5x22
                   text run at (501,234) width 5: " "
-                RenderImage {IMG} at (506,234) size 5x15
-                RenderText {#text} at (511,234) size 5x22
-                  text run at (511,234) width 5: " "
+                RenderImage {IMG} at (506,234) size 4x15
+                RenderText {#text} at (510,234) size 5x22
+                  text run at (510,234) width 5: " "
                 RenderInline {BIG} at (0,0) size 156x24
-                  RenderText {#text} at (516,232) size 156x24
-                    text run at (516,232) width 156: "the images appear."
-                RenderText {#text} at (672,234) size 5x22
-                  text run at (672,234) width 5: " "
-                RenderImage {IMG} at (677,234) size 27x90
+                  RenderText {#text} at (515,232) size 156x24
+                    text run at (515,232) width 156: "the images appear."
+                RenderText {#text} at (671,234) size 5x22
+                  text run at (671,234) width 5: " "
+                RenderImage {IMG} at (676,234) size 27x90
                 RenderText {#text} at (0,0) size 0x0
               RenderBlock {P} at (4,1453) size 747x36
                 RenderText {#text} at (0,0) size 730x36
@@ -589,28 +589,28 @@ layer at (0,0) size 785x4407
                 RenderText {#text} at (696,22) size 732x94
                   text run at (696,22) width 36: " all of"
                   text run at (0,98) width 43: "which "
-                RenderImage {IMG} at (43,77) size 20x65
-                RenderText {#text} at (63,98) size 119x18
-                  text run at (63,98) width 119: " should be aligned "
-                RenderImage {IMG} at (182,92) size 11x35
-                RenderText {#text} at (193,98) size 4x18
-                  text run at (193,98) width 4: " "
+                RenderImage {IMG} at (43,77) size 19x65
+                RenderText {#text} at (62,98) size 119x18
+                  text run at (62,98) width 119: " should be aligned "
+                RenderImage {IMG} at (181,92) size 10x35
+                RenderText {#text} at (191,98) size 4x18
+                  text run at (191,98) width 4: " "
                 RenderInline {SPAN} at (0,0) size 236x37
-                  RenderText {#text} at (197,83) size 236x37
-                    text run at (197,83) width 236: "with the middle of"
-                RenderText {#text} at (433,98) size 4x18
-                  text run at (433,98) width 4: " "
-                RenderImage {IMG} at (437,84) size 15x50
-                RenderText {#text} at (452,98) size 4x18
-                  text run at (452,98) width 4: " "
-                RenderInline {SPAN} at (0,0) size 720x106
-                  RenderText {#text} at (456,90) size 17x28
-                    text run at (456,90) width 17: "a "
+                  RenderText {#text} at (195,83) size 236x37
+                    text run at (195,83) width 236: "with the middle of"
+                RenderText {#text} at (431,98) size 4x18
+                  text run at (431,98) width 4: " "
+                RenderImage {IMG} at (435,84) size 15x50
+                RenderText {#text} at (450,98) size 4x18
+                  text run at (450,98) width 4: " "
+                RenderInline {SPAN} at (0,0) size 718x106
+                  RenderText {#text} at (454,90) size 17x28
+                    text run at (454,90) width 17: "a "
                   RenderInline {SPAN} at (0,0) size 204x69
-                    RenderText {#text} at (473,58) size 204x69
-                      text run at (473,58) width 204: "14-point"
-                  RenderText {#text} at (677,90) size 720x106
-                    text run at (677,90) width 43: " text"
+                    RenderText {#text} at (471,58) size 204x69
+                      text run at (471,58) width 204: "14-point"
+                  RenderText {#text} at (675,90) size 718x106
+                    text run at (675,90) width 43: " text"
                     text run at (0,168) width 78: "element"
                 RenderText {#text} at (78,176) size 4x18
                   text run at (78,176) width 4: " "
@@ -622,15 +622,15 @@ layer at (0,0) size 785x4407
                     text run at (101,176) width 189: "regardless of the line in which"
                 RenderText {#text} at (290,176) size 4x18
                   text run at (290,176) width 4: " "
-                RenderImage {IMG} at (294,180) size 5x15
-                RenderText {#text} at (299,176) size 4x18
-                  text run at (299,176) width 4: " "
+                RenderImage {IMG} at (294,180) size 4x15
+                RenderText {#text} at (298,176) size 4x18
+                  text run at (298,176) width 4: " "
                 RenderInline {BIG} at (0,0) size 156x24
-                  RenderText {#text} at (303,171) size 156x24
-                    text run at (303,171) width 156: "the images appear."
-                RenderText {#text} at (459,176) size 4x18
-                  text run at (459,176) width 4: " "
-                RenderImage {IMG} at (463,142) size 27x90
+                  RenderText {#text} at (302,171) size 156x24
+                    text run at (302,171) width 156: "the images appear."
+                RenderText {#text} at (458,176) size 4x18
+                  text run at (458,176) width 4: " "
+                RenderImage {IMG} at (462,142) size 27x90
                 RenderText {#text} at (0,0) size 0x0
               RenderBlock {P} at (4,1753) size 747x36
                 RenderText {#text} at (0,0) size 733x36
@@ -684,36 +684,36 @@ layer at (0,0) size 785x4407
                     text run at (71,46) width 75: "all of which"
                 RenderText {#text} at (146,46) size 4x18
                   text run at (146,46) width 4: " "
-                RenderImage {IMG} at (150,46) size 20x65
-                RenderText {#text} at (170,46) size 4x18
-                  text run at (170,46) width 4: " "
+                RenderImage {IMG} at (150,46) size 19x65
+                RenderText {#text} at (169,46) size 4x18
+                  text run at (169,46) width 4: " "
                 RenderInline {SPAN} at (0,0) size 111x18
-                  RenderText {#text} at (174,46) size 111x18
-                    text run at (174,46) width 111: "should be aligned"
-                RenderText {#text} at (285,46) size 4x18
-                  text run at (285,46) width 4: " "
-                RenderImage {IMG} at (289,46) size 11x35
-                RenderText {#text} at (300,46) size 4x18
-                  text run at (300,46) width 4: " "
+                  RenderText {#text} at (173,46) size 111x18
+                    text run at (173,46) width 111: "should be aligned"
+                RenderText {#text} at (284,46) size 4x18
+                  text run at (284,46) width 4: " "
+                RenderImage {IMG} at (288,46) size 10x35
+                RenderText {#text} at (298,46) size 4x18
+                  text run at (298,46) width 4: " "
                 RenderInline {SPAN} at (0,0) size 188x37
-                  RenderText {#text} at (304,46) size 188x37
-                    text run at (304,46) width 188: "with the top of"
-                RenderText {#text} at (492,46) size 4x18
-                  text run at (492,46) width 4: " "
-                RenderImage {IMG} at (496,46) size 15x50
-                RenderText {#text} at (511,46) size 4x18
-                  text run at (511,46) width 4: " "
+                  RenderText {#text} at (302,46) size 188x37
+                    text run at (302,46) width 188: "with the top of"
+                RenderText {#text} at (490,46) size 4x18
+                  text run at (490,46) width 4: " "
+                RenderImage {IMG} at (494,46) size 15x50
+                RenderText {#text} at (509,46) size 4x18
+                  text run at (509,46) width 4: " "
                 RenderInline {SPAN} at (0,0) size 128x18
-                  RenderText {#text} at (515,46) size 128x18
-                    text run at (515,46) width 128: "the tallest element in"
-                RenderText {#text} at (643,46) size 4x18
-                  text run at (643,46) width 4: " "
-                RenderImage {IMG} at (647,46) size 5x15
-                RenderText {#text} at (652,46) size 4x18
-                  text run at (652,46) width 4: " "
-                RenderInline {BIG} at (0,0) size 744x89
-                  RenderText {#text} at (656,46) size 744x89
-                    text run at (656,46) width 88: "whichever"
+                  RenderText {#text} at (513,46) size 128x18
+                    text run at (513,46) width 128: "the tallest element in"
+                RenderText {#text} at (641,46) size 4x18
+                  text run at (641,46) width 4: " "
+                RenderImage {IMG} at (645,46) size 4x15
+                RenderText {#text} at (649,46) size 4x18
+                  text run at (649,46) width 4: " "
+                RenderInline {BIG} at (0,0) size 741x89
+                  RenderText {#text} at (653,46) size 741x89
+                    text run at (653,46) width 88: "whichever"
                     text run at (0,111) width 208: "line the elements appear."
                 RenderText {#text} at (208,111) size 4x18
                   text run at (208,111) width 4: " "
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-001-expected.png b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-001-expected.png
deleted file mode 100644 (file)
index 9eb53c1..0000000
Binary files a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-001-expected.txt b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-001-expected.txt
deleted file mode 100644 (file)
index 5eef9ad..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x306
-  RenderBlock {HTML} at (0,0) size 800x306
-    RenderBody {BODY} at (8,16) size 784x282
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x18
-          text run at (0,0) width 316: "There must be two green boxes below and no red."
-layer at (16,50) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
-layer at (26,60) size 80x100
-  RenderBlock (positioned) {DIV} at (10,10) size 80x100 [bgcolor=#FF0000]
-layer at (16,50) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (16,178) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000]
-layer at (16,178) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (26,188) size 80x100
-  RenderBlock (positioned) {DIV} at (10,10) size 80x100
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-002-expected.png b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-002-expected.png
deleted file mode 100644 (file)
index 9eb53c1..0000000
Binary files a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-002-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-002-expected.txt b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-002-expected.txt
deleted file mode 100644 (file)
index fd98144..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x306
-  RenderBlock {HTML} at (0,0) size 800x306
-    RenderBody {BODY} at (8,16) size 784x282
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x18
-          text run at (0,0) width 316: "There must be two green boxes below and no red."
-layer at (16,50) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
-layer at (26,60) size 60x100
-  RenderBlock (positioned) {DIV} at (10,10) size 60x100 [bgcolor=#FF0000]
-layer at (16,50) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (16,178) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000]
-layer at (16,178) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (26,188) size 60x100
-  RenderBlock (positioned) {DIV} at (10,10) size 60x100
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-003-expected.png b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-003-expected.png
deleted file mode 100644 (file)
index 9eb53c1..0000000
Binary files a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-003-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-003-expected.txt b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-003-expected.txt
deleted file mode 100644 (file)
index 193ccac..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x306
-  RenderBlock {HTML} at (0,0) size 800x306
-    RenderBody {BODY} at (8,16) size 784x282
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x18
-          text run at (0,0) width 316: "There must be two green boxes below and no red."
-layer at (16,50) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
-layer at (26,60) size 80x60
-  RenderBlock (positioned) {DIV} at (10,10) size 80x60 [bgcolor=#FF0000]
-layer at (16,50) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (16,178) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000]
-layer at (16,178) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (26,188) size 80x60
-  RenderBlock (positioned) {DIV} at (10,10) size 80x60
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-004-expected.png b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-004-expected.png
deleted file mode 100644 (file)
index 4140a72..0000000
Binary files a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-004-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-004-expected.txt b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-004-expected.txt
deleted file mode 100644 (file)
index 128e29b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x306
-  RenderBlock {HTML} at (0,0) size 800x306
-    RenderBody {BODY} at (8,16) size 784x282
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x18
-          text run at (0,0) width 316: "There must be two green boxes below and no red."
-layer at (16,50) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
-layer at (26,60) size 66x100
-  RenderBlock (positioned) {DIV} at (10,10) size 66x100 [bgcolor=#FF0000]
-layer at (16,50) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (16,178) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000]
-layer at (16,178) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (26,188) size 67x100
-  RenderBlock (positioned) {DIV} at (10,10) size 67x100
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-005-expected.png b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-005-expected.png
deleted file mode 100644 (file)
index 2a8bedc..0000000
Binary files a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-005-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-005-expected.txt b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-005-expected.txt
deleted file mode 100644 (file)
index f27a023..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x306
-  RenderBlock {HTML} at (0,0) size 800x306
-    RenderBody {BODY} at (8,16) size 784x282
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x18
-          text run at (0,0) width 316: "There must be two green boxes below and no red."
-layer at (16,50) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
-layer at (26,60) size 80x53
-  RenderBlock (positioned) {DIV} at (10,10) size 80x53 [bgcolor=#FF0000]
-layer at (16,50) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (16,178) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000]
-layer at (16,178) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (26,188) size 80x54
-  RenderBlock (positioned) {DIV} at (10,10) size 80x54
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-006-expected.png b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-006-expected.png
deleted file mode 100644 (file)
index 9eb53c1..0000000
Binary files a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-006-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-006-expected.txt b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-006-expected.txt
deleted file mode 100644 (file)
index b86448a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x306
-  RenderBlock {HTML} at (0,0) size 800x306
-    RenderBody {BODY} at (8,16) size 784x282
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x18
-          text run at (0,0) width 316: "There must be two green boxes below and no red."
-layer at (16,50) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
-layer at (26,60) size 32x60
-  RenderBlock (positioned) {DIV} at (10,10) size 32x60 [bgcolor=#FF0000]
-layer at (16,50) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (16,178) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000]
-layer at (16,178) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (26,188) size 32x60
-  RenderBlock (positioned) {DIV} at (10,10) size 32x60
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-007-expected.png b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-007-expected.png
deleted file mode 100644 (file)
index 9eb53c1..0000000
Binary files a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-007-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-007-expected.txt b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-007-expected.txt
deleted file mode 100644 (file)
index 8130712..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x306
-  RenderBlock {HTML} at (0,0) size 800x306
-    RenderBody {BODY} at (8,16) size 784x282
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x18
-          text run at (0,0) width 316: "There must be two green boxes below and no red."
-layer at (16,50) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
-layer at (26,60) size 40x60
-  RenderBlock (positioned) {DIV} at (10,10) size 40x60 [bgcolor=#FF0000]
-layer at (16,50) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (16,178) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000]
-layer at (16,178) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (26,188) size 40x60
-  RenderBlock (positioned) {DIV} at (10,10) size 40x60
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-008-expected.png b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-008-expected.png
deleted file mode 100644 (file)
index 9eb53c1..0000000
Binary files a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-008-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-008-expected.txt b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-008-expected.txt
deleted file mode 100644 (file)
index 8130712..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x306
-  RenderBlock {HTML} at (0,0) size 800x306
-    RenderBody {BODY} at (8,16) size 784x282
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x18
-          text run at (0,0) width 316: "There must be two green boxes below and no red."
-layer at (16,50) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
-layer at (26,60) size 40x60
-  RenderBlock (positioned) {DIV} at (10,10) size 40x60 [bgcolor=#FF0000]
-layer at (16,50) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (16,178) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000]
-layer at (16,178) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (26,188) size 40x60
-  RenderBlock (positioned) {DIV} at (10,10) size 40x60
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-009-expected.png b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-009-expected.png
deleted file mode 100644 (file)
index 9eb53c1..0000000
Binary files a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-009-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-009-expected.txt b/LayoutTests/platform/mac/css2.1/20110323/background-intrinsic-009-expected.txt
deleted file mode 100644 (file)
index 8130712..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x306
-  RenderBlock {HTML} at (0,0) size 800x306
-    RenderBody {BODY} at (8,16) size 784x282
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x18
-          text run at (0,0) width 316: "There must be two green boxes below and no red."
-layer at (16,50) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
-layer at (26,60) size 40x60
-  RenderBlock (positioned) {DIV} at (10,10) size 40x60 [bgcolor=#FF0000]
-layer at (16,50) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (16,178) size 120x120
-  RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000]
-layer at (16,178) size 100x120
-  RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)]
-layer at (26,188) size 40x60
-  RenderBlock (positioned) {DIV} at (10,10) size 40x60
index ea3f98aa9bc9cff5da65b923d7e924d9ec227365..14602030d3632f06e73a4d606281da25825ab0fd 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-expected.png and b/LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.png b/LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.png
deleted file mode 100644 (file)
index 052ec47..0000000
Binary files a/LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.txt b/LayoutTests/platform/mac/fast/backgrounds/size/contain-and-cover-zoomed-expected.txt
deleted file mode 100644 (file)
index 8fba2ce..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x264
-  RenderBlock {HTML} at (0,0) size 800x264
-    RenderBody {BODY} at (0,0) size 800x0
-      RenderBlock (floating) {DIV} at (1,1) size 231x87 [bgcolor=#ADD8E6] [border: (3px solid #000000)]
-      RenderBlock (floating) {DIV} at (234,1) size 231x87 [bgcolor=#ADD8E6] [border: (3px solid #000000)]
-      RenderBlock (floating) {DIV} at (467,1) size 231x87 [bgcolor=#ADD8E6] [border: (3px solid #000000)]
-      RenderBlock (floating) {DIV} at (1,90) size 231x87 [bgcolor=#ADD8E6] [border: (3px solid #000000)]
-      RenderBlock (floating) {DIV} at (234,90) size 115x173 [bgcolor=#ADD8E6] [border: (3px solid #000000)]
-      RenderBlock (floating) {DIV} at (351,90) size 115x173 [bgcolor=#ADD8E6] [border: (3px solid #000000)]
-      RenderBlock (floating) {DIV} at (468,90) size 115x173 [bgcolor=#ADD8E6] [border: (3px solid #000000)]
-      RenderBlock (floating) {DIV} at (585,90) size 115x173 [bgcolor=#ADD8E6] [border: (3px solid #000000)]
index f808b0ad8123620f083b6ba44f4f407bdd797702..110cfdbded77076542619aab2407d4f10c630a8d 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/block/float/015-expected.png and b/LayoutTests/platform/mac/fast/block/float/015-expected.png differ
index 50f8641405c0f8fe2b41f226fd2ed3062523a75a..1c9215839fa3983a6ac526d255713a0f2cc24ffd 100644 (file)
@@ -10,13 +10,13 @@ layer at (0,0) size 800x600
               RenderText {#text} at (4,4) size 4x18
                 text run at (4,4) width 4: " "
             RenderTableCell {TD} at (12,0) size 657x128 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderImage {IMG} at (4,4) size 50x50 [bgcolor=#FFA500]
+              RenderImage {IMG} at (4,4) size 49x50 [bgcolor=#FFA500]
               RenderBlock {P} at (4,4) size 649x18
-                RenderText {#text} at (53,0) size 595x18
-                  text run at (53,0) width 595: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
+                RenderText {#text} at (52,0) size 595x18
+                  text run at (52,0) width 595: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
               RenderBlock {DIV} at (4,38) size 649x18 [bgcolor=#008000]
-                RenderBR {BR} at (53,0) size 0x18
-              RenderImage {IMG} at (4,56) size 50x50 [bgcolor=#FFA500]
+                RenderBR {BR} at (52,0) size 0x18
+              RenderImage {IMG} at (4,56) size 49x50 [bgcolor=#FFA500]
               RenderBlock {DIV} at (4,106) size 649x18
                 RenderText {#text} at (0,0) size 649x18
                   text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it."
index f8b4de9c9e8a53cfdf13279777e4bae684aaaf41..bbd94ae0991ac2b10e9672c182aa731a27d0234e 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.png and b/LayoutTests/platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.png differ
index 16f3d7edfc722d34932742975ac0930f458db568..e55ee0941546c9530cf4ac5ccd7b41325d999f1a 100644 (file)
@@ -7,6 +7,6 @@ layer at (50,100) size 700x400
   RenderBlock (positioned) {DIV} at (50,100) size 700x400 [border: (1px solid #808080)]
 layer at (51,140) size 560x320
   RenderBlock (positioned) {DIV} at (1,40) size 560x320 [border: (1px solid #FF0000)]
-    RenderImage {IMG} at (1,1) size 393x318
+    RenderImage {IMG} at (1,1) size 392x318
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
index c140a73386668578216d4674b9e4eb883e328e6e..76549795eeefdd0eee85bee70dbb69186647190c 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.png and b/LayoutTests/platform/mac/fast/repaint/block-layout-inline-children-replaced-expected.png differ
index 11ff3bdcb93208533d8b46f3a79694f7d8ccf9df..cc268c63f385d8e5453b793643103e7faabaa79b 100644 (file)
@@ -11,4 +11,4 @@ layer at (0,0) size 800x600
             text run at (220,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=40142"
       RenderBlock {DIV} at (0,34) size 800x152
         RenderBlock {DIV} at (0,0) size 402x152 [border: (1px solid #DDDDDD)]
-          RenderImage {IMG} at (155,1) size 93x100
+          RenderImage {IMG} at (155,1) size 92x100
diff --git a/LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png b/LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
deleted file mode 100644 (file)
index 67b2629..0000000
Binary files a/LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.txt b/LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.txt
deleted file mode 100644 (file)
index 5a2870b..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x504
-  RenderBlock {HTML} at (0,0) size 800x504
-    RenderBody {BODY} at (8,8) size 784x488
-      RenderTable {TABLE} at (0,0) size 670x488
-        RenderTableSection {TBODY} at (0,0) size 670x488
-          RenderTableRow {TR} at (0,2) size 670x20
-            RenderTableCell {TH} at (2,2) size 93x20 [bgcolor=#DDDD99] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (9,1) size 75x18
-                text run at (9,1) width 75: "viewBox?"
-            RenderTableCell {TH} at (97,2) size 163x20 [bgcolor=#DDDD99] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 161x18
-                text run at (1,1) width 161: "preserve\x{AD}Aspect\x{AD}Ratio"
-            RenderTableCell {TH} at (262,2) size 202x20 [bgcolor=#DDDD99] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (78,1) size 46x18
-                text run at (78,1) width 46: "<img>"
-            RenderTableCell {TH} at (466,2) size 202x20 [bgcolor=#DDDD99] [r=0 c=3 rs=1 cs=1]
-              RenderText {#text} at (80,1) size 42x18
-                text run at (80,1) width 42: "<div>"
-          RenderTableRow {TR} at (0,24) size 670x56
-            RenderTableCell {TH} at (2,129) size 93x20 [bgcolor=#DDDD99] [r=1 c=0 rs=4 cs=1]
-              RenderText {#text} at (1,1) size 91x18
-                text run at (1,1) width 91: "No viewBox"
-            RenderTableCell {TH} at (97,51) size 163x2 [bgcolor=#DDDD99] [r=1 c=1 rs=1 cs=1]
-            RenderTableCell {TD} at (262,24) size 202x56 [r=1 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,26) size 202x52 [r=1 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 200x50 [border: (2px dashed #800000)]
-          RenderTableRow {TR} at (0,82) size 670x56
-            RenderTableCell {TH} at (97,100) size 163x20 [bgcolor=#DDDD99] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (62,1) size 39x18
-                text run at (62,1) width 39: "none"
-            RenderTableCell {TD} at (262,82) size 202x56 [r=2 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,84) size 202x52 [r=2 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 200x50 [border: (2px dashed #800000)]
-          RenderTableRow {TR} at (0,140) size 670x56
-            RenderTableCell {TH} at (97,158) size 163x20 [bgcolor=#DDDD99] [r=3 c=1 rs=1 cs=1]
-              RenderText {#text} at (63,1) size 37x18
-                text run at (63,1) width 37: "meet"
-            RenderTableCell {TD} at (262,140) size 202x56 [r=3 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,142) size 202x52 [r=3 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 200x50 [border: (2px dashed #800000)]
-          RenderTableRow {TR} at (0,198) size 670x56
-            RenderTableCell {TH} at (97,216) size 163x20 [bgcolor=#DDDD99] [r=4 c=1 rs=1 cs=1]
-              RenderText {#text} at (64,1) size 35x18
-                text run at (64,1) width 35: "slice"
-            RenderTableCell {TD} at (262,198) size 202x56 [r=4 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,200) size 202x52 [r=4 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 200x50 [border: (2px dashed #800000)]
-          RenderTableRow {TR} at (0,256) size 670x56
-            RenderTableCell {TH} at (2,361) size 93x20 [bgcolor=#DDDD99] [r=5 c=0 rs=4 cs=1]
-              RenderText {#text} at (14,1) size 65x18
-                text run at (14,1) width 65: "viewBox"
-            RenderTableCell {TH} at (97,283) size 163x2 [bgcolor=#DDDD99] [r=5 c=1 rs=1 cs=1]
-            RenderTableCell {TD} at (262,256) size 202x56 [r=5 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,258) size 202x52 [r=5 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 200x50 [border: (2px dashed #800000)]
-          RenderTableRow {TR} at (0,314) size 670x56
-            RenderTableCell {TH} at (97,332) size 163x20 [bgcolor=#DDDD99] [r=6 c=1 rs=1 cs=1]
-              RenderText {#text} at (62,1) size 39x18
-                text run at (62,1) width 39: "none"
-            RenderTableCell {TD} at (262,314) size 202x56 [r=6 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,316) size 202x52 [r=6 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 200x50 [border: (2px dashed #800000)]
-          RenderTableRow {TR} at (0,372) size 670x56
-            RenderTableCell {TH} at (97,390) size 163x20 [bgcolor=#DDDD99] [r=7 c=1 rs=1 cs=1]
-              RenderText {#text} at (63,1) size 37x18
-                text run at (63,1) width 37: "meet"
-            RenderTableCell {TD} at (262,372) size 202x56 [r=7 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,374) size 202x52 [r=7 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 200x50 [border: (2px dashed #800000)]
-          RenderTableRow {TR} at (0,430) size 670x56
-            RenderTableCell {TH} at (97,448) size 163x20 [bgcolor=#DDDD99] [r=8 c=1 rs=1 cs=1]
-              RenderText {#text} at (64,1) size 35x18
-                text run at (64,1) width 35: "slice"
-            RenderTableCell {TD} at (262,430) size 202x56 [r=8 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,432) size 202x52 [r=8 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 200x50 [border: (2px dashed #800000)]
diff --git a/LayoutTests/platform/mac/svg/as-background-image/background-image-tiled-expected.png b/LayoutTests/platform/mac/svg/as-background-image/background-image-tiled-expected.png
deleted file mode 100644 (file)
index a16cb01..0000000
Binary files a/LayoutTests/platform/mac/svg/as-background-image/background-image-tiled-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/as-background-image/background-image-tiled-expected.txt b/LayoutTests/platform/mac/svg/as-background-image/background-image-tiled-expected.txt
deleted file mode 100644 (file)
index 1986e1f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x118
-  RenderBlock {HTML} at (0,0) size 800x118
-    RenderBody {BODY} at (8,8) size 784x102
-      RenderBlock {DIV} at (0,0) size 786x102 [border: (1px solid #CCCCCC)]
diff --git a/LayoutTests/platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.png b/LayoutTests/platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.png
deleted file mode 100644 (file)
index 67d5850..0000000
Binary files a/LayoutTests/platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.txt b/LayoutTests/platform/mac/svg/as-background-image/same-image-two-instances-background-image-expected.txt
deleted file mode 100644 (file)
index 06009a2..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x116
-  RenderBlock {HTML} at (0,0) size 800x116
-    RenderBody {BODY} at (8,8) size 784x100
-      RenderBlock {DIV} at (0,0) size 200x50 [border: (2px dashed #800000)]
-      RenderBlock {DIV} at (0,50) size 200x50 [border: (2px dashed #800000)]
index f8f156accbbcb2ceb1615f696fba648f1f484ce5..be12430796d2d0af031d4b139360efec280d1d30 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-4-expected.png and b/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-4-expected.png differ
index b2a0be3677d0f801dc6217b2a0c702a6c3a806e8..06b951bcc1fc4e8ceb1b983cbe1621acd0d1dc8b 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-expected.png and b/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-expected.png differ
index 6ccf849f3990efbb2a087ff19b10aa7e9f20ee68..c4e50420d8e05b0339cc50d7e6b7a936fd001528 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/as-image/animated-svg-as-image-expected.png and b/LayoutTests/platform/mac/svg/as-image/animated-svg-as-image-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png b/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png
deleted file mode 100644 (file)
index 2e90e65..0000000
Binary files a/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.txt b/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.txt
deleted file mode 100644 (file)
index 1f4b1b9..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x504
-  RenderBlock {HTML} at (0,0) size 800x504
-    RenderBody {BODY} at (8,8) size 784x488
-      RenderTable {TABLE} at (0,0) size 670x488
-        RenderTableSection {TBODY} at (0,0) size 670x488
-          RenderTableRow {TR} at (0,2) size 670x20
-            RenderTableCell {TH} at (2,2) size 93x20 [bgcolor=#DDDD99] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (9,1) size 75x18
-                text run at (9,1) width 75: "viewBox?"
-            RenderTableCell {TH} at (97,2) size 163x20 [bgcolor=#DDDD99] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 161x18
-                text run at (1,1) width 161: "preserve\x{AD}Aspect\x{AD}Ratio"
-            RenderTableCell {TH} at (262,2) size 202x20 [bgcolor=#DDDD99] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (78,1) size 46x18
-                text run at (78,1) width 46: "<img>"
-            RenderTableCell {TH} at (466,2) size 202x20 [bgcolor=#DDDD99] [r=0 c=3 rs=1 cs=1]
-              RenderText {#text} at (68,1) size 66x18
-                text run at (68,1) width 66: "<object>"
-          RenderTableRow {TR} at (0,24) size 670x56
-            RenderTableCell {TH} at (2,129) size 93x20 [bgcolor=#DDDD99] [r=1 c=0 rs=4 cs=1]
-              RenderText {#text} at (1,1) size 91x18
-                text run at (1,1) width 91: "No viewBox"
-            RenderTableCell {TH} at (97,51) size 163x2 [bgcolor=#DDDD99] [r=1 c=1 rs=1 cs=1]
-            RenderTableCell {TD} at (262,24) size 202x56 [r=1 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,24) size 202x56 [r=1 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)]
-                layer at (0,0) size 192x42
-                  RenderView at (0,0) size 192x42
-                layer at (0,0) size 192x42
-                  RenderSVGRoot {svg} at (0,0) size 192x42
-                    RenderSVGPath {circle} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [cx=110.00] [cy=110.00] [r=110.00]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,82) size 670x56
-            RenderTableCell {TH} at (97,100) size 163x20 [bgcolor=#DDDD99] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (62,1) size 39x18
-                text run at (62,1) width 39: "none"
-            RenderTableCell {TD} at (262,82) size 202x56 [r=2 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,82) size 202x56 [r=2 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)]
-                layer at (0,0) size 192x42
-                  RenderView at (0,0) size 192x42
-                layer at (0,0) size 192x42
-                  RenderSVGRoot {svg} at (0,0) size 192x42
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 192x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,140) size 670x56
-            RenderTableCell {TH} at (97,158) size 163x20 [bgcolor=#DDDD99] [r=3 c=1 rs=1 cs=1]
-              RenderText {#text} at (63,1) size 37x18
-                text run at (63,1) width 37: "meet"
-            RenderTableCell {TD} at (262,140) size 202x56 [r=3 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,140) size 202x56 [r=3 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)]
-                layer at (0,0) size 192x42
-                  RenderView at (0,0) size 192x42
-                layer at (0,0) size 192x42
-                  RenderSVGRoot {svg} at (0,0) size 192x42
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 192x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,198) size 670x56
-            RenderTableCell {TH} at (97,216) size 163x20 [bgcolor=#DDDD99] [r=4 c=1 rs=1 cs=1]
-              RenderText {#text} at (64,1) size 35x18
-                text run at (64,1) width 35: "slice"
-            RenderTableCell {TD} at (262,198) size 202x56 [r=4 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,198) size 202x56 [r=4 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)]
-                layer at (0,0) size 192x42
-                  RenderView at (0,0) size 192x42
-                layer at (0,0) size 192x42
-                  RenderSVGRoot {svg} at (0,0) size 192x42
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 192x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 192x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,256) size 670x56
-            RenderTableCell {TH} at (2,361) size 93x20 [bgcolor=#DDDD99] [r=5 c=0 rs=4 cs=1]
-              RenderText {#text} at (14,1) size 65x18
-                text run at (14,1) width 65: "viewBox"
-            RenderTableCell {TH} at (97,283) size 163x2 [bgcolor=#DDDD99] [r=5 c=1 rs=1 cs=1]
-            RenderTableCell {TD} at (262,256) size 202x56 [r=5 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,256) size 202x56 [r=5 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)]
-                layer at (0,0) size 192x42
-                  RenderView at (0,0) size 192x42
-                layer at (0,0) size 192x42
-                  RenderSVGRoot {svg} at (75,0) size 31x31
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (74,0) size 32x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (74,0) size 32x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,314) size 670x56
-            RenderTableCell {TH} at (97,332) size 163x20 [bgcolor=#DDDD99] [r=6 c=1 rs=1 cs=1]
-              RenderText {#text} at (62,1) size 39x18
-                text run at (62,1) width 39: "none"
-            RenderTableCell {TD} at (262,314) size 202x56 [r=6 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,314) size 202x56 [r=6 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)]
-                layer at (0,0) size 192x42
-                  RenderView at (0,0) size 192x42
-                layer at (0,0) size 192x42
-                  RenderSVGRoot {svg} at (0,0) size 140x31
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 141x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 141x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,372) size 670x56
-            RenderTableCell {TH} at (97,390) size 163x20 [bgcolor=#DDDD99] [r=7 c=1 rs=1 cs=1]
-              RenderText {#text} at (63,1) size 37x18
-                text run at (63,1) width 37: "meet"
-            RenderTableCell {TD} at (262,372) size 202x56 [r=7 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,372) size 202x56 [r=7 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)]
-                layer at (0,0) size 192x42
-                  RenderView at (0,0) size 192x42
-                layer at (0,0) size 192x42
-                  RenderSVGRoot {svg} at (75,0) size 31x31
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (74,0) size 32x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (74,0) size 32x31 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,430) size 670x56
-            RenderTableCell {TH} at (97,448) size 163x20 [bgcolor=#DDDD99] [r=8 c=1 rs=1 cs=1]
-              RenderText {#text} at (64,1) size 35x18
-                text run at (64,1) width 35: "slice"
-            RenderTableCell {TD} at (262,430) size 202x56 [r=8 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 200x50 [border: (2px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (466,430) size 202x56 [r=8 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 200x50 [border: (1px dashed #008000)]
-                layer at (0,0) size 192x42
-                  RenderView at (0,0) size 192x42
-                layer at (0,0) size 192x42
-                  RenderSVGRoot {svg} at (0,0) size 140x42
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 141x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 141x42 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/svg/as-image/same-image-two-instances-expected.png b/LayoutTests/platform/mac/svg/as-image/same-image-two-instances-expected.png
deleted file mode 100644 (file)
index bf88125..0000000
Binary files a/LayoutTests/platform/mac/svg/as-image/same-image-two-instances-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/as-image/same-image-two-instances-expected.txt b/LayoutTests/platform/mac/svg/as-image/same-image-two-instances-expected.txt
deleted file mode 100644 (file)
index d7646d0..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x120
-  RenderBlock {HTML} at (0,0) size 800x120
-    RenderBody {BODY} at (8,8) size 784x104
-      RenderImage {IMG} at (0,50) size 200x50 [border: (2px dashed #800000)]
-      RenderText {#text} at (200,86) size 4x18
-        text run at (200,86) width 4: " "
-      RenderImage {IMG} at (204,0) size 100x100 [border: (2px dashed #800000)]
-      RenderText {#text} at (0,0) size 0x0
index a9ffee023e489c35b838b041d497bad3a3f27a8f..022fee5c3baac46f05a99e240e2a0931417ea811 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-expected.png and b/LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png b/LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png
deleted file mode 100644 (file)
index a9ffee0..0000000
Binary files a/LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.txt b/LayoutTests/platform/mac/svg/as-image/svg-as-relative-image-with-explicit-size-expected.txt
deleted file mode 100644 (file)
index 1be7b54..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (0,0) size 800x600
-      RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
-        RenderImage {IMG} at (0,0) size 100x100
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/svg/as-image/svg-image-change-content-size-expected.png b/LayoutTests/platform/mac/svg/as-image/svg-image-change-content-size-expected.png
deleted file mode 100644 (file)
index 3a2caa1..0000000
Binary files a/LayoutTests/platform/mac/svg/as-image/svg-image-change-content-size-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/as-image/svg-image-change-content-size-expected.txt b/LayoutTests/platform/mac/svg/as-image/svg-image-change-content-size-expected.txt
deleted file mode 100644 (file)
index aec29fd..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x480
-  RenderBlock {html} at (0,0) size 800x480
-    RenderBody {body} at (8,16) size 784x456
-      RenderBlock {p} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 764x18
-          text run at (0,0) width 764: "The svg image contained in the div element (red box) should not change its appearance when width is resized to be larger"
-      RenderBlock {div} at (0,34) size 602x422 [border: (1px solid #FF0000)]
-        RenderImage {img} at (1,1) size 420x420
-        RenderText {#text} at (0,0) size 0x0
index 2258de716c2d1b0be3f2daff3601cb36a273877f..c0ae9da912dd3a1f783efa05c65021fde411b90b 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.png and b/LayoutTests/platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.png differ
index adbd5e22a70a5d6f06dcc933df1f376bf4d74fc1..689c3c8ad8728057f7d3811fb612cd1b858e7e9f 100644 (file)
@@ -1,6 +1,6 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (6,3) size 788x594
-    RenderSVGPath {rect} at (6,3) size 788x594 [stroke={[type=SOLID] [color=#000000]}] [x=4.63] [y=3.47] [width=453.70] [height=340.28]
+layer at (0,0) size 1357x1011
+  RenderView at (0,0) size 785x585
+layer at (0,0) size 1357x1011
+  RenderSVGRoot {svg} at (12,8) size 1333x995
+    RenderSVGPath {rect} at (12,8) size 1333x995 [stroke={[type=SOLID] [color=#000000]}] [x=7.85] [y=5.85] [width=769.30] [height=573.30]
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.png b/LayoutTests/platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.png
deleted file mode 100644 (file)
index 0a6f398..0000000
Binary files a/LayoutTests/platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.txt b/LayoutTests/platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.txt
deleted file mode 100644 (file)
index 8af6d30..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x243
-  RenderBlock {HTML} at (0,0) size 800x243
-    RenderBody {BODY} at (16,16) size 768x211
-      RenderBlock {DIV} at (0,0) size 772x211 [border: (2px solid #CCCCCC)]
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.png b/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.png
deleted file mode 100644 (file)
index e070bb7..0000000
Binary files a/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.txt b/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.txt
deleted file mode 100644 (file)
index abc62f8..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x161
-  RenderBlock {HTML} at (0,0) size 800x161
-    RenderBody {BODY} at (4,4) size 792x153
-      RenderBlock {DIV} at (11,11) size 129x129 [border: (1px solid #000000)]
-      RenderText {#text} at (151,143) size 2x10
-        text run at (151,143) width 2: " "
-      RenderBlock {DIV} at (164,11) size 129x129 [border: (1px solid #000000)]
-      RenderText {#text} at (304,143) size 2x10
-        text run at (304,143) width 2: " "
-      RenderBlock {DIV} at (317,11) size 129x129 [border: (1px solid #000000)]
-      RenderText {#text} at (457,143) size 2x10
-        text run at (457,143) width 2: " "
-      RenderImage {IMG} at (470,11) size 129x129 [border: (1px solid #000000)]
-      RenderText {#text} at (610,143) size 2x10
-        text run at (610,143) width 2: " "
-      RenderImage {IMG} at (623,11) size 129x129 [border: (1px solid #000000)]
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
index 27790d6c68c015029372bd26c502971768c4701c..e4b149d706b1d733cbbb9643bbdc54bdffe02dfc 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.png and b/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.png differ
index 57e4ccebb48c70ca3d7e5c7f4459322579f677d9..400c30d31ebf67b5ab018c79b48cb29a638b8e54 100644 (file)
@@ -1,7 +1,7 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (12,12) size 788x588
+layer at (0,0) size 1131x843
+  RenderView at (0,0) size 785x585
+layer at (0,0) size 1131x843
+  RenderSVGRoot {svg} at (12,12) size 1119x831
     RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
       RenderBlock {xhtml:div} at (0,0) size 580x18
         RenderText {#text} at (0,0) size 78x18
@@ -11,5 +11,5 @@ layer at (0,0) size 800x600
           RenderText {#text} at (0,0) size 66x18
             text run at (0,0) width 66: "and a link."
         RenderBR {xhtml:br} at (66,0) size 0x18
-    RenderSVGPath {rect} at (12,12) size 788x552 [stroke={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=580.00] [height=380.00]
+    RenderSVGPath {rect} at (12,12) size 840x552 [stroke={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=580.00] [height=380.00]
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png b/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
deleted file mode 100644 (file)
index 9a1cf3d..0000000
Binary files a/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt b/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt
deleted file mode 100644 (file)
index 6fc7dd7..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x347
-  RenderBlock {HTML} at (0,0) size 800x347
-    RenderBody {BODY} at (5,5) size 790x337
-      RenderTable {TABLE} at (0,0) size 462x337
-        RenderTableSection {TBODY} at (0,0) size 462x337
-          RenderTableRow {TR} at (0,1) size 462x15
-            RenderTableCell {TH} at (1,1) size 65x15 [bgcolor=#DDDD99] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (6,1) size 53x13
-                text run at (6,1) width 53: "viewBox?"
-            RenderTableCell {TH} at (67,1) size 112x15 [bgcolor=#DDDD99] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 110x13
-                text run at (1,1) width 110: "preserve\x{AD}Aspect\x{AD}Ratio"
-            RenderTableCell {TH} at (180,1) size 140x15 [bgcolor=#DDDD99] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (54,1) size 32x13
-                text run at (54,1) width 32: "<img>"
-            RenderTableCell {TH} at (321,1) size 140x15 [bgcolor=#DDDD99] [r=0 c=3 rs=1 cs=1]
-              RenderText {#text} at (47,1) size 46x13
-                text run at (47,1) width 46: "<object>"
-          RenderTableRow {TR} at (0,17) size 462x39
-            RenderTableCell {TH} at (1,89) size 65x15 [bgcolor=#DDDD99] [r=1 c=0 rs=4 cs=1]
-              RenderText {#text} at (1,1) size 63x13
-                text run at (1,1) width 63: "No viewBox"
-            RenderTableCell {TH} at (67,35) size 112x2 [bgcolor=#DDDD99] [r=1 c=1 rs=1 cs=1]
-            RenderTableCell {TD} at (180,17) size 140x39 [r=1 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 138x34 [border: (1px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (321,17) size 140x39 [r=1 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 138x34 [border: (1px dashed #008000)]
-                layer at (0,0) size 132x28
-                  RenderView at (0,0) size 132x28
-                layer at (0,0) size 132x28
-                  RenderSVGRoot {svg} at (0,0) size 132x28
-                    RenderSVGPath {circle} at (0,0) size 132x28 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [cx=110.00] [cy=110.00] [r=110.00]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,57) size 462x39
-            RenderTableCell {TH} at (67,69) size 112x15 [bgcolor=#DDDD99] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (42,1) size 28x13
-                text run at (42,1) width 28: "none"
-            RenderTableCell {TD} at (180,57) size 140x39 [r=2 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 138x34 [border: (1px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (321,57) size 140x39 [r=2 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 138x34 [border: (1px dashed #008000)]
-                layer at (0,0) size 132x28
-                  RenderView at (0,0) size 132x28
-                layer at (0,0) size 132x28
-                  RenderSVGRoot {svg} at (0,0) size 132x28
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 132x28 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 132x28 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,97) size 462x39
-            RenderTableCell {TH} at (67,109) size 112x15 [bgcolor=#DDDD99] [r=3 c=1 rs=1 cs=1]
-              RenderText {#text} at (43,1) size 26x13
-                text run at (43,1) width 26: "meet"
-            RenderTableCell {TD} at (180,97) size 140x39 [r=3 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 138x34 [border: (1px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (321,97) size 140x39 [r=3 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 138x34 [border: (1px dashed #008000)]
-                layer at (0,0) size 132x28
-                  RenderView at (0,0) size 132x28
-                layer at (0,0) size 132x28
-                  RenderSVGRoot {svg} at (0,0) size 132x28
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 132x28 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 132x28 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,137) size 462x39
-            RenderTableCell {TH} at (67,149) size 112x15 [bgcolor=#DDDD99] [r=4 c=1 rs=1 cs=1]
-              RenderText {#text} at (44,1) size 24x13
-                text run at (44,1) width 24: "slice"
-            RenderTableCell {TD} at (180,137) size 140x39 [r=4 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 138x34 [border: (1px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (321,137) size 140x39 [r=4 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 138x34 [border: (1px dashed #008000)]
-                layer at (0,0) size 132x28
-                  RenderView at (0,0) size 132x28
-                layer at (0,0) size 132x28
-                  RenderSVGRoot {svg} at (0,0) size 132x28
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 132x28 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 132x28 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,177) size 462x39
-            RenderTableCell {TH} at (1,249) size 65x15 [bgcolor=#DDDD99] [r=5 c=0 rs=4 cs=1]
-              RenderText {#text} at (10,1) size 45x13
-                text run at (10,1) width 45: "viewBox"
-            RenderTableCell {TH} at (67,195) size 112x2 [bgcolor=#DDDD99] [r=5 c=1 rs=1 cs=1]
-            RenderTableCell {TD} at (180,177) size 140x39 [r=5 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 138x34 [border: (1px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (321,177) size 140x39 [r=5 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 138x34 [border: (1px dashed #008000)]
-                layer at (0,0) size 132x28
-                  RenderView at (0,0) size 132x28
-                layer at (0,0) size 132x28
-                  RenderSVGRoot {svg} at (52,0) size 21x21
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (51,0) size 22x21 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (51,0) size 22x21 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,217) size 462x39
-            RenderTableCell {TH} at (67,229) size 112x15 [bgcolor=#DDDD99] [r=6 c=1 rs=1 cs=1]
-              RenderText {#text} at (42,1) size 28x13
-                text run at (42,1) width 28: "none"
-            RenderTableCell {TD} at (180,217) size 140x39 [r=6 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 138x34 [border: (1px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (321,217) size 140x39 [r=6 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 138x34 [border: (1px dashed #008000)]
-                layer at (0,0) size 132x28
-                  RenderView at (0,0) size 132x28
-                layer at (0,0) size 132x28
-                  RenderSVGRoot {svg} at (0,0) size 97x21
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 97x21 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 97x21 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,257) size 462x39
-            RenderTableCell {TH} at (67,269) size 112x15 [bgcolor=#DDDD99] [r=7 c=1 rs=1 cs=1]
-              RenderText {#text} at (43,1) size 26x13
-                text run at (43,1) width 26: "meet"
-            RenderTableCell {TD} at (180,257) size 140x39 [r=7 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 138x34 [border: (1px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (321,257) size 140x39 [r=7 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 138x34 [border: (1px dashed #008000)]
-                layer at (0,0) size 132x28
-                  RenderView at (0,0) size 132x28
-                layer at (0,0) size 132x28
-                  RenderSVGRoot {svg} at (52,0) size 21x21
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (51,0) size 22x21 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (51,0) size 22x21 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,297) size 462x39
-            RenderTableCell {TH} at (67,309) size 112x15 [bgcolor=#DDDD99] [r=8 c=1 rs=1 cs=1]
-              RenderText {#text} at (44,1) size 24x13
-                text run at (44,1) width 24: "slice"
-            RenderTableCell {TD} at (180,297) size 140x39 [r=8 c=2 rs=1 cs=1]
-              RenderImage {IMG} at (1,1) size 138x34 [border: (1px dashed #800000)]
-              RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (321,297) size 140x39 [r=8 c=3 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (1,1) size 138x34 [border: (1px dashed #008000)]
-                layer at (0,0) size 132x28
-                  RenderView at (0,0) size 132x28
-                layer at (0,0) size 132x28
-                  RenderSVGRoot {svg} at (0,0) size 97x28
-                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-                    RenderSVGContainer {g} at (0,0) size 97x28 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
-                      RenderSVGPath {path} at (0,0) size 97x28 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
-              RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png b/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png
deleted file mode 100644 (file)
index ba5a6cc..0000000
Binary files a/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.txt b/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.txt
deleted file mode 100644 (file)
index d280171..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (0,0) size 800x600
-      RenderBlock {DIV} at (0,0) size 666x500 [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 3x15
-          text run at (0,0) width 3: " "
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png b/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png
deleted file mode 100644 (file)
index 2aa07e9..0000000
Binary files a/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.txt b/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.txt
deleted file mode 100644 (file)
index 81f9c06..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (0,0) size 800x600
-      RenderBlock {DIV} at (0,0) size 289x289 [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 2x10
-          text run at (0,0) width 2: " "
diff --git a/LayoutTests/svg/as-background-image/background-image-preserveaspectRatio-support.html b/LayoutTests/svg/as-background-image/background-image-preserveaspectRatio-support.html
deleted file mode 100644 (file)
index 1ad016a..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html>\r
-<html>\r
-<head>\r
-    <title>preserveAspectRatio test for background-image</title>\r
-    <style>\r
-        th {\r
-            background-color: #dd9;\r
-            font-family: sans-serif;\r
-        }\r
-\r
-        img, div {\r
-            /* background-color: #EBF; */\r
-            border: 2px dashed maroon;\r
-            height: 50px;\r
-            left: 100px;\r
-            overflow: visible;\r
-            padding: 3px;\r
-            top: 20px;\r
-            width: 200px;\r
-            box-sizing: border-box;\r
-        }\r
-    </style>\r
-</head>\r
-<body>\r
-    <table>\r
-        <tr>\r
-            <th>\r
-                viewBox?\r
-            </th>\r
-            <th>\r
-                preserve&shy;Aspect&shy;Ratio\r
-            </th>\r
-            <th>\r
-                &lt;img&gt;\r
-            </th>\r
-            <th>\r
-                &lt;div&gt;\r
-            </th>\r
-        </tr>\r
-        <tr>\r
-            <th rowspan=4>\r
-                No viewBox\r
-            </th>\r
-            <th>\r
-            </th>\r
-            <td>\r
-                <img src="../as-image/resources/circle-default-default.svg" />\r
-            </td>\r
-            <td>\r
-                <div style="background: url(../as-image/resources/circle-default-default.svg)"></div>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                none\r
-            </th>\r
-            <td>\r
-                <img src="../as-image/resources/circle-default-none.svg" />\r
-            </td>\r
-            <td>\r
-                <div style="background: url(../as-image/resources/circle-default-none.svg)"></div>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                meet\r
-            </th>\r
-            <td>\r
-                <img src="../as-image/resources/circle-default-meet.svg" />\r
-            </td>\r
-            <td>\r
-                <div style="background: url(../as-image/resources/circle-default-meet.svg)"></div>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                slice\r
-            </th>\r
-            <td>\r
-                <img src="../as-image/resources/circle-default-slice.svg" />\r
-            </td>\r
-            <td>\r
-                <div style="background: url(../as-image/resources/circle-default-slice.svg)"></div>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th rowspan=4>\r
-                viewBox\r
-            </th>\r
-            <th>\r
-            </th>\r
-            <td>\r
-                <img src="../as-image/resources/circle-viewbox-default.svg" />\r
-            </td>\r
-            <td>\r
-                <div style="background: url(../as-image/resources/circle-viewbox-default.svg)"></div>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                none\r
-            </th>\r
-            <td>\r
-                <img src="../as-image/resources/circle-viewbox-none.svg" />\r
-            </td>\r
-            <td>\r
-                <div style="background: url(../as-image/resources/circle-viewbox-none.svg)"></div>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                meet\r
-            </th>\r
-            <td>\r
-                <img src="../as-image/resources/circle-viewbox-meet.svg" />\r
-            </td>\r
-            <td>\r
-                <div style="background: url(../as-image/resources/circle-viewbox-meet.svg)"></div>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                slice\r
-            </th>\r
-            <td>\r
-                <img src="../as-image/resources/circle-viewbox-slice.svg" />\r
-            </td>\r
-            <td>\r
-                <div style="background: url(../as-image/resources/circle-viewbox-slice.svg)"></div>\r
-            </td>\r
-        </tr>\r
-    </table>\r
-</body>\r
-</html>\r
diff --git a/LayoutTests/svg/as-background-image/background-image-tiled.html b/LayoutTests/svg/as-background-image/background-image-tiled.html
deleted file mode 100644 (file)
index a87e92d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>SVG background-image tiling</title>
-    <style>
-        div{
-            border: 1px solid #ccc;
-            width: 100%;
-            height: 100px;
-            background-image:url('resources/construction-tape.svg');
-            background-size: 100px 100%;
-        }
-    </style>
-</head>
-
-<body>
-<div></div>
-
-</body>
-</html>
diff --git a/LayoutTests/svg/as-background-image/resources/construction-tape.svg b/LayoutTests/svg/as-background-image/resources/construction-tape.svg
deleted file mode 100644 (file)
index 8237653..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
-"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-
-<svg viewBox="0 0 100 100" preserveAspectRatio="none" version="1.1" 
-xmlns="http://www.w3.org/2000/svg">
-
-<defs>
-<linearGradient id="orange_red" x1="0%" y1="0%" x2="0%" y2="100%">
-<stop offset="0%" style="stop-color:rgb(230,230,0);stop-opacity:1"/>
-<stop offset="100%" style="stop-color:rgb(200,200,0);stop-opacity:1"/>
-</linearGradient>
-</defs>
-
-<rect width="100%" height="100%"
-style="fill:url(#orange_red)"/>
-
-<polygon points="-20,100 20,100 120,0 80,0" fill = "black" />
-<polygon points="80,100 100,80 100,100" fill = "black" />
-<polygon points="0,20 20,0 0,0" fill = "black" />
-
-</svg>
-
-
index 38b448f4724edb491d855aeb74ca8ccc4abcdf5c..17301c2c40642f342eb08c0da184ef99c1d558ec 100644 (file)
@@ -1,4 +1,4 @@
-<svg width="100%" height="100%" preserveAspectRatio="none" viewBox="0 200 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="100%" height="100%" viewBox="0 200 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg">
 <title>Suzanne's Hearts V1.0</title><desc>Author: http://richard.warburton.it - Licence: http://creativecommons.org/licenses/publicdomain</desc>
 <rect x="-200" y="0" width="600" height="600" fill="black" />
 <path d="M0 0A10 10 0 1 1 17.0711 7.0711L0 24.142L-17.0711 7.0711A10 10 0 1 1 0 0" transform="translate(100,265) scale(4,5.2)" fill="#500" />
diff --git a/LayoutTests/svg/as-background-image/same-image-two-instances-background-image.html b/LayoutTests/svg/as-background-image/same-image-two-instances-background-image.html
deleted file mode 100644 (file)
index dacb7fd..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>\r
-<html>\r
-<head>\r
-    <style>\r
-         div {\r
-            /* background-color: #EBF; */\r
-            border: 2px dashed maroon;\r
-            height: 50px;\r
-            left: 100px;\r
-            overflow: visible;\r
-            padding: 3px;\r
-            top: 20px;\r
-            width: 200px;\r
-            box-sizing: border-box;\r
-        }\r
-    </style>\r
-</head>\r
-<body>\r
-    <!-- None of these images must look distorted -->\r
-       <div style="background: url(../as-image/resources/circle-default-default.svg)"></div>\r
-       <div style="background: url(../as-image/resources/circle-default-default.svg)"></div>\r
-</body>\r
-</html>\r
diff --git a/LayoutTests/svg/as-image/img-preserveAspectRatio-support-1.html b/LayoutTests/svg/as-image/img-preserveAspectRatio-support-1.html
deleted file mode 100644 (file)
index 7b122bd..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html>\r
-<html>\r
-<head>\r
-    <title>preserveAspectRatio test 1/2</title>\r
-    <style>\r
-        th {\r
-            background-color: #dd9;\r
-            font-family: sans-serif;\r
-        }\r
-\r
-        img, object {\r
-            /* background-color: #EBF; */\r
-            border: 2px dashed maroon;\r
-            height: 50px;\r
-            left: 100px;\r
-            overflow: visible;\r
-            padding: 3px;\r
-            top: 20px;\r
-            width: 200px;\r
-            box-sizing: border-box;\r
-        }\r
-\r
-        object {\r
-            border-color: green;\r
-            border-width: 1px;\r
-        }\r
-    </style>\r
-</head>\r
-<body>\r
-    <table>\r
-        <tr>\r
-            <th>\r
-                viewBox?\r
-            </th>\r
-            <th>\r
-                preserve&shy;Aspect&shy;Ratio\r
-            </th>\r
-            <th>\r
-                &lt;img&gt;\r
-            </th>\r
-            <th>\r
-                &lt;object&gt;\r
-            </th>\r
-        </tr>\r
-        <tr>\r
-            <th rowspan=4>\r
-                No viewBox\r
-            </th>\r
-            <th>\r
-            </th>\r
-            <td>\r
-                <img src="resources/circle-default-default.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="resources/circle-default-default.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                none\r
-            </th>\r
-            <td>\r
-                <img src="resources/circle-default-none.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="resources/circle-default-none.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                meet\r
-            </th>\r
-            <td>\r
-                <img src="resources/circle-default-meet.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="resources/circle-default-meet.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                slice\r
-            </th>\r
-            <td>\r
-                <img src="resources/circle-default-slice.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="resources/circle-default-slice.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th rowspan=4>\r
-                viewBox\r
-            </th>\r
-            <th>\r
-            </th>\r
-            <td>\r
-                <img src="resources/circle-viewbox-default.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="resources/circle-viewbox-default.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                none\r
-            </th>\r
-            <td>\r
-                <img src="resources/circle-viewbox-none.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="resources/circle-viewbox-none.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                meet\r
-            </th>\r
-            <td>\r
-                <img src="resources/circle-viewbox-meet.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="resources/circle-viewbox-meet.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                slice\r
-            </th>\r
-            <td>\r
-                <img src="resources/circle-viewbox-slice.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="resources/circle-viewbox-slice.svg"></object>\r
-            </td>\r
-        </tr>\r
-    </table>\r
-</body>\r
-</html>\r
diff --git a/LayoutTests/svg/as-image/resources/circle-default-meet.svg b/LayoutTests/svg/as-image/resources/circle-default-meet.svg
deleted file mode 100644 (file)
index 4a13119..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   preserveAspectRatio="xMidYMid meet"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="363.85715"
-   height="363.85715"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-199.28571"
-     inkscape:cy="497.14286"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1123"
-     inkscape:window-height="839"
-     inkscape:window-x="0"
-     inkscape:window-y="48" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-162.35713,-403.29073)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#d9bb7a;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="344.28571"
-       sodipodi:cy="585.2193"
-       sodipodi:rx="181.42857"
-       sodipodi:ry="181.42857"
-       d="M 525.71428,585.2193 A 181.42857,181.42857 0 1 1 162.85713,585.2193 A 181.42857,181.42857 0 1 1 525.71428,585.2193 z" />
-  </g>
-</svg>
diff --git a/LayoutTests/svg/as-image/resources/circle-default-none.svg b/LayoutTests/svg/as-image/resources/circle-default-none.svg
deleted file mode 100644 (file)
index 9a7bc75..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   preserveAspectRatio="none"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="363.85715"
-   height="363.85715"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-199.28571"
-     inkscape:cy="497.14286"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1123"
-     inkscape:window-height="839"
-     inkscape:window-x="0"
-     inkscape:window-y="48" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-162.35713,-403.29073)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#d9bb7a;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="344.28571"
-       sodipodi:cy="585.2193"
-       sodipodi:rx="181.42857"
-       sodipodi:ry="181.42857"
-       d="M 525.71428,585.2193 A 181.42857,181.42857 0 1 1 162.85713,585.2193 A 181.42857,181.42857 0 1 1 525.71428,585.2193 z" />
-  </g>
-</svg>
diff --git a/LayoutTests/svg/as-image/resources/circle-default-slice.svg b/LayoutTests/svg/as-image/resources/circle-default-slice.svg
deleted file mode 100644 (file)
index d75f34b..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   preserveAspectRatio="xMidYMid slice"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="363.85715"
-   height="363.85715"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-199.28571"
-     inkscape:cy="497.14286"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1123"
-     inkscape:window-height="839"
-     inkscape:window-x="0"
-     inkscape:window-y="48" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-162.35713,-403.29073)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#d9bb7a;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="344.28571"
-       sodipodi:cy="585.2193"
-       sodipodi:rx="181.42857"
-       sodipodi:ry="181.42857"
-       d="M 525.71428,585.2193 A 181.42857,181.42857 0 1 1 162.85713,585.2193 A 181.42857,181.42857 0 1 1 525.71428,585.2193 z" />
-  </g>
-</svg>
diff --git a/LayoutTests/svg/as-image/resources/circle-nosize.svg b/LayoutTests/svg/as-image/resources/circle-nosize.svg
deleted file mode 100644 (file)
index dd342c9..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-199.28571"
-     inkscape:cy="497.14286"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1123"
-     inkscape:window-height="839"
-     inkscape:window-x="0"
-     inkscape:window-y="48" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-162.35713,-403.29073)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#d9bb7a;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="344.28571"
-       sodipodi:cy="585.2193"
-       sodipodi:rx="181.42857"
-       sodipodi:ry="181.42857"
-       d="M 525.71428,585.2193 A 181.42857,181.42857 0 1 1 162.85713,585.2193 A 181.42857,181.42857 0 1 1 525.71428,585.2193 z" />
-  </g>
-</svg>
diff --git a/LayoutTests/svg/as-image/resources/circle-viewbox-default.svg b/LayoutTests/svg/as-image/resources/circle-viewbox-default.svg
deleted file mode 100644 (file)
index 4cd7e56..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   viewBox="0 0 500 500"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="363.85715"
-   height="363.85715"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-199.28571"
-     inkscape:cy="497.14286"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1123"
-     inkscape:window-height="839"
-     inkscape:window-x="0"
-     inkscape:window-y="48" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-162.35713,-403.29073)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#d9bb7a;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="344.28571"
-       sodipodi:cy="585.2193"
-       sodipodi:rx="181.42857"
-       sodipodi:ry="181.42857"
-       d="M 525.71428,585.2193 A 181.42857,181.42857 0 1 1 162.85713,585.2193 A 181.42857,181.42857 0 1 1 525.71428,585.2193 z" />
-  </g>
-</svg>
diff --git a/LayoutTests/svg/as-image/resources/circle-viewbox-meet.svg b/LayoutTests/svg/as-image/resources/circle-viewbox-meet.svg
deleted file mode 100644 (file)
index e3c46d3..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   viewBox="0 0 500 500"
-   preserveAspectRatio="xMidYMid meet"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="363.85715"
-   height="363.85715"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-199.28571"
-     inkscape:cy="497.14286"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1123"
-     inkscape:window-height="839"
-     inkscape:window-x="0"
-     inkscape:window-y="48" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-162.35713,-403.29073)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#d9bb7a;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="344.28571"
-       sodipodi:cy="585.2193"
-       sodipodi:rx="181.42857"
-       sodipodi:ry="181.42857"
-       d="M 525.71428,585.2193 A 181.42857,181.42857 0 1 1 162.85713,585.2193 A 181.42857,181.42857 0 1 1 525.71428,585.2193 z" />
-  </g>
-</svg>
diff --git a/LayoutTests/svg/as-image/resources/circle-viewbox-none.svg b/LayoutTests/svg/as-image/resources/circle-viewbox-none.svg
deleted file mode 100644 (file)
index 9182f40..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   viewBox="0 0 500 500"
-   preserveAspectRatio="none"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="363.85715"
-   height="363.85715"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-199.28571"
-     inkscape:cy="497.14286"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1123"
-     inkscape:window-height="839"
-     inkscape:window-x="0"
-     inkscape:window-y="48" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-162.35713,-403.29073)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#d9bb7a;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="344.28571"
-       sodipodi:cy="585.2193"
-       sodipodi:rx="181.42857"
-       sodipodi:ry="181.42857"
-       d="M 525.71428,585.2193 A 181.42857,181.42857 0 1 1 162.85713,585.2193 A 181.42857,181.42857 0 1 1 525.71428,585.2193 z" />
-  </g>
-</svg>
diff --git a/LayoutTests/svg/as-image/resources/circle-viewbox-slice.svg b/LayoutTests/svg/as-image/resources/circle-viewbox-slice.svg
deleted file mode 100644 (file)
index 9b41798..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   viewBox="0 0 500 500"
-   preserveAspectRatio="xMidYMid slice"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="363.85715"
-   height="363.85715"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-199.28571"
-     inkscape:cy="497.14286"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1123"
-     inkscape:window-height="839"
-     inkscape:window-x="0"
-     inkscape:window-y="48" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-162.35713,-403.29073)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#d9bb7a;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="344.28571"
-       sodipodi:cy="585.2193"
-       sodipodi:rx="181.42857"
-       sodipodi:ry="181.42857"
-       d="M 525.71428,585.2193 A 181.42857,181.42857 0 1 1 162.85713,585.2193 A 181.42857,181.42857 0 1 1 525.71428,585.2193 z" />
-  </g>
-</svg>
index 3ccdc4c5e7b629f3d54e71872828e2cb07da15ad..9eec19d3a411878177b07b86f2cf218a5dd5c20d 100644 (file)
@@ -1,4 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width='100%' height='100%'>
-    <rect fill='green' width='100%' height='100%' />
-    <circle cx="50%" cy="50%" r="10%" fill="navy"/>
+    <rect fill='green' width='100px' height='100px' />
 </svg>
diff --git a/LayoutTests/svg/as-image/same-image-two-instances.html b/LayoutTests/svg/as-image/same-image-two-instances.html
deleted file mode 100644 (file)
index 6d981ab..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>\r
-<html>\r
-<head>\r
-    <style>\r
-        img {\r
-            /* background-color: #EBF; */\r
-            border: 2px dashed maroon;\r
-            height: 50px;\r
-            left: 100px;\r
-            overflow: visible;\r
-            padding: 3px;\r
-            top: 20px;\r
-            width: 200px;\r
-            box-sizing: border-box;\r
-        }\r
-    </style>\r
-</head>\r
-<body>\r
-    <!-- None of these images must look distorted -->\r
-    <img src="resources/circle-default-default.svg" />\r
-    <img style="width: 100px; height: 100px" src="resources/circle-default-default.svg"/>\r
-</body>\r
-</html>\r
diff --git a/LayoutTests/svg/as-image/svg-as-relative-image-with-explicit-size.html b/LayoutTests/svg/as-image/svg-as-relative-image-with-explicit-size.html
deleted file mode 100644 (file)
index 2277580..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-<style>
-img, div {
-  background: red;
-  height: 100px;
-  width: 100px;
-}
-</style>
-</head>
-<body style='margin: 0px'>
-<div>
-  <img src='resources/green-relative-size-rect.svg'>
-</div>
-</body>
-</html>
diff --git a/LayoutTests/svg/as-image/svg-image-change-content-size.xhtml b/LayoutTests/svg/as-image/svg-image-change-content-size.xhtml
deleted file mode 100644 (file)
index 91213b6..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<style>
-    img, div {
-        width: 420px;
-        height: 420px;
-    }
-    div {
-        border: red 1px solid;
-    }
-</style>
-</head>
-<body>
-    <p>The svg image contained in the div element (red box) should not change its appearance when width is resized to be larger</p>
-    <div id="contentBox" onclick="resizeBox()">
-        <img src="../as-background-image/resources/butterfly.svg"/>
-    </div>
-
-    <script type="JavaScript">
-        if (window.layoutTestController)
-            layoutTestController.waitUntilDone();
-
-        if (window.eventSender) {
-            window.setTimeout(function() {
-                eventSender.mouseMoveTo(50, 250);
-                eventSender.mouseDown();
-                eventSender.mouseUp();
-            }, 0);
-        }
-
-        function resizeBox() {
-            document.getElementById("contentBox").style.setProperty("width", "600px");
-            if (window.layoutTestController)
-                layoutTestController.notifyDone();
-        }
-    </script>
-</body>
-</html>
diff --git a/LayoutTests/svg/zoom/page/resources/relative-sized-background-with-viewBox.svg b/LayoutTests/svg/zoom/page/resources/relative-sized-background-with-viewBox.svg
deleted file mode 100644 (file)
index a116964..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
-    <rect x="10" y="10" width="478" height="478" rx="5" ry="5" fill="none" stroke="grey" stroke-width="2"/>
-</svg>
diff --git a/LayoutTests/svg/zoom/page/zoom-background-image-tiled.html b/LayoutTests/svg/zoom/page/zoom-background-image-tiled.html
deleted file mode 100644 (file)
index 5dd69ea..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>SVG background-image tiling</title>
-    <style>
-        div{
-            border: 1px solid #ccc;
-            width: 100%;
-            height: 100px;
-            background-image:url('../../as-background-image/resources/construction-tape.svg');
-            background-size: 100px 100%;
-        }
-    </style>
-</head>
-
-<body>
-<div></div>
-
-<script>var zoomCount = 4; window.shouldZoomOut = false;</script>
-<script src="../resources/testPageZoom.js"></script>
-
-</body>
-</html>
diff --git a/LayoutTests/svg/zoom/page/zoom-background-images.html b/LayoutTests/svg/zoom/page/zoom-background-images.html
deleted file mode 100644 (file)
index ed7b4db..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style>
-        img, div {
-            display: inline-block;
-            margin: 20px 20px;
-            border: 2px solid black;
-            width: 220px;
-            height: 220px;
-        }
-
-        .png {
-            background-image: url(resources/absolute-sized-svg.png);
-            background-repeat: no-repeat;
-            background-position: center;
-        }
-
-        .svg {
-            background-image: url(resources/circle.svg);
-        }
-
-        .gradient {
-                       background-image: -webkit-repeating-radial-gradient(top left, red, blue 20px, red 40px);
-        }
-    </style>
-</head>
-
-<body>
-<div class="png"></div>
-<div class="svg"></div>
-<div class="gradient"></div>
-<img src="resources/circle.svg"></img>
-<img src="resources/absolute-sized-svg.png"></img>
-
-<script>var zoomCount = 5; window.shouldZoomOut = true;</script>
-<script src="../resources/testPageZoom.js"></script>
-
-</body>
-</html>
diff --git a/LayoutTests/svg/zoom/page/zoom-img-preserveAspectRatio-support-1.html b/LayoutTests/svg/zoom/page/zoom-img-preserveAspectRatio-support-1.html
deleted file mode 100644 (file)
index 7a9c45f..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html>\r
-<html>\r
-<head>\r
-    <title>preserveAspectRatio test 1/2</title>\r
-    <style>\r
-        th {\r
-            background-color: #dd9;\r
-            font-family: sans-serif;\r
-        }\r
-\r
-        img, object {\r
-            /* background-color: #EBF; */\r
-            border: 2px dashed maroon;\r
-            height: 50px;\r
-            left: 100px;\r
-            overflow: visible;\r
-            padding: 3px;\r
-            top: 20px;\r
-            width: 200px;\r
-            box-sizing: border-box;\r
-        }\r
-\r
-        object {\r
-            border-color: green;\r
-            border-width: 1px;\r
-        }\r
-    </style>\r
-</head>\r
-<body>\r
-    <table>\r
-        <tr>\r
-            <th>\r
-                viewBox?\r
-            </th>\r
-            <th>\r
-                preserve&shy;Aspect&shy;Ratio\r
-            </th>\r
-            <th>\r
-                &lt;img&gt;\r
-            </th>\r
-            <th>\r
-                &lt;object&gt;\r
-            </th>\r
-        </tr>\r
-        <tr>\r
-            <th rowspan=4>\r
-                No viewBox\r
-            </th>\r
-            <th>\r
-            </th>\r
-            <td>\r
-                <img src="../../as-image/resources/circle-default-default.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="../../as-image/resources/circle-default-default.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                none\r
-            </th>\r
-            <td>\r
-                <img src="../../as-image/resources/circle-default-none.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="../../as-image/resources/circle-default-none.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                meet\r
-            </th>\r
-            <td>\r
-                <img src="../../as-image/resources/circle-default-meet.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="../../as-image/resources/circle-default-meet.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                slice\r
-            </th>\r
-            <td>\r
-                <img src="../../as-image/resources/circle-default-slice.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="../../as-image/resources/circle-default-slice.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th rowspan=4>\r
-                viewBox\r
-            </th>\r
-            <th>\r
-            </th>\r
-            <td>\r
-                <img src="../../as-image/resources/circle-viewbox-default.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="../../as-image/resources/circle-viewbox-default.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                none\r
-            </th>\r
-            <td>\r
-                <img src="../../as-image/resources/circle-viewbox-none.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="../../as-image/resources/circle-viewbox-none.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                meet\r
-            </th>\r
-            <td>\r
-                <img src="../../as-image/resources/circle-viewbox-meet.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="../../as-image/resources/circle-viewbox-meet.svg"></object>\r
-            </td>\r
-        </tr>\r
-        <tr>\r
-            <th>\r
-                slice\r
-            </th>\r
-            <td>\r
-                <img src="../../as-image/resources/circle-viewbox-slice.svg" />\r
-            </td>\r
-            <td>\r
-                <object data="../../as-image/resources/circle-viewbox-slice.svg"></object>\r
-            </td>\r
-        </tr>\r
-    </table>\r
-\r
-    <script>var zoomCount = 2; window.shouldZoomOut = true;</script>\r
-    <script src="../resources/testPageZoom.js"></script>\r
-</body>\r
-</html>\r
diff --git a/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox.html b/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox.html
deleted file mode 100644 (file)
index 621133f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<style>
-div {
-  background: green;
-  background-repeat: no-repeat;
-  background-image: url(resources/relative-sized-background-with-viewBox.svg);
-  height: 600px;
-  width: 800px;
-}
-</style>
-</head>
-<!-- The background shouldn't be red in a debug build -->
-<body style='margin: 0px'>
-<div>&nbsp;</div>
-
-<script>var zoomCount = 1; window.shouldZoomOut = true;</script>
-<script src="../resources/testPageZoom.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size.html b/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size.html
deleted file mode 100644 (file)
index f6c3cee..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<style>
-div {
-  background: green;
-  background-repeat: no-repeat;
-  background-image: url(../../as-background-image/resources/svg-as-background-with-relative-size.svg);
-  height: 500px;
-  width: 500px;
-}
-</style>
-</head>
-<!-- The background shouldn't be red in a debug build -->
-<body style='margin: 0px'>
-<div>&nbsp;</div>
-
-<script>var zoomCount = 4; window.shouldZoomOut = true;</script>
-<script src="../resources/testPageZoom.js"></script>
-</body>
-</html>
index a23dd3a9fb2273d550ebdf19e33387ecd7352d68..2bd8d6b83c8ec572ca1b29a6d08f7a51921f0ee6 100644 (file)
@@ -1,3 +1,99 @@
+2011-10-26  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Unreviewed, rolling out r98483.
+        http://trac.webkit.org/changeset/98483
+        https://bugs.webkit.org/show_bug.cgi?id=47156
+
+        Change is causing some crashes and ASSERTs.
+
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::lookupImageForSize):
+        (WebCore::CachedImage::lookupImageForRenderer):
+        (WebCore::CachedImage::lookupOrCreateImageForRenderer):
+        (WebCore::CachedImage::setContainerSizeForRenderer):
+        (WebCore::CachedImage::imageSizeForRenderer):
+        (WebCore::CachedImage::computeIntrinsicDimensions):
+        (WebCore::CachedImage::createImage):
+        * loader/cache/CachedImage.h:
+        * page/ChromeClient.h:
+        * rendering/ImageBySizeCache.cpp:
+        (WebCore::ImageBySizeCache::addClient):
+        (WebCore::ImageBySizeCache::removeClient):
+        (WebCore::ImageBySizeCache::imageForSize):
+        (WebCore::ImageBySizeCache::sizeForClient):
+        * rendering/ImageBySizeCache.h:
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::calculateFillTileSize):
+        (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
+        (WebCore::RenderBoxModelObject::paintNinePieceImage):
+        * rendering/RenderBoxModelObject.h:
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::RenderImage):
+        (WebCore::RenderImage::imageDimensionsChanged):
+        (WebCore::RenderImage::isLogicalWidthSpecified):
+        (WebCore::RenderImage::isLogicalHeightSpecified):
+        (WebCore::RenderImage::computeReplacedLogicalWidth):
+        (WebCore::RenderImage::computeReplacedLogicalHeight):
+        (WebCore::RenderImage::calcAspectRatioLogicalWidth):
+        (WebCore::RenderImage::calcAspectRatioLogicalHeight):
+        * rendering/RenderImage.h:
+        * rendering/RenderImageResource.cpp:
+        (WebCore::RenderImageResource::setContainerSizeForRenderer):
+        * rendering/RenderImageResourceStyleImage.cpp:
+        * rendering/RenderImageResourceStyleImage.h:
+        (WebCore::RenderImageResourceStyleImage::image):
+        (WebCore::RenderImageResourceStyleImage::setContainerSizeForRenderer):
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::computePreferredLogicalWidths):
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::computeIntrinsicLogicalWidth):
+        (WebCore::RenderReplaced::computeIntrinsicLogicalHeight):
+        (WebCore::RenderReplaced::computeReplacedLogicalWidth):
+        * rendering/style/StyleCachedImage.cpp:
+        (WebCore::StyleCachedImage::computeIntrinsicDimensions):
+        (WebCore::StyleCachedImage::setContainerSizeForRenderer):
+        (WebCore::StyleCachedImage::addClient):
+        (WebCore::StyleCachedImage::removeClient):
+        * rendering/style/StyleCachedImage.h:
+        * rendering/style/StyleGeneratedImage.h:
+        (WebCore::StyleGeneratedImage::setContainerSizeForRenderer):
+        * rendering/style/StyleImage.h:
+        * rendering/style/StylePendingImage.h:
+        (WebCore::StylePendingImage::setContainerSizeForRenderer):
+        * rendering/svg/RenderSVGImage.cpp:
+        (WebCore::RenderSVGImage::layout):
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::computeIntrinsicWidth):
+        (WebCore::RenderSVGRoot::computeIntrinsicHeight):
+        (WebCore::RenderSVGRoot::computeReplacedLogicalWidth):
+        (WebCore::RenderSVGRoot::computeReplacedLogicalHeight):
+        (WebCore::RenderSVGRoot::layout):
+        (WebCore::RenderSVGRoot::paint):
+        (WebCore::RenderSVGRoot::calcViewport):
+        (WebCore::RenderSVGRoot::computeRectForRepaint):
+        * rendering/svg/RenderSVGRoot.h:
+        * svg/SVGLength.cpp:
+        (WebCore::SVGLength::determineViewport):
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::SVGSVGElement):
+        (WebCore::SVGSVGElement::relativeWidthValue):
+        (WebCore::SVGSVGElement::relativeHeightValue):
+        (WebCore::SVGSVGElement::currentViewBoxRect):
+        * svg/SVGSVGElement.h:
+        (WebCore::SVGSVGElement::setContainerSize):
+        (WebCore::SVGSVGElement::containerSize):
+        (WebCore::SVGSVGElement::hasSetContainerSize):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::setContainerSize):
+        (WebCore::SVGImage::usesContainerSize):
+        (WebCore::SVGImage::size):
+        (WebCore::SVGImage::hasRelativeWidth):
+        (WebCore::SVGImage::hasRelativeHeight):
+        (WebCore::SVGImage::draw):
+        (WebCore::SVGImage::computeIntrinsicDimensions):
+        (WebCore::SVGImage::dataChanged):
+        * svg/graphics/SVGImage.h:
+
 2011-10-26  Eric Carlson  <eric.carlson@apple.com>
 
         Constructors for all TextTrack interfaces should be available on DOMWindow
index 1eeb4045609b5619b7e5714aaa2a49901db93eef..5a067dd3366a8ebae3e4b5df49c343ab90d51afa 100644 (file)
@@ -34,7 +34,6 @@
 #include "FrameLoaderClient.h"
 #include "FrameLoaderTypes.h"
 #include "FrameView.h"
-#include "RenderObject.h"
 #include "Settings.h"
 #include "SharedBuffer.h"
 #include <wtf/CurrentTime.h>
@@ -131,75 +130,26 @@ bool CachedImage::willPaintBrokenImage() const
     return errorOccurred() && m_shouldPaintBrokenImage;
 }
 
-#if ENABLE(SVG)
-inline Image* CachedImage::lookupImageForSize(const IntSize& size) const
-{
-    if (!m_image)
-        return 0;
-    if (!m_image->isSVGImage())
-        return m_image.get();
-    if (Image* image = m_svgImageCache.imageForSize(size))
-        return image;
-    return m_image.get();
-}
-
-inline Image* CachedImage::lookupImageForRenderer(const RenderObject* renderer) const
-{
-    if (!m_image)
-        return 0;
-    if (!m_image->isSVGImage())
-        return m_image.get();
-    if (Image* image = m_svgImageCache.imageForRenderer(renderer))
-        return image;
-    return m_image.get();
-}
-
-inline PassRefPtr<Image> createSVGImage(CachedImage* image, const IntSize& size, SharedBuffer* data)
-{
-    if (size.isEmpty() || !data)
-        return SVGImage::create(image);
-
-    RefPtr<Image> newImage = SVGImage::create(image);
-    newImage->setData(data, true);
-    newImage->setContainerSize(size);
-    return newImage.release();
-}
-
-inline PassRefPtr<Image> CachedImage::lookupOrCreateImageForRenderer(const RenderObject* renderer)
-{
-    if (!m_image)
-        return 0;
-    if (!m_image->isSVGImage())
-        return m_image;
-
-    IntSize size;
-    if (Image* result = m_svgImageCache.imageForRenderer(renderer, &size))
-        return result;
-
-    if (size.isEmpty())
-        return m_image;
-
-    // Create and cache new image at desired size.
-    RefPtr<Image> newImage = createSVGImage(this, size, m_data.get());
-    m_svgImageCache.putImage(size, newImage);
-    return newImage.release();
-}
-#else
-inline Image* CachedImage::lookupImageForSize(const IntSize&) const
+Image* CachedImage::lookupImageForSize(const IntSize& size) const
 {
+    // FIXME: Add logic for this in webkit.org/b/47156.
+    UNUSED_PARAM(size);
     return m_image.get();
 }
 
-inline Image* CachedImage::lookupImageForRenderer(const RenderObject*) const
+Image* CachedImage::lookupImageForRenderer(const RenderObject* renderer) const
 {
+    // FIXME: Add logic for this in webkit.org/b/47156.
+    UNUSED_PARAM(renderer);
     return m_image.get();
 }
 
-inline PassRefPtr<Image> CachedImage::lookupOrCreateImageForRenderer(const RenderObject*)
+PassRefPtr<Image> CachedImage::lookupOrCreateImageForRenderer(const RenderObject* renderer)
 {
+    // FIXME: Add logic for this in webkit.org/b/47156.
+    UNUSED_PARAM(renderer);
     return m_image;
 }
-#endif
 
 Image* CachedImage::image()
 {
@@ -235,26 +185,14 @@ Image* CachedImage::imageForRenderer(const RenderObject* renderer)
     return Image::nullImage();
 }
 
-void CachedImage::setContainerSizeForRenderer(const RenderObject* renderer, const IntSize& containerSize, float containerZoom)
+void CachedImage::setContainerSizeForRenderer(const RenderObject* renderer, const IntSize& containerSize)
 {
     if (!m_image)
         return;
-#if ENABLE(SVG)
-    if (!m_image->isSVGImage()) {
-        m_image->setContainerSize(containerSize);
-        return;
-    }
-    m_svgImageCache.setClient(renderer, containerSize);
 
-    Image* image = lookupOrCreateImageForRenderer(renderer).get();
-    if (image && image != m_image) {
-        ASSERT(image->isSVGImage());
-        static_cast<SVGImage*>(image)->setContainerZoom(containerZoom);
-    }
-#else
+    // FIXME: Add logic for this in webkit.org/b/47156.
     UNUSED_PARAM(renderer);
     m_image->setContainerSize(containerSize);
-#endif
 }
 
 bool CachedImage::usesImageContainerSize() const
@@ -285,14 +223,9 @@ IntSize CachedImage::imageSizeForRenderer(const RenderObject* renderer, float mu
 {
     ASSERT(!isPurgeable());
 
-    if (!m_image)
+    Image* image = lookupImageForRenderer(renderer);
+    if (!image)
         return IntSize();
-#if ENABLE(SVG)
-    // SVGImages already includes the zooming in its intrinsic size.
-    if (m_image->isSVGImage())
-        return lookupImageForRenderer(renderer)->size();
-#endif
-
     if (multiplier == 1.0f)
         return m_image->size();
         
@@ -308,28 +241,10 @@ IntSize CachedImage::imageSizeForRenderer(const RenderObject* renderer, float mu
     return IntSize(width, height);
 }
 
-void CachedImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
-{
-    if (m_image)
-        m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
-}
-
-void CachedImage::addClientForRenderer(RenderObject* renderer)
-{
-    ASSERT(renderer);
-#if ENABLE(SVG)
-    m_svgImageCache.addClient(renderer, IntSize());
-#endif
-    addClient(renderer);
-}
-
-void CachedImage::removeClientForRenderer(RenderObject* renderer)
+void CachedImage::computeIntrinsicDimensions(const RenderObject* renderer, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
-    ASSERT(renderer);
-#if ENABLE(SVG)
-    m_svgImageCache.removeClient(renderer);
-#endif
-    removeClient(renderer);
+    if (Image* image = lookupImageForRenderer(renderer))
+        image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
 }
 
 void CachedImage::notifyObservers(const IntRect* changeRect)
@@ -369,7 +284,7 @@ inline void CachedImage::createImage()
 #endif
 #if ENABLE(SVG)
     if (m_response.mimeType() == "image/svg+xml") {
-        m_image = createSVGImage(this, IntSize(), 0);
+        m_image = SVGImage::create(this);
         return;
     }
 #endif
index 49352f796a01007a8202e09165a61e0fdaf59076..33b56b95ab0598b56a916395a46ec160a070186d 100644 (file)
@@ -57,17 +57,16 @@ public:
     bool willPaintBrokenImage() const; 
 
     bool canRender(const RenderObject* renderer, float multiplier) { return !errorOccurred() && !imageSizeForRenderer(renderer, multiplier).isEmpty(); }
-    void addClientForRenderer(RenderObject*);
-    void removeClientForRenderer(RenderObject*);
 
-    void setContainerSizeForRenderer(const RenderObject*, const IntSize&, float);
+    // These are only used for SVGImage right now
+    void setContainerSizeForRenderer(const RenderObject*, const IntSize&);
     bool usesImageContainerSize() const;
     bool imageHasRelativeWidth() const;
     bool imageHasRelativeHeight() const;
     
     // This method takes a zoom multiplier that can be used to increase the natural size of the image by the zoom.
     IntSize imageSizeForRenderer(const RenderObject*, float multiplier); // returns the size of the complete image.
-    void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
+    void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     virtual void didAddClient(CachedResourceClient*);
     
index cde7c42b19f62bad9a77e77ca2a586bb419e9699..d213c60074294c35776b339d2d8e7524c494c5c7 100644 (file)
@@ -336,8 +336,6 @@ namespace WebCore {
 
         virtual void numWheelEventHandlersChanged(unsigned) = 0;
         
-        virtual bool isSVGImageChromeClient() const { return false; }
-
     protected:
         virtual ~ChromeClient() { }
     };
index a69f7a9680255214d1c8fb2e5198469603bd31e2..4965bb9b6dd06c467753147fa7316168080cc01e 100644 (file)
@@ -34,7 +34,6 @@ ImageBySizeCache::ImageBySizeCache()
 
 void ImageBySizeCache::addClient(const RenderObject* renderer, const IntSize& size)
 {
-    ASSERT(renderer);
     if (!size.isEmpty())
         m_sizes.add(size);
     
@@ -49,10 +48,8 @@ void ImageBySizeCache::addClient(const RenderObject* renderer, const IntSize& si
 
 void ImageBySizeCache::removeClient(const RenderObject* renderer)
 {
-    ASSERT(renderer);
     RenderObjectSizeCountMap::iterator it = m_clients.find(renderer);
-    if (it == m_clients.end())
-        return;
+    ASSERT(it != m_clients.end());
 
     SizeCountPair& sizeCount = it->second;
     IntSize size = sizeCount.first;
@@ -66,21 +63,6 @@ void ImageBySizeCache::removeClient(const RenderObject* renderer)
         m_clients.remove(renderer);
 }
 
-void ImageBySizeCache::setClient(const RenderObject* renderer, const IntSize& size)
-{
-    ASSERT(renderer);
-    RenderObjectSizeCountMap::iterator it = m_clients.find(renderer);
-    if (it != m_clients.end()) {
-        IntSize currentSize = it->second.first;
-        if (currentSize == size)
-            return;
-        removeClient(renderer);
-    }
-
-    if (!size.isEmpty())
-        addClient(renderer, size);
-}
-
 Image* ImageBySizeCache::getImage(const RenderObject* renderer, const IntSize& size)
 {
     RenderObjectSizeCountMap::iterator it = m_clients.find(renderer);
@@ -115,24 +97,18 @@ void ImageBySizeCache::clear()
 
 Image* ImageBySizeCache::imageForSize(const IntSize& size) const
 {
-    if (size.isEmpty())
-        return 0;
     HashMap<IntSize, RefPtr<Image> >::const_iterator it = m_images.find(size);
     if (it == m_images.end())
         return 0;
     return it->second.get();
 }
 
-Image* ImageBySizeCache::imageForRenderer(const RenderObject* renderer, IntSize* size) const
+IntSize ImageBySizeCache::sizeForClient(const RenderObject* renderer) const
 {
-    if (!renderer)
-        return 0;
     RenderObjectSizeCountMap::const_iterator it = m_clients.find(renderer);
     if (it == m_clients.end())
-        return 0;
-    if (size)
-        *size = it->second.first;
-    return imageForSize(it->second.first);
+        return IntSize();
+    return it->second.first;
 }
 
 } // namespace WebCore
index b8499fcbd650fd708e0412093c8234f95adaee8f..404dba658c971f858768a7702acf46baaf113871 100644 (file)
@@ -40,7 +40,6 @@ public:
 
     void addClient(const RenderObject*, const IntSize&);
     void removeClient(const RenderObject*);
-    void setClient(const RenderObject*, const IntSize&);
 
     Image* getImage(const RenderObject*, const IntSize&);
     void putImage(const IntSize&, PassRefPtr<Image>);
@@ -48,7 +47,7 @@ public:
     void clear();
 
     Image* imageForSize(const IntSize&) const;
-    Image* imageForRenderer(const RenderObject*, IntSize* lookedUpSize = 0) const;
+    IntSize sizeForClient(const RenderObject*) const;
     const RenderObjectSizeCountMap& clients() const { return m_clients; }
 
 private:
index 1006db5a5f5a2865f9ad714650934e6fe76e7d29..516f1be1794d2900179f58bde09e2d4f6667475e 100644 (file)
@@ -782,110 +782,12 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co
     }
 }
 
-static inline LayoutUnit resolveWidthForRatio(LayoutUnit height, const FloatSize& intrinsicRatio)
-{
-    // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
-    return static_cast<LayoutUnit>(ceilf(height * intrinsicRatio.width() / intrinsicRatio.height()));
-}
-
-static inline LayoutUnit resolveHeightForRatio(LayoutUnit width, const FloatSize& intrinsicRatio)
-{
-    // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
-    return static_cast<LayoutUnit>(ceilf(width * intrinsicRatio.height() / intrinsicRatio.width()));
-}
-
-static inline LayoutSize resolveAgainstIntrinsicWidthOrHeightAndRatio(const LayoutSize& size, const FloatSize& intrinsicRatio, LayoutUnit useWidth, LayoutUnit useHeight)
-{
-    if (intrinsicRatio.isEmpty()) {
-        if (useWidth)
-            return LayoutSize(useWidth, size.height());
-        return LayoutSize(size.width(), useHeight);
-    }
-
-    if (useWidth)
-        return LayoutSize(useWidth, resolveHeightForRatio(useWidth, intrinsicRatio));
-    return LayoutSize(resolveWidthForRatio(useHeight, intrinsicRatio), useHeight);
-}
-
-static inline LayoutSize resolveAgainstIntrinsicRatio(const LayoutSize& size, const FloatSize& intrinsicRatio)
-{
-    // Two possible solutions: (size.width(), solutionHeight) or (solutionWidth, size.height())
-    // "... must be assumed to be the largest dimensions..." = easiest answer: the rect with the largest surface area.
-
-    LayoutUnit solutionWidth = resolveWidthForRatio(size.height(), intrinsicRatio);
-    LayoutUnit solutionHeight = resolveHeightForRatio(size.width(), intrinsicRatio);
-    if (solutionWidth <= size.width()) {
-        if (solutionHeight <= size.height()) {
-            // If both solutions fit, choose the one covering the larger area.
-            LayoutUnit areaOne = solutionWidth * size.height();
-            LayoutUnit areaTwo = size.width() * solutionHeight;
-            if (areaOne < areaTwo)
-                return LayoutSize(size.width(), solutionHeight);
-            return LayoutSize(solutionWidth, size.height());
-        }
-
-        // Only the first solution fits.
-        return LayoutSize(solutionWidth, size.height());
-    }
-
-    // Only the second solution fits, assert that.
-    ASSERT(solutionHeight <= size.height());
-    return LayoutSize(size.width(), solutionHeight);
-}
-
-LayoutSize RenderBoxModelObject::calculateImageIntrinsicDimensions(StyleImage* image, const LayoutSize& positioningAreaSize) const
-{
-    // This implements http://www.w3.org/TR/css3-background/#background-size.
-    LayoutUnit resolvedWidth = 0;
-    LayoutUnit resolvedHeight = 0;
-    FloatSize intrinsicRatio;
-
-    // A generated image without a fixed size, will always return the container size as intrinsic size.
-    if (image->isGeneratedImage() && image->usesImageContainerSize()) {
-        resolvedWidth = positioningAreaSize.width();
-        resolvedHeight = positioningAreaSize.height();
-    } else {
-        Length intrinsicWidth;
-        Length intrinsicHeight;
-        image->computeIntrinsicDimensions(this, intrinsicWidth, intrinsicHeight, intrinsicRatio);
-
-        // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
-        if (intrinsicWidth.isFixed())
-            resolvedWidth = static_cast<LayoutUnit>(ceilf(intrinsicWidth.value() * style()->effectiveZoom()));
-        if (intrinsicHeight.isFixed())
-            resolvedHeight = static_cast<LayoutUnit>(ceilf(intrinsicHeight.value() * style()->effectiveZoom()));
-    }
-
-    // Intrinsic dimensions expressed as percentages must be resolved relative to the dimensions of the rectangle
-    // that establishes the coordinate system for the 'background-position' property. SVG on the other hand
-    // _explicitely_ says that percentage values for the width/height attributes do NOT define intrinsic dimensions.
-    if (resolvedWidth > 0 && resolvedHeight > 0)
-        return LayoutSize(resolvedWidth, resolvedHeight);
-
-    // If the image has one of either an intrinsic width or an intrinsic height:
-    // * and an intrinsic aspect ratio, then the missing dimension is calculated from the given dimension and the ratio.
-    // * and no intrinsic aspect ratio, then the missing dimension is assumed to be the size of the rectangle that
-    //   establishes the coordinate system for the 'background-position' property.
-    if ((resolvedWidth && !resolvedHeight) || (!resolvedWidth && resolvedHeight))
-        return resolveAgainstIntrinsicWidthOrHeightAndRatio(positioningAreaSize, intrinsicRatio, resolvedWidth, resolvedHeight);
-
-    // If the image has no intrinsic dimensions and has an intrinsic ratio the dimensions must be assumed to be the
-    // largest dimensions at that ratio such that neither dimension exceeds the dimensions of the rectangle that
-    // establishes the coordinate system for the 'background-position' property.
-    if (!resolvedWidth && !resolvedHeight && !intrinsicRatio.isEmpty())
-        return resolveAgainstIntrinsicRatio(positioningAreaSize, intrinsicRatio);
-
-    // If the image has no intrinsic ratio either, then the dimensions must be assumed to be the rectangle that
-    // establishes the coordinate system for the 'background-position' property.
-    return positioningAreaSize;
-}
-
-LayoutSize RenderBoxModelObject::calculateFillTileSize(const FillLayer* fillLayer, const LayoutSize& positioningAreaSize) const
+LayoutSize RenderBoxModelObject::calculateFillTileSize(const FillLayer* fillLayer, LayoutSize positioningAreaSize) const
 {
     StyleImage* image = fillLayer->image();
-    EFillSizeType type = fillLayer->size().type;
+    image->setContainerSizeForRenderer(this, positioningAreaSize); // Use the box established by background-origin.
 
-    LayoutSize imageIntrinsicSize = calculateImageIntrinsicDimensions(image, positioningAreaSize);
+    EFillSizeType type = fillLayer->size().type;
 
     switch (type) {
         case SizeLength: {
@@ -908,40 +810,37 @@ LayoutSize RenderBoxModelObject::calculateFillTileSize(const FillLayer* fillLaye
             // If one of the values is auto we have to use the appropriate
             // scale to maintain our aspect ratio.
             if (layerWidth.isAuto() && !layerHeight.isAuto()) {
+                LayoutSize imageIntrinsicSize = image->imageSize(this, style()->effectiveZoom());
                 if (imageIntrinsicSize.height())
                     w = imageIntrinsicSize.width() * h / imageIntrinsicSize.height();        
             } else if (!layerWidth.isAuto() && layerHeight.isAuto()) {
+                LayoutSize imageIntrinsicSize = image->imageSize(this, style()->effectiveZoom());
                 if (imageIntrinsicSize.width())
                     h = imageIntrinsicSize.height() * w / imageIntrinsicSize.width();
             } else if (layerWidth.isAuto() && layerHeight.isAuto()) {
                 // If both width and height are auto, use the image's intrinsic size.
+                LayoutSize imageIntrinsicSize = image->imageSize(this, style()->effectiveZoom());
                 w = imageIntrinsicSize.width();
                 h = imageIntrinsicSize.height();
             }
             
             return LayoutSize(max<LayoutUnit>(1, w), max<LayoutUnit>(1, h));
         }
-        case SizeNone: {
-            // If both values are ‘auto’ then the intrinsic width and/or height of the image should be used, if any.
-            if (!imageIntrinsicSize.isEmpty())
-                return imageIntrinsicSize;
-
-            // If the image has neither an intrinsic width nor an intrinsic height, its size is determined as for ‘contain’.
-            type = Contain;
-        }
         case Contain:
         case Cover: {
+            LayoutSize imageIntrinsicSize = image->imageSize(this, 1);
             float horizontalScaleFactor = imageIntrinsicSize.width()
                 ? static_cast<float>(positioningAreaSize.width()) / imageIntrinsicSize.width() : 1;
             float verticalScaleFactor = imageIntrinsicSize.height()
                 ? static_cast<float>(positioningAreaSize.height()) / imageIntrinsicSize.height() : 1;
             float scaleFactor = type == Contain ? min(horizontalScaleFactor, verticalScaleFactor) : max(horizontalScaleFactor, verticalScaleFactor);
             return LayoutSize(max<LayoutUnit>(1, imageIntrinsicSize.width() * scaleFactor), max<LayoutUnit>(1, imageIntrinsicSize.height() * scaleFactor));
-       }
+        }
+        case SizeNone:
+            break;
     }
 
-    ASSERT_NOT_REACHED();
-    return LayoutSize();
+    return image->imageSize(this, style()->effectiveZoom());
 }
 
 void RenderBoxModelObject::BackgroundImageGeometry::setNoRepeatX(int xOffset)
@@ -1028,9 +927,7 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const FillLayer* fil
         positioningAreaSize = geometry.destRect().size();
     }
 
-    LayoutSize fillTileSize = calculateFillTileSize(fillLayer, positioningAreaSize);
-    fillLayer->image()->setContainerSizeForRenderer(this, fillTileSize, style()->effectiveZoom());
-    geometry.setTileSize(fillTileSize);
+    geometry.setTileSize(calculateFillTileSize(fillLayer, positioningAreaSize));
 
     EFillRepeat backgroundRepeatX = fillLayer->repeatX();
     EFillRepeat backgroundRepeatY = fillLayer->repeatY();
@@ -1090,12 +987,8 @@ bool RenderBoxModelObject::paintNinePieceImage(GraphicsContext* graphicsContext,
     LayoutUnit rightWithOutset = rect.maxX() + rightOutset;
     LayoutRect borderImageRect = LayoutRect(leftWithOutset, topWithOutset, rightWithOutset - leftWithOutset, bottomWithOutset - topWithOutset);
 
-    LayoutSize imageSize = calculateImageIntrinsicDimensions(styleImage, borderImageRect.size());
-
-    // If both values are ‘auto’ then the intrinsic width and/or height of the image should be used, if any.
-    LayoutSize containerSize = imageSize.isEmpty() ? borderImageRect.size() : imageSize;
-    styleImage->setContainerSizeForRenderer(this, containerSize, style->effectiveZoom());
-
+    styleImage->setContainerSizeForRenderer(this, borderImageRect.size());
+    LayoutSize imageSize = styleImage->imageSize(this, 1.0f);
     LayoutUnit imageWidth = imageSize.width();
     LayoutUnit imageHeight = imageSize.height();
 
index 3e462546ac41e22123016d39ed0c79b73302f633..e6ab70ae8b87652808d584a0299468c0869aa741 100644 (file)
@@ -195,8 +195,7 @@ protected:
 private:
     virtual bool isBoxModelObject() const { return true; }
 
-    LayoutSize calculateFillTileSize(const FillLayer*, const LayoutSize& scaledPositioningAreaSize) const;
-    LayoutSize calculateImageIntrinsicDimensions(StyleImage*, const LayoutSize& scaledPositioningAreaSize) const;
+    LayoutSize calculateFillTileSize(const FillLayer*, LayoutSize scaledSize) const;
 
     RoundedRect getBackgroundRoundedRect(const LayoutRect&, InlineFlowBox*, LayoutUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,
         bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
index 1d8e3b09db30f6a04f3fdcd287774918ff459398..ccb30f9b430d75583cecaf32039532c30783a61f 100644 (file)
@@ -41,7 +41,6 @@
 #include "Page.h"
 #include "RenderLayer.h"
 #include "RenderView.h"
-#include "SVGImage.h"
 #include <wtf/UnusedParam.h>
 
 using namespace std;
@@ -51,7 +50,7 @@ namespace WebCore {
 using namespace HTMLNames;
 
 RenderImage::RenderImage(Node* node)
-    : RenderReplaced(node, IntSize())
+    : RenderReplaced(node, IntSize(0, 0))
     , m_needsToSetSizeForAltText(false)
     , m_didIncrementVisuallyNonEmptyPixelCount(false)
 {
@@ -174,20 +173,14 @@ void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
     imageDimensionsChanged(imageSizeChanged, rect);
 }
 
-bool RenderImage::updateIntrinsicSizeIfNeeded(bool imageSizeChanged)
-{
-    if (m_imageResource->imageSize(style()->effectiveZoom()) == intrinsicSize() && !imageSizeChanged)
-        return false;
-    if (m_imageResource->errorOccurred())
-        return imageSizeChanged;
-    setIntrinsicSize(m_imageResource->imageSize(style()->effectiveZoom()));
-    return true;
-}
-
 void RenderImage::imageDimensionsChanged(bool imageSizeChanged, const IntRect* rect)
 {
     bool shouldRepaint = true;
-    if (updateIntrinsicSizeIfNeeded(imageSizeChanged)) {
+
+    if (m_imageResource->imageSize(style()->effectiveZoom()) != intrinsicSize() || imageSizeChanged) {
+        if (!m_imageResource->errorOccurred())
+            setIntrinsicSize(m_imageResource->imageSize(style()->effectiveZoom()));
+
         // In the case of generated image content using :before/:after, we might not be in the
         // render tree yet.  In that case, we don't need to worry about check for layout, since we'll get a
         // layout when we get added in to the render tree hierarchy later.
@@ -482,58 +475,105 @@ void RenderImage::updateAltText()
         m_altText = static_cast<HTMLImageElement*>(node())->altText();
 }
 
-LayoutUnit RenderImage::computeReplacedLogicalWidth(bool includeMaxWidth) const
+bool RenderImage::isLogicalWidthSpecified() const
 {
-    // If we've got an explicit width/height assigned, propagate it to the image resource.    
-    if (style()->logicalWidth().isFixed() && style()->logicalHeight().isFixed()) {
-        LayoutUnit width = RenderReplaced::computeReplacedLogicalWidth(includeMaxWidth);
-        m_imageResource->setContainerSizeForRenderer(IntSize(width, computeReplacedLogicalHeight()));
-        return width;
+    switch (style()->logicalWidth().type()) {
+        case Fixed:
+        case Percent:
+            return true;
+        case Auto:
+        case Relative: // FIXME: Shouldn't this case return true?
+        case Intrinsic:
+        case MinIntrinsic:
+            return false;
+        case Undefined:
+            ASSERT_NOT_REACHED();
+            return false;
     }
+    ASSERT_NOT_REACHED();
+    return false;
+}
 
-    // Propagate the containing block size to the image resource, otherwhise we can't compute our own intrinsic size, if it's relative.
-    RenderBox* contentRenderer = embeddedContentBox();
-    bool hasRelativeWidth = contentRenderer ? contentRenderer->style()->width().isPercent() : m_imageResource->imageHasRelativeWidth();
-    bool hasRelativeHeight = contentRenderer ? contentRenderer->style()->height().isPercent() : m_imageResource->imageHasRelativeHeight();
-
-    if (hasRelativeWidth || hasRelativeHeight) {
-        RenderObject* containingBlock = isPositioned() ? container() : this->containingBlock();
-        if (containingBlock->isBox()) {
-            RenderBox* box = toRenderBox(containingBlock);
-            m_imageResource->setContainerSizeForRenderer(IntSize(box->availableWidth(), box->availableHeight())); // Already contains zooming information.
-            const_cast<RenderImage*>(this)->updateIntrinsicSizeIfNeeded(false);
-        }
+bool RenderImage::isLogicalHeightSpecified() const
+{
+    switch (style()->logicalHeight().type()) {
+        case Fixed:
+        case Percent:
+            return true;
+        case Auto:
+        case Relative: // FIXME: Shouldn't this case return true?
+        case Intrinsic:
+        case MinIntrinsic:
+            return false;
+        case Undefined:
+            ASSERT_NOT_REACHED();
+            return false;
     }
-
-    return RenderReplaced::computeReplacedLogicalWidth(includeMaxWidth);
+    ASSERT_NOT_REACHED();
+    return false;
 }
 
-void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicRatio, bool& isPercentageIntrinsicSize) const
+LayoutUnit RenderImage::computeReplacedLogicalWidth(bool includeMaxWidth) const
 {
-    // Assure this method is never used for SVGImages.
-    ASSERT(!embeddedContentBox());
-    isPercentageIntrinsicSize = false;
-    if (m_imageResource && m_imageResource->image())
-        intrinsicRatio = m_imageResource->image()->size();
+    if (m_imageResource->imageHasRelativeWidth())
+        if (RenderObject* cb = isPositioned() ? container() : containingBlock()) {
+            if (cb->isBox())
+                m_imageResource->setContainerSizeForRenderer(LayoutSize(toRenderBox(cb)->availableWidth(), toRenderBox(cb)->availableHeight()));
+        }
+
+    LayoutUnit logicalWidth;
+    if (isLogicalWidthSpecified())
+        logicalWidth = computeReplacedLogicalWidthUsing(style()->logicalWidth());
+    else if (m_imageResource->usesImageContainerSize()) {
+        LayoutSize size = m_imageResource->imageSize(style()->effectiveZoom());
+        logicalWidth = style()->isHorizontalWritingMode() ? size.width() : size.height();
+    } else if (m_imageResource->imageHasRelativeWidth())
+        logicalWidth = 0; // If the image is relatively-sized, set the width to 0 until there is a set container size.
+    else
+        logicalWidth = calcAspectRatioLogicalWidth();
+
+    return computeReplacedLogicalWidthRespectingMinMaxWidth(logicalWidth, includeMaxWidth);
 }
 
-bool RenderImage::needsPreferredWidthsRecalculation() const
+LayoutUnit RenderImage::computeReplacedLogicalHeight() const
 {
-    if (RenderReplaced::needsPreferredWidthsRecalculation())
-        return true;
-    return embeddedContentBox();
+    // FIXME: This function should use RenderReplaced::computeReplacedLogicalHeight()
+    LayoutUnit logicalHeight;
+    if (logicalHeightIsAuto() && !style()->logicalWidth().isAuto() && intrinsicLogicalWidth() && intrinsicLogicalHeight())
+        logicalHeight = static_cast<LayoutUnit>(availableLogicalWidth() * intrinsicLogicalHeight() / intrinsicLogicalWidth());
+    else if (isLogicalHeightSpecified())
+        logicalHeight = computeReplacedLogicalHeightUsing(style()->logicalHeight());
+    else if (m_imageResource->usesImageContainerSize()) {
+        LayoutSize size = m_imageResource->imageSize(style()->effectiveZoom());
+        logicalHeight = style()->isHorizontalWritingMode() ? size.height() : size.width();
+    } else if (m_imageResource->imageHasRelativeHeight())
+        logicalHeight = 0; // If the image is relatively-sized, set the height to 0 until there is a set container size.
+    else
+        logicalHeight = calcAspectRatioLogicalHeight();
+
+    return computeReplacedLogicalHeightRespectingMinMaxHeight(logicalHeight);
 }
 
-RenderBox* RenderImage::embeddedContentBox() const
+int RenderImage::calcAspectRatioLogicalWidth() const
 {
-    if (!m_imageResource)
+    int intrinsicWidth = intrinsicLogicalWidth();
+    int intrinsicHeight = intrinsicLogicalHeight();
+    if (!intrinsicHeight)
         return 0;
+    if (!m_imageResource->hasImage() || m_imageResource->errorOccurred())
+        return intrinsicWidth; // Don't bother scaling.
+    return RenderBox::computeReplacedLogicalHeight() * intrinsicWidth / intrinsicHeight;
+}
 
-    RefPtr<Image> image = m_imageResource->image();
-    if (image && image->isSVGImage())
-        return static_pointer_cast<SVGImage>(image)->embeddedContentBox();
-
-    return 0;
+int RenderImage::calcAspectRatioLogicalHeight() const
+{
+    int intrinsicWidth = intrinsicLogicalWidth();
+    int intrinsicHeight = intrinsicLogicalHeight();
+    if (!intrinsicWidth)
+        return 0;
+    if (!m_imageResource->hasImage() || m_imageResource->errorOccurred())
+        return intrinsicHeight; // Don't bother scaling.
+    return RenderBox::computeReplacedLogicalWidth() * intrinsicHeight / intrinsicWidth;
 }
 
 } // namespace WebCore
index 33ef0c00beacce1b61613b185d0ef9f57a692dc9..da895d2660d02f096bcb506a256527b1812f20de 100644 (file)
@@ -54,10 +54,6 @@ public:
     void highQualityRepaintTimerFired(Timer<RenderImage>*);
 
 protected:
-    virtual bool needsPreferredWidthsRecalculation() const;
-    virtual RenderBox* embeddedContentBox() const;
-    virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicRatio, bool& isPercentageIntrinsicSize) const;
-
     virtual void styleDidChange(StyleDifference, const RenderStyle*);
 
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
@@ -65,6 +61,9 @@ protected:
     virtual void paintIntoRect(GraphicsContext*, const IntRect&);
     virtual void paint(PaintInfo&, const LayoutPoint&);
 
+    bool isLogicalWidthSpecified() const;
+    bool isLogicalHeightSpecified() const;
+
     virtual void intrinsicSizeChanged()
     {
         if (m_imageResource)
@@ -87,10 +86,13 @@ private:
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
 
     virtual LayoutUnit computeReplacedLogicalWidth(bool includeMaxWidth = true) const;
+    virtual LayoutUnit computeReplacedLogicalHeight() const;
 
     IntSize imageSizeForError(CachedImage*) const;
     void imageDimensionsChanged(bool imageSizeChanged, const IntRect* = 0);
-    bool updateIntrinsicSizeIfNeeded(bool imageSizeChanged);
+
+    int calcAspectRatioLogicalWidth() const;
+    int calcAspectRatioLogicalHeight() const;
 
     void paintAreaElementFocusRing(PaintInfo&);
 
index 0c3a79e457becae76aeae6147e9a1b3e27dbbbbc..eb748f60af75aee00eab205f7ebebf2a3bdbac24 100644 (file)
@@ -93,7 +93,7 @@ void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai
 {
     ASSERT(m_renderer);
     if (m_cachedImage)
-        m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSize, m_renderer->style()->effectiveZoom());
+        m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSize);
 }
 
 Image* RenderImageResource::nullImage()
index ddb13447e2c07d58ad21091d0e5935fba3f7a55e..7f41984dad7a9eeb4bfe895df4f8a412dac5da4b 100644 (file)
@@ -60,18 +60,4 @@ void RenderImageResourceStyleImage::shutdown()
     m_cachedImage = 0;
 }
 
-PassRefPtr<Image> RenderImageResourceStyleImage::image(int width, int height) const
-{
-    // Generated content may trigger calls to image() while we're still pending, don't assert but gracefully exit.
-    if (m_styleImage->isPendingImage())
-        return 0;
-    return m_styleImage->image(m_renderer, IntSize(width, height));
-}
-
-void RenderImageResourceStyleImage::setContainerSizeForRenderer(const IntSize& size)
-{
-    ASSERT(m_renderer);
-    m_styleImage->setContainerSizeForRenderer(m_renderer, size, m_renderer->style()->effectiveZoom());
-}
-
 } // namespace WebCore
index 6d2f7b6b274e20f68750099bbe0f331e778d524a..fcad246393c784f26c21eb7276c1c7d86fea96de 100644 (file)
@@ -46,10 +46,10 @@ public:
     virtual void shutdown();
 
     virtual bool hasImage() const { return true; }
-    virtual PassRefPtr<Image> image(int width = 0, int height = 0) const;
+    virtual PassRefPtr<Image> image(int width = 0, int height = 0) const { return m_styleImage->image(m_renderer, IntSize(width, height)); }
     virtual bool errorOccurred() const { return m_styleImage->errorOccurred(); }
 
-    virtual void setContainerSizeForRenderer(const IntSize&);
+    virtual void setContainerSizeForRenderer(const IntSize& size) { m_styleImage->setContainerSizeForRenderer(m_renderer, size); }
     virtual bool usesImageContainerSize() const { return m_styleImage->usesImageContainerSize(); }
     virtual bool imageHasRelativeWidth() const { return m_styleImage->imageHasRelativeWidth(); }
     virtual bool imageHasRelativeHeight() const { return m_styleImage->imageHasRelativeHeight(); }
index 13dad9814e29d1b6671fcda9125d92f4728688d8..876c809de66b5889d865ab8d327c30f7352f695d 100644 (file)
@@ -1350,7 +1350,7 @@ void RenderListMarker::computePreferredLogicalWidths()
         // FIXME: This is a somewhat arbitrary width.  Generated images for markers really won't become particularly useful
         // until we support the CSS3 marker pseudoclass to allow control over the width and height of the marker box.
         LayoutUnit bulletWidth = fontMetrics.ascent() / 2;
-        m_image->setContainerSizeForRenderer(this, LayoutSize(bulletWidth, bulletWidth), style()->effectiveZoom());
+        m_image->setContainerSizeForRenderer(this, LayoutSize(bulletWidth, bulletWidth));
         LayoutSize imageSize = m_image->imageSize(this, style()->effectiveZoom());
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = style()->isHorizontalWritingMode() ? imageSize.width() : imageSize.height();
         setPreferredLogicalWidthsDirty(false);
index 2f0c59dc461d3f75bba19117b1437287e9c6b5ae..87084d1f9b71ece258422196e1c452ce7a3137ea 100644 (file)
@@ -201,8 +201,8 @@ bool RenderReplaced::shouldPaint(PaintInfo& paintInfo, const LayoutPoint& paintO
 int RenderReplaced::computeIntrinsicLogicalWidth(RenderBox* contentRenderer, bool includeMaxWidth) const
 {
     if (m_hasIntrinsicSize) {
-        if (!contentRenderer || !contentRenderer->style()->logicalWidth().isFixed())
-            return computeReplacedLogicalWidthRespectingMinMaxWidth(calcAspectRatioLogicalWidth(), includeMaxWidth);
+        ASSERT(!contentRenderer);
+        return computeReplacedLogicalWidthRespectingMinMaxWidth(calcAspectRatioLogicalWidth(), includeMaxWidth);
     }
     ASSERT(contentRenderer);
     ASSERT(contentRenderer->style());
@@ -212,8 +212,8 @@ int RenderReplaced::computeIntrinsicLogicalWidth(RenderBox* contentRenderer, boo
 int RenderReplaced::computeIntrinsicLogicalHeight(RenderBox* contentRenderer) const
 {
     if (m_hasIntrinsicSize) {
-        if (!contentRenderer || !contentRenderer->style()->logicalHeight().isFixed())
-            return computeReplacedLogicalHeightRespectingMinMaxHeight(calcAspectRatioLogicalHeight());
+        ASSERT(!contentRenderer);
+        return computeReplacedLogicalHeightRespectingMinMaxHeight(calcAspectRatioLogicalHeight());
     }
     ASSERT(contentRenderer);
     ASSERT(contentRenderer->style());
@@ -235,8 +235,7 @@ LayoutUnit RenderReplaced::computeReplacedLogicalWidth(bool includeMaxWidth) con
         contentRenderer->computeIntrinsicRatioInformation(intrinsicRatio, isPercentageIntrinsicSize);
         contentRenderStyle = contentRenderer->style();
         ASSERT(contentRenderStyle);
-    } else
-        computeIntrinsicRatioInformation(intrinsicRatio, isPercentageIntrinsicSize);
+    }
 
     if (style()->logicalWidth().isAuto()) {
         bool heightIsAuto = style()->logicalHeight().isAuto();
index 822836ee759aa3f60185346258dcfecb7f9254cd..35c8dc3dc4193ba899c64cd973b95e4cfcd480fc 100644 (file)
@@ -64,9 +64,9 @@ bool StyleCachedImage::imageHasRelativeHeight() const
     return m_image->imageHasRelativeHeight();
 }
 
-void StyleCachedImage::computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+void StyleCachedImage::computeIntrinsicDimensions(const RenderObject* renderer, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
-    m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
+    m_image->computeIntrinsicDimensions(renderer, intrinsicWidth, intrinsicHeight, intrinsicRatio);
 }
 
 bool StyleCachedImage::usesImageContainerSize() const
@@ -74,19 +74,19 @@ bool StyleCachedImage::usesImageContainerSize() const
     return m_image->usesImageContainerSize();
 }
 
-void StyleCachedImage::setContainerSizeForRenderer(const RenderObject* renderer, const IntSize& imageContainerSize, float imageContainerZoomFactor)
+void StyleCachedImage::setContainerSizeForRenderer(const RenderObject* renderer, const IntSize& imageContainerSize)
 {
-    m_image->setContainerSizeForRenderer(renderer, imageContainerSize, imageContainerZoomFactor);
+    m_image->setContainerSizeForRenderer(renderer, imageContainerSize);
 }
 
 void StyleCachedImage::addClient(RenderObject* renderer)
 {
-    m_image->addClientForRenderer(renderer);
+    m_image->addClient(renderer);
 }
 
 void StyleCachedImage::removeClient(RenderObject* renderer)
 {
-    m_image->removeClientForRenderer(renderer);
+    m_image->removeClient(renderer);
 }
 
 PassRefPtr<Image> StyleCachedImage::image(RenderObject* renderer, const IntSize&) const
index 06dfb25a6ff662671d8b4513c648970280517cac..05a0c5259b7197a6e15b7ada2f90281209f40c9d 100644 (file)
@@ -48,7 +48,7 @@ public:
     virtual bool imageHasRelativeHeight() const;
     virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
     virtual bool usesImageContainerSize() const;
-    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize&, float);
+    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize&);
     virtual void addClient(RenderObject*);
     virtual void removeClient(RenderObject*);
     virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const;
index 7620237ae6079f476058c05647a145a29bdb289f..089c3edb1606cd1295a92dfc38709f9d13a47bb4 100644 (file)
@@ -47,7 +47,7 @@ public:
     virtual bool imageHasRelativeHeight() const { return !m_fixedSize; }
     virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
     virtual bool usesImageContainerSize() const { return !m_fixedSize; }
-    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize& containerSize, float) { m_containerSize = containerSize; }
+    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize& containerSize) { m_containerSize = containerSize; }
     virtual void addClient(RenderObject*);
     virtual void removeClient(RenderObject*);
     virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const;
index 0a5766b4fc36f15da5983a7117afa1915fc4b6c7..11c6dd436bbc6d4685e19295aa0476cbbbc921a6 100644 (file)
@@ -57,7 +57,7 @@ public:
     virtual bool imageHasRelativeWidth() const = 0;
     virtual bool imageHasRelativeHeight() const = 0;
     virtual bool usesImageContainerSize() const = 0;
-    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize&, float) = 0;
+    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize&) = 0;
     virtual void addClient(RenderObject*) = 0;
     virtual void removeClient(RenderObject*) = 0;
     virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const = 0;
index c0ee139aa514f46e959855914aac17cede829833..e379f74fc017de979f602de82aea3c400c390e8f 100644 (file)
@@ -49,7 +49,7 @@ public:
     virtual bool imageHasRelativeHeight() const { return false; }
     virtual void computeIntrinsicDimensions(const RenderObject*, Length& /* intrinsicWidth */ , Length& /* intrinsicHeight */, FloatSize& /* intrinsicRatio */) { }
     virtual bool usesImageContainerSize() const { return false; }
-    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize&, float) { }
+    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize&) { }
     virtual void addClient(RenderObject*) { }
     virtual void removeClient(RenderObject*) { }
     virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const
index 0935fef261a61e0633f0aa6d1be24c18fbf7f802..2b0b1f95a0c1c1cb45a13a2bbcf65f42431da42b 100644 (file)
@@ -66,7 +66,6 @@ void RenderSVGImage::layout()
 
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout() && selfNeedsLayout());
     SVGImageElement* image = static_cast<SVGImageElement*>(node());
-    m_imageResource->setContainerSizeForRenderer(enclosingIntRect(m_objectBoundingBox).size());
 
     bool transformOrBoundariesUpdate = m_needsTransformUpdate || m_updateCachedRepaintRect;
     if (m_needsTransformUpdate) {
index 9b6b88db5cd791b87cd68511e7f0c533935b5979..1d4fc918690b349981c65a28cee31188317bdd86 100644 (file)
 #if ENABLE(SVG)
 #include "RenderSVGRoot.h"
 
-#include "Chrome.h"
-#include "ChromeClient.h"
 #include "Frame.h"
 #include "GraphicsContext.h"
 #include "HitTestResult.h"
 #include "LayoutRepainter.h"
-#include "Page.h"
 #include "RenderPart.h"
 #include "RenderSVGContainer.h"
 #include "RenderSVGResource.h"
@@ -117,24 +114,20 @@ void RenderSVGRoot::computePreferredLogicalWidths()
     setPreferredLogicalWidthsDirty(false);
 }
 
-bool RenderSVGRoot::isEmbeddedThroughImageElement() const
+LayoutUnit RenderSVGRoot::computeIntrinsicWidth(LayoutUnit replacedWidth) const
 {
-    if (!node())
-        return false;
-
-    Frame* frame = node()->document()->frame();
-    if (!frame)
-        return false;
-
-    // Test whether we're embedded through an img.
-    if (!frame->page() || !frame->page()->chrome())
-        return false;
-
-    ChromeClient* chromeClient = frame->page()->chrome()->client();
-    if (!chromeClient || !chromeClient->isSVGImageChromeClient())
-        return false;
+    if (!style()->width().isPercent())
+        return replacedWidth;
+    // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
+    return static_cast<int>(ceilf(replacedWidth * style()->effectiveZoom()));
+}
 
-    return true;
+LayoutUnit RenderSVGRoot::computeIntrinsicHeight(LayoutUnit replacedHeight) const
+{
+    if (!style()->height().isPercent())
+        return replacedHeight;
+    // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
+    return static_cast<int>(ceilf(replacedHeight * style()->effectiveZoom()));
 }
 
 static inline bool isEmbeddedThroughFrameContainingSVGDocument(const Frame* frame)
@@ -148,18 +141,13 @@ static inline bool isEmbeddedThroughFrameContainingSVGDocument(const Frame* fram
 
 LayoutUnit RenderSVGRoot::computeReplacedLogicalWidth(bool includeMaxWidth) const
 {
-    // When we're embedded through SVGImage (border-image/background-image/<html:img>/...) we're forced to resize to a specific size.
-    LayoutUnit replacedWidth = m_containerSize.width();
-    if (replacedWidth > 0)
-        return replacedWidth;
-
-    replacedWidth = RenderBox::computeReplacedLogicalWidth(includeMaxWidth);
+    LayoutUnit replacedWidth = RenderBox::computeReplacedLogicalWidth(includeMaxWidth);
     Frame* frame = node() && node()->document() ? node()->document()->frame() : 0;
     if (!frame)
-        return replacedWidth;
+        return computeIntrinsicWidth(replacedWidth);
 
     if (isEmbeddedThroughFrameContainingSVGDocument(frame))
-        return replacedWidth;
+        return computeIntrinsicWidth(replacedWidth);
 
     RenderPart* ownerRenderer = frame->ownerRenderer();
     RenderStyle* ownerRendererStyle = ownerRenderer->style();
@@ -193,18 +181,14 @@ LayoutUnit RenderSVGRoot::computeReplacedLogicalWidth(bool includeMaxWidth) cons
 
 LayoutUnit RenderSVGRoot::computeReplacedLogicalHeight() const
 {
-    // When we're embedded through SVGImage (border-image/background-image/<html:img>/...) we're forced to resize to a specific size.
-    LayoutUnit replacedHeight = m_containerSize.height();
-    if (replacedHeight > 0)
-        return replacedHeight;
+    LayoutUnit replacedHeight = RenderBox::computeReplacedLogicalHeight();
 
-    replacedHeight = RenderBox::computeReplacedLogicalHeight();
     Frame* frame = node() && node()->document() ? node()->document()->frame() : 0;
     if (!frame)
-        return replacedHeight;
+        return computeIntrinsicHeight(replacedHeight);
 
     if (isEmbeddedThroughFrameContainingSVGDocument(frame))
-        return replacedHeight;
+        return computeIntrinsicHeight(replacedHeight);
 
     RenderPart* ownerRenderer = frame->ownerRenderer();
     RenderStyle* ownerRendererStyle = ownerRenderer->style();
@@ -236,10 +220,11 @@ void RenderSVGRoot::layout()
     LayoutSize oldSize(width(), height());
     computeLogicalWidth();
     computeLogicalHeight();
+    calcViewport();
 
     SVGSVGElement* svg = static_cast<SVGSVGElement*>(node());
-    m_isLayoutSizeChanged = needsLayout || (svg->hasRelativeLengths() && oldSize != size());
-
+    m_isLayoutSizeChanged = svg->hasRelativeLengths() && oldSize != size();
     if (view() && view()->frameView() && view()->frameView()->embeddedContentBox()) {
         if (!m_needsSizeNegotiationWithHostDocument)
             m_needsSizeNegotiationWithHostDocument = !m_everHadLayout || oldSize != size();
@@ -285,8 +270,8 @@ void RenderSVGRoot::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
     if (paintInfo.phase == PaintPhaseBlockBackground)
         return;
 
-    // An empty viewport disables rendering.
-    if (borderBoxRect().isEmpty())
+    // An empty viewport disables rendering.  FIXME: Should we still render filters?
+    if (m_viewportSize.isEmpty())
         return;
 
     // Don't paint if we don't have kids, except if we have filters we should paint those.
@@ -345,6 +330,26 @@ void RenderSVGRoot::updateFromElement()
     SVGResourcesCache::clientUpdatedFromElement(this, style());
 }
 
+void RenderSVGRoot::calcViewport()
+{
+    SVGSVGElement* svg = static_cast<SVGSVGElement*>(node());
+
+    if (!svg->hasSetContainerSize()) {
+        // In the normal case of <svg> being stand-alone or in a CSSBoxModel object we use
+        // RenderBox::width()/height() (which pulls data from RenderStyle)
+        m_viewportSize = FloatSize(width(), height());
+        return;
+    }
+
+    // In the SVGImage case grab the SVGLength values off of SVGSVGElement and use
+    // the special relativeWidthValue accessors which respect the specified containerSize
+    // FIXME: Check how SVGImage + zooming is supposed to be handled?
+    SVGLength width = svg->width();
+    SVGLength height = svg->height();
+    m_viewportSize = FloatSize(width.unitType() == LengthTypePercentage ? svg->relativeWidthValue() : width.value(svg),
+                               height.unitType() == LengthTypePercentage ? svg->relativeHeightValue() : height.value(svg));
+}
+
 // RenderBox methods will expect coordinates w/o any transforms in coordinates
 // relative to our borderBox origin.  This method gives us exactly that.
 AffineTransform RenderSVGRoot::localToBorderBoxTransform() const
@@ -393,7 +398,7 @@ void RenderSVGRoot::computeRectForRepaint(RenderBoxModelObject* repaintContainer
     repaintRect = localToBorderBoxTransform().mapRect(repaintRect);
 
     // Apply initial viewport clip - not affected by overflow settings    
-    repaintRect.intersect(borderBoxRect());
+    repaintRect.intersect(enclosingLayoutRect(FloatRect(FloatPoint(), m_viewportSize)));
 
     const SVGRenderStyle* svgStyle = style()->svgStyle();
     if (const ShadowData* shadow = svgStyle->shadow())
index c0335f637bd9d24eff5d5b6b34f950b4fa6bc449..77ffc76d77158691206f0e184b99f34652f618f5 100644 (file)
 
 namespace WebCore {
 
-class AffineTransform;
 class SVGStyledElement;
+class AffineTransform;
 
 class RenderSVGRoot : public RenderBox {
 public:
     explicit RenderSVGRoot(SVGStyledElement*);
     virtual ~RenderSVGRoot();
 
-    bool isEmbeddedThroughImageElement() const;
-
     virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicRatio, bool& isPercentageIntrinsicSize) const;
     const RenderObjectChildList* children() const { return &m_children; }
     RenderObjectChildList* children() { return &m_children; }
@@ -57,10 +55,10 @@ public:
     virtual void setNeedsBoundariesUpdate() { m_needsBoundariesOrTransformUpdate = true; }
     virtual void setNeedsTransformUpdate() { m_needsBoundariesOrTransformUpdate = true; }
 
-    IntSize containerSize() const { return m_containerSize; }
-    void setContainerSize(const IntSize& containerSize) { m_containerSize = containerSize; }
-
 private:
+    LayoutUnit computeIntrinsicWidth(LayoutUnit replacedWidth) const;
+    LayoutUnit computeIntrinsicHeight(LayoutUnit replacedHeight) const;
+
     virtual RenderObjectChildList* virtualChildren() { return children(); }
     virtual const RenderObjectChildList* virtualChildren() const { return children(); }
 
@@ -94,6 +92,8 @@ private:
 
     virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
 
+    void calcViewport();
+
     bool selfWillPaint();
     void updateCachedBoundaries();
 
@@ -103,7 +103,7 @@ private:
     AffineTransform localToBorderBoxTransform() const;
 
     RenderObjectChildList m_children;
-    IntSize m_containerSize;
+    FloatSize m_viewportSize;
     FloatRect m_objectBoundingBox;
     FloatRect m_strokeBoundingBox;
     FloatRect m_repaintBoundingBox;
index d8b42af7f807a8533559a0c7a15806d38eff6fa3..ad42f5e9e7186268bb14bb31dd1e51eeda58162e 100644 (file)
@@ -28,8 +28,8 @@
 #include "FloatConversion.h"
 #include "Frame.h"
 #include "FrameView.h"
+#include "RenderObject.h"
 #include "RenderPart.h"
-#include "RenderSVGRoot.h"
 #include "RenderView.h"
 #include "SVGException.h"
 #include "SVGNames.h"
@@ -360,7 +360,6 @@ bool SVGLength::determineViewport(const SVGElement* context, float& width, float
             if (!frame)
                 return false;
 
-            // SVGs embedded through <object> resolve percentage values against the owner renderer in the host document.
             if (RenderPart* ownerRenderer = frame->ownerRenderer()) {
                 width = ownerRenderer->width();
                 height = ownerRenderer->height();
@@ -372,14 +371,8 @@ bool SVGLength::determineViewport(const SVGElement* context, float& width, float
         if (!view)
             return false;
 
-        // Always resolve percentages against the unscaled viewport, as agreed across browsers.
-        float zoom = view->style()->effectiveZoom();
         width = view->viewWidth();
         height = view->viewHeight();
-        if (zoom != 1) {
-            width /= zoom;
-            height /= zoom;
-        }
         return true;
     }
 
@@ -387,13 +380,12 @@ bool SVGLength::determineViewport(const SVGElement* context, float& width, float
     SVGElement* viewportElement = context->viewportElement();
     if (viewportElement && viewportElement->isSVG()) {
         const SVGSVGElement* svg = static_cast<const SVGSVGElement*>(viewportElement);
-        FloatRect viewBox = svg->currentViewBoxRect();
-        if (viewBox.isEmpty()) {
+        if (svg->hasAttribute(SVGNames::viewBoxAttr)) {
+            width = svg->viewBox().width();
+            height = svg->viewBox().height();
+        } else {
             width = svg->width().value(svg);
             height = svg->height().value(svg);
-        } else {
-            width = viewBox.width();
-            height = viewBox.height();
         }
 
         return true;
index efb2b2b683d12a048ee84f4352604bf7d199bda2..c9240f4b7b8e08d288e72c515b1dcda546fb8480 100644 (file)
@@ -87,6 +87,8 @@ inline SVGSVGElement::SVGSVGElement(const QualifiedName& tagName, Document* doc)
     , m_height(LengthModeHeight, "100%") 
     , m_useCurrentView(false)
     , m_timeContainer(SMILTimeContainer::create(this))
+    , m_containerSize(300, 150)
+    , m_hasSetContainerSize(false)
 {
     ASSERT(hasTagName(SVGNames::svgTag));
     registerAnimatedPropertiesForSVGSVGElement();
@@ -152,6 +154,24 @@ FloatRect SVGSVGElement::viewport() const
     return viewBoxToViewTransform(viewRectangle.width(), viewRectangle.height()).mapRect(viewRectangle);
 }
 
+int SVGSVGElement::relativeWidthValue() const
+{
+    SVGLength w = width();
+    if (w.unitType() != LengthTypePercentage)
+        return 0;
+
+    return static_cast<int>(w.valueAsPercentage() * m_containerSize.width());
+}
+
+int SVGSVGElement::relativeHeightValue() const
+{
+    SVGLength h = height();
+    if (h.unitType() != LengthTypePercentage)
+        return 0;
+
+    return static_cast<int>(h.valueAsPercentage() * m_containerSize.height());
+}
+
 float SVGSVGElement::pixelUnitToMillimeterX() const
 {
     // 2.54 / cssPixelsPerInch gives CM.
@@ -559,16 +579,7 @@ FloatRect SVGSVGElement::currentViewBoxRect() const
         return FloatRect();
     }
 
-    // Synthesize a viewBox if we're embedded through a <img> element, if none is present.
-    FloatRect useViewBox = viewBox();
-    if (useViewBox.isEmpty() && width().unitType() != LengthTypePercentage && height().unitType() != LengthTypePercentage) {
-        if (RenderObject* renderer = this->renderer()) {
-            if (renderer->isSVGRoot() && toRenderSVGRoot(renderer)->isEmbeddedThroughImageElement())
-                useViewBox = FloatRect(0, 0, width().value(this), height().value(this));
-        }
-    }
-
-    return useViewBox;
+    return viewBox();
 }
 
 AffineTransform SVGSVGElement::viewBoxToViewTransform(float viewWidth, float viewHeight) const
index bc43a2d453741fa6d215a3ffdc456d750bc3d06b..01e00b8085886b7fc8dccdff7110b3f02ce4dabf 100644 (file)
@@ -63,6 +63,12 @@ public:
 
     FloatRect viewport() const;
 
+    void setContainerSize(const LayoutSize& containerSize) { m_containerSize = containerSize; m_hasSetContainerSize = true; }
+    LayoutSize containerSize() const { return m_containerSize; }
+    bool hasSetContainerSize() const { return m_hasSetContainerSize; }
+    int relativeWidthValue() const;
+    int relativeHeightValue() const;
+
     float pixelUnitToMillimeterX() const;
     float pixelUnitToMillimeterY() const;
     float screenPixelToMillimeterX() const;
@@ -175,6 +181,8 @@ private:
     RefPtr<SMILTimeContainer> m_timeContainer;
     FloatPoint m_translation;
     mutable OwnPtr<SVGViewSpec> m_viewSpec;
+    LayoutSize m_containerSize;
+    bool m_hasSetContainerSize;
 };
 
 } // namespace WebCore
index d89cd2671b061acc47c64c9a1e3a69f4013e91d0..dc8d82b7c4701295dd6da9bed5b991a01f23b4a1 100644 (file)
@@ -43,9 +43,7 @@
 #include "HTMLFormElement.h"
 #include "ImageBuffer.h"
 #include "ImageObserver.h"
-#include "Length.h"
 #include "Page.h"
-#include "RenderSVGRoot.h"
 #include "RenderView.h"
 #include "ResourceError.h"
 #include "SVGDocument.h"
@@ -64,8 +62,6 @@ public:
     {
     }
 
-    void setObserver(SVGImage* image) { m_image = image; }
-    virtual bool isSVGImageChromeClient() const { return true; }
     SVGImage* image() const { return m_image; }
     
 private:
@@ -103,19 +99,11 @@ SVGImage::~SVGImage()
     ASSERT(!m_chromeClient || !m_chromeClient->image());
 }
 
-void SVGImage::setContainerZoom(float containerZoom)
+void SVGImage::setContainerSize(const IntSize& containerSize)
 {
-    if (!m_page)
+    if (containerSize.isEmpty())
         return;
-    m_chromeClient->setObserver(0);
-    m_page->mainFrame()->setPageZoomFactor(containerZoom);
-    m_chromeClient->setObserver(this);
-}
 
-void SVGImage::setContainerSize(const IntSize& containerSize)
-{
-    ASSERT(!containerSize.isEmpty());
-    
     if (!m_page)
         return;
     Frame* frame = m_page->mainFrame();
@@ -123,14 +111,7 @@ void SVGImage::setContainerSize(const IntSize& containerSize)
     if (!rootElement)
         return;
 
-    RenderSVGRoot* renderer = toRenderSVGRoot(rootElement->renderer());
-    if (!renderer)
-        return;
-    renderer->setContainerSize(containerSize);
-
-    frame->view()->resize(size());
-    if (frame->view()->needsLayout())
-        frame->view()->layout();
+    rootElement->setContainerSize(containerSize);
 }
 
 bool SVGImage::usesContainerSize() const
@@ -141,9 +122,8 @@ bool SVGImage::usesContainerSize() const
     SVGSVGElement* rootElement = static_cast<SVGDocument*>(frame->document())->rootElement();
     if (!rootElement)
         return false;
-    if (RenderSVGRoot* renderer = toRenderSVGRoot(rootElement->renderer()))
-        return !renderer->containerSize().isEmpty();
-    return false;
+
+    return rootElement->hasSetContainerSize();
 }
 
 IntSize SVGImage::size() const
@@ -154,23 +134,44 @@ IntSize SVGImage::size() const
     SVGSVGElement* rootElement = static_cast<SVGDocument*>(frame->document())->rootElement();
     if (!rootElement)
         return IntSize();
+    
+    SVGLength width = rootElement->width();
+    SVGLength height = rootElement->height();
+    
+    IntSize svgSize;
+    if (width.unitType() == LengthTypePercentage) 
+        svgSize.setWidth(rootElement->relativeWidthValue());
+    else
+        svgSize.setWidth(static_cast<int>(width.value(rootElement)));
+
+    if (height.unitType() == LengthTypePercentage) 
+        svgSize.setHeight(rootElement->relativeHeightValue());
+    else
+        svgSize.setHeight(static_cast<int>(height.value(rootElement)));
+
+    return svgSize;
+}
 
-    RenderSVGRoot* renderer = toRenderSVGRoot(rootElement->renderer());
-    if (!renderer)
-        return IntSize();
+bool SVGImage::hasRelativeWidth() const
+{
+    if (!m_page)
+        return false;
+    SVGSVGElement* rootElement = static_cast<SVGDocument*>(m_page->mainFrame()->document())->rootElement();
+    if (!rootElement)
+        return false;
 
-    // If a container size is available it has precedence.
-    IntSize containerSize = renderer->containerSize();
-    if (!containerSize.isEmpty())
-        return containerSize;
+    return rootElement->width().unitType() == LengthTypePercentage;
+}
 
-    // Otherwise fallback to the viewBox size.
-    IntSize size = enclosingIntRect(rootElement->currentViewBoxRect()).size();
-    if (!size.isEmpty())
-        return size;
+bool SVGImage::hasRelativeHeight() const
+{
+    if (!m_page)
+        return false;
+    SVGSVGElement* rootElement = static_cast<SVGDocument*>(m_page->mainFrame()->document())->rootElement();
+    if (!rootElement)
+        return false;
 
-    // As last resort, use CSS default intrinsic size.
-    return IntSize(300, 150);
+    return rootElement->height().unitType() == LengthTypePercentage;
 }
 
 void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp)
@@ -196,6 +197,11 @@ void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const Fl
     context->translate(destOffset.x(), destOffset.y());
     context->scale(scale);
 
+    view->resize(size());
+
+    if (view->needsLayout())
+        view->layout();
+
     view->paint(context, IntRect(0, 0, view->width(), view->height()));
 
     if (compositeOp != CompositeSourceOver)
@@ -207,17 +213,6 @@ void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const Fl
         imageObserver()->didDraw(this);
 }
 
-RenderBox* SVGImage::embeddedContentBox() const
-{
-    if (!m_page)
-        return 0;
-    Frame* frame = m_page->mainFrame();
-    SVGSVGElement* rootElement = static_cast<SVGDocument*>(frame->document())->rootElement();
-    if (!rootElement)
-        return 0;
-    return toRenderBox(rootElement->renderer());
-}
-
 void SVGImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
     if (!m_page)
@@ -232,8 +227,8 @@ void SVGImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrin
 
     intrinsicWidth = renderer->style()->width();
     intrinsicHeight = renderer->style()->height();
-    if (rootElement->preserveAspectRatio().align() != SVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_NONE)
-        intrinsicRatio = rootElement->currentViewBoxRect().size();
+    // FIXME: Add intrinsicRatio calculation from webkit.org/b/47156.
+    intrinsicRatio = FloatSize();
 }
 
 NativeImagePtr SVGImage::nativeImageForCurrentFrame()
@@ -300,20 +295,12 @@ bool SVGImage::dataChanged(bool allDataReceived)
         frame->init();
         FrameLoader* loader = frame->loader();
         loader->setForcedSandboxFlags(SandboxAll);
-
-        frame->view()->setCanHaveScrollbars(false); // SVG Images will always synthesize a viewBox, if it's not available, and thus never see scrollbars.
-        frame->view()->setTransparent(true); // SVG Images are transparent.
-
         ASSERT(loader->activeDocumentLoader()); // DocumentLoader should have been created by frame->init().
         loader->activeDocumentLoader()->writer()->setMIMEType("image/svg+xml");
         loader->activeDocumentLoader()->writer()->begin(KURL()); // create the empty document
         loader->activeDocumentLoader()->writer()->addData(data()->data(), data()->size());
         loader->activeDocumentLoader()->writer()->end();
-    
-        frame->view()->resize(size());
-
-        if (frame->view()->needsLayout())
-            frame->view()->layout();
+        frame->view()->setTransparent(true); // SVG Images are transparent.
     }
 
     return m_page;
index 1356af952df799239e28c931b4539473ed6ac408..38ffb535a759524bf1bb55bf07c9132abc433be4 100644 (file)
@@ -35,7 +35,6 @@
 namespace WebCore {
 
 class Page;
-class RenderBox;
 class SVGImageChromeClient;
 
 class SVGImage : public Image {
@@ -45,9 +44,6 @@ public:
         return adoptRef(new SVGImage(observer));
     }
 
-    RenderBox* embeddedContentBox() const;
-    void setContainerZoom(float);
-
     virtual bool isSVGImage() const { return true; }
 
 private:
@@ -57,6 +53,8 @@ private:
 
     virtual void setContainerSize(const IntSize&);
     virtual bool usesContainerSize() const;
+    virtual bool hasRelativeWidth() const;
+    virtual bool hasRelativeHeight() const;
     virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     virtual IntSize size() const;