Changeset 92293 in webkit


Ignore:
Timestamp:
Aug 3, 2011 10:55:14 AM (13 years ago)
Author:
leviw@chromium.org
Message:

REGRESSION(87526): ASSERT(!needsLayout()) followed by graphical glitches on google charts (svg loaded in iframe)
https://bugs.webkit.org/show_bug.cgi?id=64974

Reviewed by James Robinson.

Rolling back r87526 for Chrome 14.

Source/WebCore:

  • platform/Length.h:

(WebCore::Length::isIntrinsicOrAuto):

  • rendering/RenderPart.cpp:

(WebCore::RenderPart::embeddedContentBox):

  • rendering/RenderReplaced.cpp:

(WebCore::lengthIsSpecified):
(WebCore::RenderReplaced::computeReplacedLogicalWidth):
(WebCore::RenderReplaced::computeReplacedLogicalHeight):

  • rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::RenderSVGRoot):
(WebCore::RenderSVGRoot::computeReplacedLogicalWidth):
(WebCore::RenderSVGRoot::computeReplacedLogicalHeight):
(WebCore::RenderSVGRoot::layout):

  • rendering/svg/RenderSVGRoot.h:
  • svg/SVGLength.cpp:

(WebCore::SVGLength::determineViewport):

  • svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::SVGSVGElement):
(WebCore::SVGSVGElement::currentScale):
(WebCore::SVGSVGElement::setCurrentScale):
(WebCore::SVGSVGElement::viewBoxToViewTransform):

  • svg/SVGSVGElement.h:

LayoutTests:

  • css2.1/20110323/replaced-intrinsic-001.htm: Removed.
  • css2.1/20110323/replaced-intrinsic-002.htm: Removed.
  • css2.1/20110323/replaced-intrinsic-003.htm: Removed.
  • css2.1/20110323/replaced-intrinsic-004.htm: Removed.
  • css2.1/20110323/replaced-intrinsic-005.htm: Removed.
  • css2.1/20110323/replaced-intrinsic-ratio-001.htm: Removed.
  • http/tests/misc/object-embedding-svg-delayed-size-negotiation-2.htm: Removed.
  • http/tests/misc/object-embedding-svg-delayed-size-negotiation.xhtml: Removed.
  • http/tests/misc/resources/embedded.svg: Removed.
  • http/tests/misc/resources/intrinsic-ratio-slow.pl: Removed.
  • http/tests/misc/resources/intrinsic-ratio.svg: Removed.
  • http/tests/misc/resources/svg-slow.pl: Removed.
  • platform/chromium-linux/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
  • platform/chromium-linux/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
  • platform/chromium-linux/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
  • platform/chromium-linux/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
  • platform/chromium-linux/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-expected.png: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-explicit-height-expected.png: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-explicit-width-expected.png: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-no-width-height-expected.png: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/chromium-linux/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/chromium-linux/svg/hixie/intrinsic/001-expected.png: Removed.
  • platform/chromium-linux/svg/hixie/intrinsic/002-expected.png: Removed.
  • platform/chromium-linux/svg/hixie/intrinsic/003-expected.png: Removed.
  • platform/chromium-linux/svg/hixie/intrinsic/003-expected.txt: Removed.
  • platform/chromium-linux/svg/wicd/rightsizing-grid-expected.png: Removed.
  • platform/chromium-linux/svg/wicd/rightsizing-grid-expected.txt: Removed.
  • platform/chromium-linux/svg/wicd/test-rightsizing-a-expected.png: Removed.
  • platform/chromium-linux/svg/wicd/test-rightsizing-b-expected.png: Removed.
  • platform/chromium-linux/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
  • platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
  • platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
  • platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
  • platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
  • platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/chromium-mac-leopard/svg/custom/object-sizing-expected.png: Removed.
  • platform/chromium-mac-leopard/svg/hixie/intrinsic/001-expected.png: Removed.
  • platform/chromium-mac-leopard/svg/hixie/intrinsic/002-expected.png: Removed.
  • platform/chromium-mac-leopard/svg/hixie/intrinsic/003-expected.png: Removed.
  • platform/chromium-mac-leopard/svg/wicd/rightsizing-grid-expected.png: Removed.
  • platform/chromium-mac-leopard/svg/wicd/test-rightsizing-b-expected.png: Removed.
  • platform/chromium-mac-leopard/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/chromium-mac/svg/wicd/rightsizing-grid-expected.png: Removed.
  • platform/chromium-mac/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/chromium-mac/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
  • platform/chromium-win-vista/svg/wicd/test-rightsizing-b-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-001-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-002-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-003-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-004-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/replaced-intrinsic-005-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-explicit-height-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-explicit-height-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-explicit-width-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-explicit-width-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-no-width-height-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-no-width-height-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
  • platform/chromium-win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/chromium-win/svg/hixie/intrinsic/001-expected.png: Removed.
  • platform/chromium-win/svg/hixie/intrinsic/001-expected.txt: Removed.
  • platform/chromium-win/svg/hixie/intrinsic/002-expected.png: Removed.
  • platform/chromium-win/svg/hixie/intrinsic/002-expected.txt: Removed.
  • platform/chromium-win/svg/hixie/intrinsic/003-expected.png: Removed.
  • platform/chromium-win/svg/hixie/intrinsic/003-expected.txt: Removed.
  • platform/chromium-win/svg/wicd/rightsizing-grid-expected.png: Removed.
  • platform/chromium-win/svg/wicd/rightsizing-grid-expected.txt: Removed.
  • platform/chromium-win/svg/wicd/test-rightsizing-a-expected.png: Removed.
  • platform/chromium-win/svg/wicd/test-rightsizing-a-expected.txt: Removed.
  • platform/chromium-win/svg/wicd/test-rightsizing-b-expected.png: Removed.
  • platform/chromium-win/svg/wicd/test-rightsizing-b-expected.txt: Removed.
  • platform/chromium-win/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/chromium-win/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-001-expected.txt: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-002-expected.txt: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-003-expected.txt: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.txt: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.txt: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/gtk/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-explicit-height-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-explicit-height-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-explicit-width-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-explicit-width-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-no-width-height-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-no-width-height-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/gtk/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
  • platform/gtk/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/gtk/svg/hixie/intrinsic/001-expected.png: Removed.
  • platform/gtk/svg/hixie/intrinsic/001-expected.txt: Removed.
  • platform/gtk/svg/hixie/intrinsic/002-expected.png: Removed.
  • platform/gtk/svg/hixie/intrinsic/002-expected.txt: Removed.
  • platform/gtk/svg/hixie/intrinsic/003-expected.png: Removed.
  • platform/gtk/svg/hixie/intrinsic/003-expected.txt: Removed.
  • platform/gtk/svg/wicd/rightsizing-grid-expected.png: Removed.
  • platform/gtk/svg/wicd/rightsizing-grid-expected.txt: Removed.
  • platform/gtk/svg/wicd/test-rightsizing-a-expected.png: Removed.
  • platform/gtk/svg/wicd/test-rightsizing-a-expected.txt: Removed.
  • platform/gtk/svg/wicd/test-rightsizing-b-expected.png: Removed.
  • platform/gtk/svg/wicd/test-rightsizing-b-expected.txt: Removed.
  • platform/mac-wk2/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-001-expected.txt: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-002-expected.txt: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-003-expected.txt: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-004-expected.txt: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-005-expected.txt: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/mac/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt: Removed.
  • platform/mac/fast/block/positioning/rtl-fixed-positioning-expected.png:
  • platform/mac/fast/block/positioning/vertical-rl/fixed-positioning-expected.png:
  • platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png: Removed.
  • platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.txt: Removed.
  • platform/mac/svg/custom/object-no-size-attributes-expected.png: Removed.
  • platform/mac/svg/custom/object-no-size-attributes-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-explicit-height-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-explicit-height-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-explicit-width-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-explicit-width-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-no-width-height-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-no-width-height-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/mac/svg/hixie/intrinsic/001-expected.png: Removed.
  • platform/mac/svg/hixie/intrinsic/001-expected.txt: Removed.
  • platform/mac/svg/hixie/intrinsic/002-expected.png: Removed.
  • platform/mac/svg/hixie/intrinsic/002-expected.txt: Removed.
  • platform/mac/svg/hixie/intrinsic/003-expected.png: Removed.
  • platform/mac/svg/hixie/intrinsic/003-expected.txt: Removed.
  • platform/mac/svg/hixie/text/003-expected.png: Removed.
  • platform/mac/svg/hixie/text/003-expected.txt:
  • platform/mac/svg/in-html/by-reference-expected.txt:
  • platform/mac/svg/wicd/rightsizing-grid-expected.png: Removed.
  • platform/mac/svg/wicd/rightsizing-grid-expected.txt: Removed.
  • platform/mac/svg/wicd/test-rightsizing-a-expected.png: Removed.
  • platform/mac/svg/wicd/test-rightsizing-a-expected.txt: Removed.
  • platform/mac/svg/wicd/test-rightsizing-b-expected.png: Removed.
  • platform/mac/svg/wicd/test-rightsizing-b-expected.txt: Removed.
  • platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.txt:
  • platform/mac/svg/zoom/page/zoom-foreignObject-expected.png: Removed.
  • platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt:
  • platform/mac/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/mac/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-huge-size-expected.png: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-huge-size-expected.txt: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-no-width-height-expected.png: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-no-width-height-expected.txt: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.txt: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt: Removed.
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-text-expected.png: Removed.
  • platform/qt-4.8/svg/custom/object-sizing-expected.png: Removed.
  • platform/qt-4.8/svg/custom/object-sizing-expected.txt: Removed.
  • platform/qt-4.8/svg/wicd/test-rightsizing-a-expected.png: Removed.
  • platform/qt-4.8/svg/wicd/test-rightsizing-a-expected.txt: Removed.
  • platform/qt-4.8/svg/wicd/test-rightsizing-b-expected.png: Removed.
  • platform/qt-4.8/svg/wicd/test-rightsizing-b-expected.txt: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-001-expected.txt: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-002-expected.txt: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-003-expected.txt: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-004-expected.txt: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-005-expected.txt: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/qt/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-no-width-height-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-no-width-height-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/qt/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
  • platform/qt/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/qt/svg/hixie/intrinsic/001-expected.png: Removed.
  • platform/qt/svg/hixie/intrinsic/001-expected.txt: Removed.
  • platform/qt/svg/hixie/intrinsic/002-expected.png: Removed.
  • platform/qt/svg/hixie/intrinsic/002-expected.txt: Removed.
  • platform/qt/svg/hixie/intrinsic/003-expected.png: Removed.
  • platform/qt/svg/hixie/intrinsic/003-expected.txt: Removed.
  • platform/qt/svg/wicd/rightsizing-grid-expected.png: Removed.
  • platform/qt/svg/wicd/rightsizing-grid-expected.txt: Removed.
  • platform/qt/svg/wicd/test-rightsizing-a-expected.png: Removed.
  • platform/qt/svg/wicd/test-rightsizing-a-expected.txt: Removed.
  • platform/qt/svg/wicd/test-rightsizing-b-expected.png: Removed.
  • platform/qt/svg/wicd/test-rightsizing-b-expected.txt: Removed.
  • platform/qt/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
  • platform/qt/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
  • platform/win/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
  • platform/win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
  • platform/win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
  • platform/win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • platform/win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/win/svg/hixie/intrinsic/003-expected.png: Removed.
  • platform/win/svg/hixie/intrinsic/003-expected.txt: Removed.
  • svg/custom/object-no-size-attributes.xhtml: Removed.
  • svg/custom/object-sizing-explicit-height.xhtml: Removed.
  • svg/custom/object-sizing-explicit-width-height.xhtml: Removed.
  • svg/custom/object-sizing-explicit-width.xhtml: Removed.
  • svg/custom/object-sizing-height-50p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-height-50p-on-target-svg.xhtml: Removed.
  • svg/custom/object-sizing-no-width-height-change-content-box-size.xhtml: Removed.
  • svg/custom/object-sizing-no-width-height.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-height-50p-on-target-svg.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-height-75p-on-target-svg.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-on-target-svg.xhtml: Removed.
  • svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-width-75p-height-50p-on-target-svg.xhtml: Removed.
  • svg/custom/object-sizing.xhtml: Removed.
  • svg/custom/resources/embedded.svg: Removed.
  • svg/custom/resources/red-circle.svg: Removed.
  • svg/hixie/intrinsic/001.html: Removed.
  • svg/hixie/intrinsic/002.html: Removed.
  • svg/hixie/intrinsic/003.html: Removed.
  • svg/hixie/intrinsic/resources: Removed.
  • svg/hixie/intrinsic/resources/001.svg: Removed.
  • svg/hixie/intrinsic/resources/002.svg: Removed.
  • svg/hixie/intrinsic/resources/003.svg: Removed.
  • svg/hixie/intrinsic/resources/test-bl: Removed.
  • svg/hixie/intrinsic/resources/test-br: Removed.
  • svg/hixie/intrinsic/resources/test-tl: Removed.
  • svg/hixie/intrinsic/resources/test-tr: Removed.
  • svg/in-html/by-reference-expected.png: Removed.
  • svg/wicd/rightsizing-grid.xhtml: Removed.
  • svg/wicd/test-rightsizing-a.xhtml: Removed.
  • svg/wicd/test-rightsizing-b.xhtml: Removed.
  • svg/zoom/page/resources/intrinsic-ratio.svg: Removed.
  • svg/zoom/page/zoom-replaced-intrinsic-ratio-001.htm: Removed.
  • svg/zoom/page/zoom-svg-through-object-with-absolute-size-2.xhtml-disabled: Removed.
  • svg/zoom/page/zoom-svg-through-object-with-absolute-size.xhtml-disabled: Removed.
  • svg/zoom/page/zoom-svg-through-object-with-huge-size.xhtml-disabled: Removed.
  • svg/zoom/page/zoom-svg-through-object-with-override-size.html-disabled: Removed.
  • svg/zoom/page/zoom-svg-through-object-with-percentage-size.xhtml-disabled: Removed.
  • svg/zoom/page/zoom-svg-through-object-with-text.xhtml-disabled: Removed.
Location:
branches/chromium/835
Files:
343 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • branches/chromium/835/LayoutTests/ChangeLog

    r92204 r92293  
     12011-08-02  Levi Weintraub  <leviw@chromium.org>
     2
     3        REGRESSION(87526): ASSERT(!needsLayout()) followed by graphical glitches on google charts (svg loaded in iframe)
     4        https://bugs.webkit.org/show_bug.cgi?id=64974
     5
     6        Reviewed by James Robinson.
     7
     8        Rolling back r87526 for Chrome 14.
     9
     10        * css2.1/20110323/replaced-intrinsic-001.htm: Removed.
     11        * css2.1/20110323/replaced-intrinsic-002.htm: Removed.
     12        * css2.1/20110323/replaced-intrinsic-003.htm: Removed.
     13        * css2.1/20110323/replaced-intrinsic-004.htm: Removed.
     14        * css2.1/20110323/replaced-intrinsic-005.htm: Removed.
     15        * css2.1/20110323/replaced-intrinsic-ratio-001.htm: Removed.
     16        * http/tests/misc/object-embedding-svg-delayed-size-negotiation-2.htm: Removed.
     17        * http/tests/misc/object-embedding-svg-delayed-size-negotiation.xhtml: Removed.
     18        * http/tests/misc/resources/embedded.svg: Removed.
     19        * http/tests/misc/resources/intrinsic-ratio-slow.pl: Removed.
     20        * http/tests/misc/resources/intrinsic-ratio.svg: Removed.
     21        * http/tests/misc/resources/svg-slow.pl: Removed.
     22        * platform/chromium-linux/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
     23        * platform/chromium-linux/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
     24        * platform/chromium-linux/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
     25        * platform/chromium-linux/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
     26        * platform/chromium-linux/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
     27        * platform/chromium-linux/svg/custom/object-sizing-expected.png: Removed.
     28        * platform/chromium-linux/svg/custom/object-sizing-explicit-height-expected.png: Removed.
     29        * platform/chromium-linux/svg/custom/object-sizing-explicit-width-expected.png: Removed.
     30        * platform/chromium-linux/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
     31        * platform/chromium-linux/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
     32        * platform/chromium-linux/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
     33        * platform/chromium-linux/svg/custom/object-sizing-no-width-height-expected.png: Removed.
     34        * platform/chromium-linux/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
     35        * platform/chromium-linux/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
     36        * platform/chromium-linux/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     37        * platform/chromium-linux/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
     38        * platform/chromium-linux/svg/hixie/intrinsic/001-expected.png: Removed.
     39        * platform/chromium-linux/svg/hixie/intrinsic/002-expected.png: Removed.
     40        * platform/chromium-linux/svg/hixie/intrinsic/003-expected.png: Removed.
     41        * platform/chromium-linux/svg/hixie/intrinsic/003-expected.txt: Removed.
     42        * platform/chromium-linux/svg/wicd/rightsizing-grid-expected.png: Removed.
     43        * platform/chromium-linux/svg/wicd/rightsizing-grid-expected.txt: Removed.
     44        * platform/chromium-linux/svg/wicd/test-rightsizing-a-expected.png: Removed.
     45        * platform/chromium-linux/svg/wicd/test-rightsizing-b-expected.png: Removed.
     46        * platform/chromium-linux/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
     47        * platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
     48        * platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
     49        * platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
     50        * platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
     51        * platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
     52        * platform/chromium-mac-leopard/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png: Removed.
     53        * platform/chromium-mac-leopard/svg/custom/object-sizing-expected.png: Removed.
     54        * platform/chromium-mac-leopard/svg/hixie/intrinsic/001-expected.png: Removed.
     55        * platform/chromium-mac-leopard/svg/hixie/intrinsic/002-expected.png: Removed.
     56        * platform/chromium-mac-leopard/svg/hixie/intrinsic/003-expected.png: Removed.
     57        * platform/chromium-mac-leopard/svg/wicd/rightsizing-grid-expected.png: Removed.
     58        * platform/chromium-mac-leopard/svg/wicd/test-rightsizing-b-expected.png: Removed.
     59        * platform/chromium-mac-leopard/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
     60        * platform/chromium-mac/svg/wicd/rightsizing-grid-expected.png: Removed.
     61        * platform/chromium-mac/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
     62        * platform/chromium-mac/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
     63        * platform/chromium-win-vista/svg/wicd/test-rightsizing-b-expected.png: Removed.
     64        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
     65        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-001-expected.txt: Removed.
     66        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
     67        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-002-expected.txt: Removed.
     68        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
     69        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-003-expected.txt: Removed.
     70        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
     71        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-004-expected.txt: Removed.
     72        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
     73        * platform/chromium-win/css2.1/20110323/replaced-intrinsic-005-expected.txt: Removed.
     74        * platform/chromium-win/svg/custom/object-sizing-expected.png: Removed.
     75        * platform/chromium-win/svg/custom/object-sizing-expected.txt: Removed.
     76        * platform/chromium-win/svg/custom/object-sizing-explicit-height-expected.png: Removed.
     77        * platform/chromium-win/svg/custom/object-sizing-explicit-height-expected.txt: Removed.
     78        * platform/chromium-win/svg/custom/object-sizing-explicit-width-expected.png: Removed.
     79        * platform/chromium-win/svg/custom/object-sizing-explicit-width-expected.txt: Removed.
     80        * platform/chromium-win/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
     81        * platform/chromium-win/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
     82        * platform/chromium-win/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
     83        * platform/chromium-win/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
     84        * platform/chromium-win/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
     85        * platform/chromium-win/svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
     86        * platform/chromium-win/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
     87        * platform/chromium-win/svg/custom/object-sizing-no-width-height-expected.png: Removed.
     88        * platform/chromium-win/svg/custom/object-sizing-no-width-height-expected.txt: Removed.
     89        * platform/chromium-win/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
     90        * platform/chromium-win/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     91        * platform/chromium-win/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
     92        * platform/chromium-win/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
     93        * platform/chromium-win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
     94        * platform/chromium-win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
     95        * platform/chromium-win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
     96        * platform/chromium-win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
     97        * platform/chromium-win/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
     98        * platform/chromium-win/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
     99        * platform/chromium-win/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
     100        * platform/chromium-win/svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
     101        * platform/chromium-win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
     102        * platform/chromium-win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     103        * platform/chromium-win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
     104        * platform/chromium-win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
     105        * platform/chromium-win/svg/hixie/intrinsic/001-expected.png: Removed.
     106        * platform/chromium-win/svg/hixie/intrinsic/001-expected.txt: Removed.
     107        * platform/chromium-win/svg/hixie/intrinsic/002-expected.png: Removed.
     108        * platform/chromium-win/svg/hixie/intrinsic/002-expected.txt: Removed.
     109        * platform/chromium-win/svg/hixie/intrinsic/003-expected.png: Removed.
     110        * platform/chromium-win/svg/hixie/intrinsic/003-expected.txt: Removed.
     111        * platform/chromium-win/svg/wicd/rightsizing-grid-expected.png: Removed.
     112        * platform/chromium-win/svg/wicd/rightsizing-grid-expected.txt: Removed.
     113        * platform/chromium-win/svg/wicd/test-rightsizing-a-expected.png: Removed.
     114        * platform/chromium-win/svg/wicd/test-rightsizing-a-expected.txt: Removed.
     115        * platform/chromium-win/svg/wicd/test-rightsizing-b-expected.png: Removed.
     116        * platform/chromium-win/svg/wicd/test-rightsizing-b-expected.txt: Removed.
     117        * platform/chromium-win/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
     118        * platform/chromium-win/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
     119        * platform/gtk/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
     120        * platform/gtk/css2.1/20110323/replaced-intrinsic-001-expected.txt: Removed.
     121        * platform/gtk/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
     122        * platform/gtk/css2.1/20110323/replaced-intrinsic-002-expected.txt: Removed.
     123        * platform/gtk/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
     124        * platform/gtk/css2.1/20110323/replaced-intrinsic-003-expected.txt: Removed.
     125        * platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
     126        * platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.txt: Removed.
     127        * platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
     128        * platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.txt: Removed.
     129        * platform/gtk/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png: Removed.
     130        * platform/gtk/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt: Removed.
     131        * platform/gtk/svg/custom/object-sizing-expected.png: Removed.
     132        * platform/gtk/svg/custom/object-sizing-expected.txt: Removed.
     133        * platform/gtk/svg/custom/object-sizing-explicit-height-expected.png: Removed.
     134        * platform/gtk/svg/custom/object-sizing-explicit-height-expected.txt: Removed.
     135        * platform/gtk/svg/custom/object-sizing-explicit-width-expected.png: Removed.
     136        * platform/gtk/svg/custom/object-sizing-explicit-width-expected.txt: Removed.
     137        * platform/gtk/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
     138        * platform/gtk/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
     139        * platform/gtk/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
     140        * platform/gtk/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
     141        * platform/gtk/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
     142        * platform/gtk/svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
     143        * platform/gtk/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
     144        * platform/gtk/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.txt: Removed.
     145        * platform/gtk/svg/custom/object-sizing-no-width-height-expected.png: Removed.
     146        * platform/gtk/svg/custom/object-sizing-no-width-height-expected.txt: Removed.
     147        * platform/gtk/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
     148        * platform/gtk/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     149        * platform/gtk/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
     150        * platform/gtk/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
     151        * platform/gtk/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
     152        * platform/gtk/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
     153        * platform/gtk/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
     154        * platform/gtk/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
     155        * platform/gtk/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
     156        * platform/gtk/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
     157        * platform/gtk/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
     158        * platform/gtk/svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
     159        * platform/gtk/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
     160        * platform/gtk/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     161        * platform/gtk/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
     162        * platform/gtk/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
     163        * platform/gtk/svg/hixie/intrinsic/001-expected.png: Removed.
     164        * platform/gtk/svg/hixie/intrinsic/001-expected.txt: Removed.
     165        * platform/gtk/svg/hixie/intrinsic/002-expected.png: Removed.
     166        * platform/gtk/svg/hixie/intrinsic/002-expected.txt: Removed.
     167        * platform/gtk/svg/hixie/intrinsic/003-expected.png: Removed.
     168        * platform/gtk/svg/hixie/intrinsic/003-expected.txt: Removed.
     169        * platform/gtk/svg/wicd/rightsizing-grid-expected.png: Removed.
     170        * platform/gtk/svg/wicd/rightsizing-grid-expected.txt: Removed.
     171        * platform/gtk/svg/wicd/test-rightsizing-a-expected.png: Removed.
     172        * platform/gtk/svg/wicd/test-rightsizing-a-expected.txt: Removed.
     173        * platform/gtk/svg/wicd/test-rightsizing-b-expected.png: Removed.
     174        * platform/gtk/svg/wicd/test-rightsizing-b-expected.txt: Removed.
     175        * platform/mac-wk2/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
     176        * platform/mac/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
     177        * platform/mac/css2.1/20110323/replaced-intrinsic-001-expected.txt: Removed.
     178        * platform/mac/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
     179        * platform/mac/css2.1/20110323/replaced-intrinsic-002-expected.txt: Removed.
     180        * platform/mac/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
     181        * platform/mac/css2.1/20110323/replaced-intrinsic-003-expected.txt: Removed.
     182        * platform/mac/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
     183        * platform/mac/css2.1/20110323/replaced-intrinsic-004-expected.txt: Removed.
     184        * platform/mac/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
     185        * platform/mac/css2.1/20110323/replaced-intrinsic-005-expected.txt: Removed.
     186        * platform/mac/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png: Removed.
     187        * platform/mac/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt: Removed.
     188        * platform/mac/fast/block/positioning/rtl-fixed-positioning-expected.png:
     189        * platform/mac/fast/block/positioning/vertical-rl/fixed-positioning-expected.png:
     190        * platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png: Removed.
     191        * platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.txt: Removed.
     192        * platform/mac/svg/custom/object-no-size-attributes-expected.png: Removed.
     193        * platform/mac/svg/custom/object-no-size-attributes-expected.txt: Removed.
     194        * platform/mac/svg/custom/object-sizing-expected.png: Removed.
     195        * platform/mac/svg/custom/object-sizing-expected.txt: Removed.
     196        * platform/mac/svg/custom/object-sizing-explicit-height-expected.png: Removed.
     197        * platform/mac/svg/custom/object-sizing-explicit-height-expected.txt: Removed.
     198        * platform/mac/svg/custom/object-sizing-explicit-width-expected.png: Removed.
     199        * platform/mac/svg/custom/object-sizing-explicit-width-expected.txt: Removed.
     200        * platform/mac/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
     201        * platform/mac/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
     202        * platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
     203        * platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
     204        * platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
     205        * platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
     206        * platform/mac/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
     207        * platform/mac/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.txt: Removed.
     208        * platform/mac/svg/custom/object-sizing-no-width-height-expected.png: Removed.
     209        * platform/mac/svg/custom/object-sizing-no-width-height-expected.txt: Removed.
     210        * platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
     211        * platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     212        * platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
     213        * platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
     214        * platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
     215        * platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
     216        * platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
     217        * platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
     218        * platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
     219        * platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
     220        * platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
     221        * platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
     222        * platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
     223        * platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     224        * platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
     225        * platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
     226        * platform/mac/svg/hixie/intrinsic/001-expected.png: Removed.
     227        * platform/mac/svg/hixie/intrinsic/001-expected.txt: Removed.
     228        * platform/mac/svg/hixie/intrinsic/002-expected.png: Removed.
     229        * platform/mac/svg/hixie/intrinsic/002-expected.txt: Removed.
     230        * platform/mac/svg/hixie/intrinsic/003-expected.png: Removed.
     231        * platform/mac/svg/hixie/intrinsic/003-expected.txt: Removed.
     232        * platform/mac/svg/hixie/text/003-expected.png: Removed.
     233        * platform/mac/svg/hixie/text/003-expected.txt:
     234        * platform/mac/svg/in-html/by-reference-expected.txt:
     235        * platform/mac/svg/wicd/rightsizing-grid-expected.png: Removed.
     236        * platform/mac/svg/wicd/rightsizing-grid-expected.txt: Removed.
     237        * platform/mac/svg/wicd/test-rightsizing-a-expected.png: Removed.
     238        * platform/mac/svg/wicd/test-rightsizing-a-expected.txt: Removed.
     239        * platform/mac/svg/wicd/test-rightsizing-b-expected.png: Removed.
     240        * platform/mac/svg/wicd/test-rightsizing-b-expected.txt: Removed.
     241        * platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.txt:
     242        * platform/mac/svg/zoom/page/zoom-foreignObject-expected.png: Removed.
     243        * platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt:
     244        * platform/mac/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
     245        * platform/mac/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
     246        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png: Removed.
     247        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png: Removed.
     248        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-huge-size-expected.png: Removed.
     249        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-huge-size-expected.txt: Removed.
     250        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-no-width-height-expected.png: Removed.
     251        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-no-width-height-expected.txt: Removed.
     252        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png: Removed.
     253        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.txt: Removed.
     254        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png: Removed.
     255        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt: Removed.
     256        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-text-expected.png: Removed.
     257        * platform/qt-4.8/svg/custom/object-sizing-expected.png: Removed.
     258        * platform/qt-4.8/svg/custom/object-sizing-expected.txt: Removed.
     259        * platform/qt-4.8/svg/wicd/test-rightsizing-a-expected.png: Removed.
     260        * platform/qt-4.8/svg/wicd/test-rightsizing-a-expected.txt: Removed.
     261        * platform/qt-4.8/svg/wicd/test-rightsizing-b-expected.png: Removed.
     262        * platform/qt-4.8/svg/wicd/test-rightsizing-b-expected.txt: Removed.
     263        * platform/qt/css2.1/20110323/replaced-intrinsic-001-expected.png: Removed.
     264        * platform/qt/css2.1/20110323/replaced-intrinsic-001-expected.txt: Removed.
     265        * platform/qt/css2.1/20110323/replaced-intrinsic-002-expected.png: Removed.
     266        * platform/qt/css2.1/20110323/replaced-intrinsic-002-expected.txt: Removed.
     267        * platform/qt/css2.1/20110323/replaced-intrinsic-003-expected.png: Removed.
     268        * platform/qt/css2.1/20110323/replaced-intrinsic-003-expected.txt: Removed.
     269        * platform/qt/css2.1/20110323/replaced-intrinsic-004-expected.png: Removed.
     270        * platform/qt/css2.1/20110323/replaced-intrinsic-004-expected.txt: Removed.
     271        * platform/qt/css2.1/20110323/replaced-intrinsic-005-expected.png: Removed.
     272        * platform/qt/css2.1/20110323/replaced-intrinsic-005-expected.txt: Removed.
     273        * platform/qt/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png: Removed.
     274        * platform/qt/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt: Removed.
     275        * platform/qt/svg/custom/object-sizing-expected.png: Removed.
     276        * platform/qt/svg/custom/object-sizing-expected.txt: Removed.
     277        * platform/qt/svg/custom/object-sizing-explicit-width-height-expected.png: Removed.
     278        * platform/qt/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
     279        * platform/qt/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
     280        * platform/qt/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
     281        * platform/qt/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
     282        * platform/qt/svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
     283        * platform/qt/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.png: Removed.
     284        * platform/qt/svg/custom/object-sizing-no-width-height-change-content-box-size-expected.txt: Removed.
     285        * platform/qt/svg/custom/object-sizing-no-width-height-expected.png: Removed.
     286        * platform/qt/svg/custom/object-sizing-no-width-height-expected.txt: Removed.
     287        * platform/qt/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
     288        * platform/qt/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     289        * platform/qt/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
     290        * platform/qt/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
     291        * platform/qt/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
     292        * platform/qt/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
     293        * platform/qt/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
     294        * platform/qt/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
     295        * platform/qt/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
     296        * platform/qt/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
     297        * platform/qt/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
     298        * platform/qt/svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
     299        * platform/qt/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
     300        * platform/qt/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     301        * platform/qt/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
     302        * platform/qt/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
     303        * platform/qt/svg/hixie/intrinsic/001-expected.png: Removed.
     304        * platform/qt/svg/hixie/intrinsic/001-expected.txt: Removed.
     305        * platform/qt/svg/hixie/intrinsic/002-expected.png: Removed.
     306        * platform/qt/svg/hixie/intrinsic/002-expected.txt: Removed.
     307        * platform/qt/svg/hixie/intrinsic/003-expected.png: Removed.
     308        * platform/qt/svg/hixie/intrinsic/003-expected.txt: Removed.
     309        * platform/qt/svg/wicd/rightsizing-grid-expected.png: Removed.
     310        * platform/qt/svg/wicd/rightsizing-grid-expected.txt: Removed.
     311        * platform/qt/svg/wicd/test-rightsizing-a-expected.png: Removed.
     312        * platform/qt/svg/wicd/test-rightsizing-a-expected.txt: Removed.
     313        * platform/qt/svg/wicd/test-rightsizing-b-expected.png: Removed.
     314        * platform/qt/svg/wicd/test-rightsizing-b-expected.txt: Removed.
     315        * platform/qt/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png: Removed.
     316        * platform/qt/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.txt: Removed.
     317        * platform/win/svg/custom/object-sizing-explicit-width-height-expected.txt: Removed.
     318        * platform/win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
     319        * platform/win/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
     320        * platform/win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     321        * platform/win/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
     322        * platform/win/svg/hixie/intrinsic/003-expected.png: Removed.
     323        * platform/win/svg/hixie/intrinsic/003-expected.txt: Removed.
     324        * svg/custom/object-no-size-attributes.xhtml: Removed.
     325        * svg/custom/object-sizing-explicit-height.xhtml: Removed.
     326        * svg/custom/object-sizing-explicit-width-height.xhtml: Removed.
     327        * svg/custom/object-sizing-explicit-width.xhtml: Removed.
     328        * svg/custom/object-sizing-height-50p-on-target-svg-absolute.xhtml: Removed.
     329        * svg/custom/object-sizing-height-50p-on-target-svg.xhtml: Removed.
     330        * svg/custom/object-sizing-no-width-height-change-content-box-size.xhtml: Removed.
     331        * svg/custom/object-sizing-no-width-height.xhtml: Removed.
     332        * svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute.xhtml: Removed.
     333        * svg/custom/object-sizing-width-50p-height-50p-on-target-svg.xhtml: Removed.
     334        * svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute.xhtml: Removed.
     335        * svg/custom/object-sizing-width-50p-height-75p-on-target-svg.xhtml: Removed.
     336        * svg/custom/object-sizing-width-50p-on-target-svg-absolute.xhtml: Removed.
     337        * svg/custom/object-sizing-width-50p-on-target-svg.xhtml: Removed.
     338        * svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute.xhtml: Removed.
     339        * svg/custom/object-sizing-width-75p-height-50p-on-target-svg.xhtml: Removed.
     340        * svg/custom/object-sizing.xhtml: Removed.
     341        * svg/custom/resources/embedded.svg: Removed.
     342        * svg/custom/resources/red-circle.svg: Removed.
     343        * svg/hixie/intrinsic/001.html: Removed.
     344        * svg/hixie/intrinsic/002.html: Removed.
     345        * svg/hixie/intrinsic/003.html: Removed.
     346        * svg/hixie/intrinsic/resources: Removed.
     347        * svg/hixie/intrinsic/resources/001.svg: Removed.
     348        * svg/hixie/intrinsic/resources/002.svg: Removed.
     349        * svg/hixie/intrinsic/resources/003.svg: Removed.
     350        * svg/hixie/intrinsic/resources/test-bl: Removed.
     351        * svg/hixie/intrinsic/resources/test-br: Removed.
     352        * svg/hixie/intrinsic/resources/test-tl: Removed.
     353        * svg/hixie/intrinsic/resources/test-tr: Removed.
     354        * svg/in-html/by-reference-expected.png: Removed.
     355        * svg/wicd/rightsizing-grid.xhtml: Removed.
     356        * svg/wicd/test-rightsizing-a.xhtml: Removed.
     357        * svg/wicd/test-rightsizing-b.xhtml: Removed.
     358        * svg/zoom/page/resources/intrinsic-ratio.svg: Removed.
     359        * svg/zoom/page/zoom-replaced-intrinsic-ratio-001.htm: Removed.
     360        * svg/zoom/page/zoom-svg-through-object-with-absolute-size-2.xhtml-disabled: Removed.
     361        * svg/zoom/page/zoom-svg-through-object-with-absolute-size.xhtml-disabled: Removed.
     362        * svg/zoom/page/zoom-svg-through-object-with-huge-size.xhtml-disabled: Removed.
     363        * svg/zoom/page/zoom-svg-through-object-with-override-size.html-disabled: Removed.
     364        * svg/zoom/page/zoom-svg-through-object-with-percentage-size.xhtml-disabled: Removed.
     365        * svg/zoom/page/zoom-svg-through-object-with-text.xhtml-disabled: Removed.
     366
    13672011-08-01  Scott Graham  <scottmg@chromium.org>
    2368
  • branches/chromium/835/LayoutTests/platform/mac/svg/hixie/text/003-expected.txt

    r88913 r92293  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x414
    4   RenderBlock {HTML} at (0,0) size 800x414
    5     RenderBody {BODY} at (8,16) size 784x382
     3layer at (0,0) size 800x402
     4  RenderBlock {HTML} at (0,0) size 800x402
     5    RenderBody {BODY} at (8,16) size 784x370
    66      RenderBlock {P} at (0,0) size 784x18
    77        RenderText {#text} at (0,0) size 608x18
    88          text run at (0,0) width 608: "The following two blocks should look identical (to the pixel), and they should both say \"PASS\":"
    9       RenderBlock {P} at (0,34) size 784x166
    10         RenderEmbeddedObject {OBJECT} at (0,0) size 784x162 [border: (3px inset #000080)]
    11           layer at (0,0) size 778x156
    12             RenderView at (0,0) size 778x156
    13           layer at (0,0) size 778x156
    14             RenderSVGRoot {svg} at (0,0) size 467x156
     9      RenderBlock {P} at (0,34) size 784x160
     10        RenderEmbeddedObject {OBJECT} at (0,0) size 306x156 [border: (3px inset #000080)]
     11          layer at (0,0) size 300x150
     12            RenderView at (0,0) size 300x150
     13          layer at (0,0) size 300x150
     14            RenderSVGRoot {svg} at (0,0) size 180x150
    1515              RenderSVGText {text} at (0,-1) size 3x3 contains 1 chunk(s)
    1616                RenderSVGInlineText {#text} at (0,0) size 3x3
    17                   chunk 1 text run 1 at (0.00,0.80) startOffset 0 endOffset 4 width 2.40: "PASS"
    18       RenderBlock {P} at (0,216) size 784x166
    19         RenderEmbeddedObject {OBJECT} at (0,0) size 784x162 [border: (3px inset #000080)]
    20           layer at (0,0) size 778x156
    21             RenderView at (0,0) size 778x156
    22           layer at (0,0) size 778x156
    23             RenderSVGRoot {svg} at (0,0) size 375x156
    24               RenderSVGText {text} at (0,-100) size 2404x1151 contains 1 chunk(s)
    25                 RenderSVGInlineText {#text} at (0,0) size 2404x1151
    26                   chunk 1 text run 1 at (0.00,800.00) startOffset 0 endOffset 4 width 2403.60: "PASS"
     17                  chunk 1 text run 1 at (0.00,0.80) startOffset 0 endOffset 4 width 2.37: "PASS"
     18      RenderBlock {P} at (0,210) size 784x160
     19        RenderEmbeddedObject {OBJECT} at (0,0) size 306x156 [border: (3px inset #000080)]
     20          layer at (0,0) size 300x150
     21            RenderView at (0,0) size 300x150
     22          layer at (0,0) size 300x150
     23            RenderSVGRoot {svg} at (0,39) size 143x69
     24              RenderSVGText {text} at (0,-100) size 2367x1150 contains 1 chunk(s)
     25                RenderSVGInlineText {#text} at (0,0) size 2367x1150
     26                  chunk 1 text run 1 at (0.00,800.00) startOffset 0 endOffset 4 width 2366.67: "PASS"
  • branches/chromium/835/LayoutTests/platform/mac/svg/in-html/by-reference-expected.txt

    r87526 r92293  
    2222          layer at (0,0) size 100x100
    2323            RenderView at (0,0) size 100x100
    24           layer at (0,0) size 100x100
     24          layer at (0,0) size 50x50
    2525            RenderSVGRoot {svg} at (0,0) size 0x0
    2626        RenderText {#text} at (208,86) size 4x18
  • branches/chromium/835/LayoutTests/platform/mac/svg/zoom/page/relative-sized-document-scrollbars-expected.txt

    r87526 r92293  
    1 layer at (0,0) size 1357x1011
     1layer at (0,0) size 1356x1011
    22  RenderView at (0,0) size 785x585
    3 layer at (0,0) size 1357x1011
     3layer at (0,0) size 1356x1011
    44  RenderSVGRoot {svg} at (12,8) size 1333x995
    55    RenderSVGPath {rect} at (12,8) size 1333x995 [stroke={[type=SOLID] [color=#000000]}] [x=7.85] [y=5.85] [width=769.30] [height=573.30]
  • branches/chromium/835/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt

    r87526 r92293  
    1 layer at (0,0) size 1131x843
     1layer at (0,0) size 1130x842
    22  RenderView at (0,0) size 785x585
    3 layer at (0,0) size 1131x843
    4   RenderSVGRoot {svg} at (12,12) size 1119x831
     3layer at (0,0) size 1130x842
     4  RenderSVGRoot {svg} at (12,12) size 1118x830
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    66      RenderBlock {xhtml:div} at (0,0) size 580x18
  • branches/chromium/835/Source/WebCore/ChangeLog

    r92204 r92293  
     12011-08-02  Levi Weintraub  <leviw@chromium.org>
     2
     3        REGRESSION(87526): ASSERT(!needsLayout()) followed by graphical glitches on google charts (svg loaded in iframe)
     4        https://bugs.webkit.org/show_bug.cgi?id=64974
     5
     6        Reviewed by James Robinson.
     7
     8        Rolling back r87526 for Chrome 14.
     9
     10        * platform/Length.h:
     11        (WebCore::Length::isIntrinsicOrAuto):
     12        * rendering/RenderPart.cpp:
     13        (WebCore::RenderPart::embeddedContentBox):
     14        * rendering/RenderReplaced.cpp:
     15        (WebCore::lengthIsSpecified):
     16        (WebCore::RenderReplaced::computeReplacedLogicalWidth):
     17        (WebCore::RenderReplaced::computeReplacedLogicalHeight):
     18        * rendering/svg/RenderSVGRoot.cpp:
     19        (WebCore::RenderSVGRoot::RenderSVGRoot):
     20        (WebCore::RenderSVGRoot::computeReplacedLogicalWidth):
     21        (WebCore::RenderSVGRoot::computeReplacedLogicalHeight):
     22        (WebCore::RenderSVGRoot::layout):
     23        * rendering/svg/RenderSVGRoot.h:
     24        * svg/SVGLength.cpp:
     25        (WebCore::SVGLength::determineViewport):
     26        * svg/SVGSVGElement.cpp:
     27        (WebCore::SVGSVGElement::SVGSVGElement):
     28        (WebCore::SVGSVGElement::currentScale):
     29        (WebCore::SVGSVGElement::setCurrentScale):
     30        (WebCore::SVGSVGElement::viewBoxToViewTransform):
     31        * svg/SVGSVGElement.h:
     32
    1332011-08-01  Scott Graham  <scottmg@chromium.org>
    234
  • branches/chromium/835/Source/WebCore/platform/Length.h

    r87526 r92293  
    174174    bool isFixed() const { return type() == Fixed; }
    175175    bool isIntrinsicOrAuto() const { return type() == Auto || type() == MinIntrinsic || type() == Intrinsic; }
    176     bool isSpecified() const { return type() == Fixed || type() == Percent; }
    177176
    178177    Length blend(const Length& from, float progress) const
  • branches/chromium/835/Source/WebCore/rendering/RenderPart.cpp

    r88913 r92293  
    44 *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
    55 * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
    6  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
    76 *
    87 * This library is free software; you can redistribute it and/or
     
    3029#include "HTMLFrameElementBase.h"
    3130#include "PluginViewBase.h"
    32 #include "RenderSVGRoot.h"
    3331#include "RenderView.h"
    34 
    35 using namespace std;
    3632
    3733namespace WebCore {
     
    116112        return 0;
    117113
    118 #if ENABLE(SVG)
    119     // Curently only embedded SVG documents participate in the size-negotiation logic.
    120     if (rootChild->isSVGRoot())
    121         return toRenderBox(rootChild);
    122 #endif
    123 
    124114    return 0;
    125115}
  • branches/chromium/835/Source/WebCore/rendering/RenderReplaced.cpp

    r91481 r92293  
    220220}
    221221
     222static inline bool lengthIsSpecified(Length length)
     223{
     224    LengthType lengthType = length.type();
     225    return lengthType == Fixed || lengthType == Percent;
     226}
     227
    222228LayoutUnit RenderReplaced::computeReplacedLogicalWidth(bool includeMaxWidth) const
    223229{
    224     if (style()->logicalWidth().isSpecified())
     230    if (lengthIsSpecified(style()->width()))
    225231        return computeReplacedLogicalWidthRespectingMinMaxWidth(computeReplacedLogicalWidthUsing(style()->logicalWidth()), includeMaxWidth);
    226232
     
    277283                bool foundExplicitWidth = false;
    278284                for (; !containingBlock->isRenderView() && !containingBlock->isBody(); containingBlock = containingBlock->containingBlock()) {
    279                     if (containingBlock->style()->logicalWidth().isSpecified()) {
     285                    if (lengthIsSpecified(containingBlock->style()->logicalWidth())) {
    280286                        foundExplicitWidth = true;
    281287                        break;
     
    331337    // 10.5 Content height: the 'height' property: http://www.w3.org/TR/CSS21/visudet.html#propdef-height
    332338    bool heightIsAuto = logicalHeightIsAuto();
    333     if (style()->logicalHeight().isSpecified() && !heightIsAuto)
     339    if (lengthIsSpecified(style()->logicalHeight()) && !heightIsAuto)
    334340        return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLogicalHeightUsing(style()->logicalHeight()));
    335341
  • branches/chromium/835/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

    r90734 r92293  
    44 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
    55 * Copyright (C) 2009 Google, Inc.
    6  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
    76 *
    87 * This library is free software; you can redistribute it and/or
     
    2726#include "RenderSVGRoot.h"
    2827
    29 #include "Frame.h"
    3028#include "GraphicsContext.h"
    3129#include "HitTestResult.h"
    32 #include "RenderPart.h"
    3330#include "RenderSVGContainer.h"
    3431#include "RenderSVGResource.h"
     
    3936#include "SVGSVGElement.h"
    4037#include "SVGStyledElement.h"
    41 #include "SVGViewSpec.h"
    4238#include "TransformState.h"
    4339
     
    5450    , m_isLayoutSizeChanged(false)
    5551    , m_needsBoundariesOrTransformUpdate(true)
    56     , m_didNegotiateSize(false)
    5752{
    5853    setReplaced(true);
     
    6156RenderSVGRoot::~RenderSVGRoot()
    6257{
    63 }
    64 
    65 void RenderSVGRoot::computeIntrinsicRatioInformation(FloatSize& intrinsicRatio, bool& isPercentageIntrinsicSize) const
    66 {
    67     // Spec: http://dev.w3.org/SVG/profiles/1.1F2/publish/coords.html#IntrinsicSizing
    68     // The intrinsic aspect ratio of the viewport of SVG content is necessary for example, when including
    69     // SVG from an ‘object’ element in HTML styled with CSS. It is possible (indeed, common) for an SVG
    70     // graphic to have an intrinsic aspect ratio but not to have an intrinsic width or height.
    71     // The intrinsic aspect ratio must be calculated based upon the following rules:
    72     // The aspect ratio is calculated by dividing a width by a height.
    73 
    74     // If the ‘width’ and ‘height’ of the rootmost ‘svg’ element are both specified with unit identifiers
    75     // (in, mm, cm, pt, pc, px, em, ex) or in user units, then the aspect ratio is calculated from the
    76     // ‘width’ and ‘height’ attributes after resolving both values to user units.
    77     isPercentageIntrinsicSize = false;
    78     if (style()->width().isFixed() && style()->height().isFixed()) {
    79         intrinsicRatio = FloatSize(width(), height());
    80         return;
    81     }
    82 
    83     // If either/both of the ‘width’ and ‘height’ of the rootmost ‘svg’ element are in percentage units (or omitted),
    84     // the aspect ratio is calculated from the width and height values of the ‘viewBox’ specified for the current SVG
    85     // document fragment. If the ‘viewBox’ is not correctly specified, or set to 'none', the intrinsic aspect ratio
    86     // cannot be calculated and is considered unspecified.
    87     intrinsicRatio = static_cast<SVGSVGElement*>(node())->currentViewBoxRect().size();
    88 
    89     // Compatibility with authors expectations and Firefox/Opera: when percentage units are used, take them into
    90     // account for certain cases of the intrinsic width/height calculation in RenderPart::computeReplacedLogicalWidth/Height.
    91     if (intrinsicRatio.isEmpty() && style()->width().isPercent() && style()->height().isPercent()) {
    92         isPercentageIntrinsicSize = true;
    93         intrinsicRatio = FloatSize(style()->width().percent(), style()->height().percent());
    94     }
    9558}
    9659
     
    11477}
    11578
    116 LayoutUnit RenderSVGRoot::computeIntrinsicWidth(LayoutUnit replacedWidth) const
    117 {
    118     if (!style()->width().isPercent())
     79LayoutUnit RenderSVGRoot::computeReplacedLogicalWidth(bool includeMaxWidth) const
     80{
     81    LayoutUnit replacedWidth = RenderBox::computeReplacedLogicalWidth(includeMaxWidth);
     82    if (!style()->logicalWidth().isPercent())
    11983        return replacedWidth;
    120     // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
    121     return static_cast<int>(ceilf(replacedWidth * style()->effectiveZoom()));
    122 }
    123 
    124 LayoutUnit RenderSVGRoot::computeIntrinsicHeight(LayoutUnit replacedHeight) const
    125 {
    126     if (!style()->height().isPercent())
     84
     85    // FIXME: Investigate in size rounding issues
     86    SVGSVGElement* svg = static_cast<SVGSVGElement*>(node());
     87    return static_cast<int>(roundf(replacedWidth * svg->currentScale()));
     88}
     89
     90LayoutUnit RenderSVGRoot::computeReplacedLogicalHeight() const
     91{
     92    int replacedHeight = RenderBox::computeReplacedLogicalHeight();
     93    if (!style()->logicalHeight().isPercent())
    12794        return replacedHeight;
    128     // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
    129     return static_cast<int>(ceilf(replacedHeight * style()->effectiveZoom()));
    130 }
    131 
    132 void RenderSVGRoot::negotiateSizeWithHostDocumentIfNeeded()
    133 {
    134     if (m_didNegotiateSize)
    135         return;
    136 
    137     Frame* frame = node() && node()->document() ? node()->document()->frame() : 0;
    138     if (!frame)
    139         return;
    140 
    141     // If our frame has an owner renderer, we're embedded through eg. object/embed.
    142     // If we're embedded in a host document, we may be loaded after the host document
    143     // has finished layout. If the <object> doesn't specifiy width/height attributes
    144     // it has defaulted to 300x150 intrinsic size. If the SVG document has been loaded
    145     // we notify the RenderPart about the potential size changes, now it can properly
    146     // synchronize the intrinsic width/height/ratio, as defined in the SVG spec.
    147     if (RenderPart* ownerRenderer = frame->ownerRenderer()) {
    148         ownerRenderer->setNeedsLayoutAndPrefWidthsRecalc();
    149         m_didNegotiateSize = true;
    150     }
    151 }
    152 
    153 LayoutUnit RenderSVGRoot::computeReplacedLogicalWidth(bool includeMaxWidth) const
    154 {
    155     LayoutUnit replacedWidth = RenderBox::computeReplacedLogicalWidth(includeMaxWidth);
    156     Frame* frame = node() && node()->document() ? node()->document()->frame() : 0;
    157     if (!frame)
    158         return computeIntrinsicWidth(replacedWidth);
    159 
    160     // If our frame has an owner renderer, we're embedded through eg. object/embed.
    161     RenderPart* ownerRenderer = frame->ownerRenderer();
    162     if (!ownerRenderer)
    163         return computeIntrinsicWidth(replacedWidth);
    164 
    165     RenderStyle* ownerRendererStyle = ownerRenderer->style();
    166     ASSERT(ownerRendererStyle);
    167     ASSERT(frame->contentRenderer());
    168 
    169     Length ownerWidth = ownerRendererStyle->width();
    170     if (ownerWidth.isAuto())
    171         return replacedWidth;
    172 
    173     // Spec: http://dev.w3.org/SVG/profiles/1.1F2/publish/coords.html#ViewportSpace
    174     // The SVG user agent negotiates with its parent user agent to determine the viewport into which the SVG user agent can render
    175     // the document. In some circumstances, SVG content will be embedded (by reference or inline) within a containing document.
    176     // This containing document might include attributes, properties and/or other parameters (explicit or implicit) which specify
    177     // or provide hints about the dimensions of the viewport for the SVG content. SVG content itself optionally can provide
    178     // information about the appropriate viewport region for the content via the ‘width’ and ‘height’ XML attributes on the
    179     // outermost svg element. The negotiation process uses any information provided by the containing document and the SVG
    180     // content itself to choose the viewport location and size.
    181 
    182     // The ‘width’ attribute on the outermost svg element establishes the viewport's width, unless the following conditions are met:
    183     // * the SVG content is a separately stored resource that is embedded by reference (such as the ‘object’ element in XHTML [XHTML]),
    184     //   or the SVG content is embedded inline within a containing document;
    185     // * and the referencing element or containing document is styled using CSS [CSS2] or XSL [XSL];
    186     // * and there are CSS-compatible positioning properties ([CSS2], section 9.3) specified on the referencing element
    187     //   (e.g., the ‘object’ element) or on the containing document's outermost svg element that are sufficient to establish
    188     //   the width of the viewport.
    189     //
    190     // Under these conditions, the positioning properties establish the viewport's width.
    191     return ownerRenderer->computeReplacedLogicalWidthRespectingMinMaxWidth(ownerRenderer->computeReplacedLogicalWidthUsing(ownerWidth), includeMaxWidth);
    192 }
    193 
    194 LayoutUnit RenderSVGRoot::computeReplacedLogicalHeight() const
    195 {
    196     LayoutUnit replacedHeight = RenderBox::computeReplacedLogicalHeight();
    197 
    198     Frame* frame = node() && node()->document() ? node()->document()->frame() : 0;
    199     if (!frame)
    200         return computeIntrinsicHeight(replacedHeight);
    201 
    202     // If our frame has an owner renderer, we're embedded through eg. object/embed.
    203     RenderPart* ownerRenderer = frame->ownerRenderer();
    204     if (!ownerRenderer)
    205         return computeIntrinsicHeight(replacedHeight);
    206 
    207     RenderStyle* ownerRendererStyle = ownerRenderer->style();
    208     ASSERT(ownerRendererStyle);
    209     ASSERT(frame->contentRenderer());
    210 
    211     Length ownerHeight = ownerRendererStyle->height();
    212     if (ownerHeight.isAuto())
    213         return replacedHeight;
    214 
    215     // Spec: http://dev.w3.org/SVG/profiles/1.1F2/publish/coords.html#ViewportSpace
    216     // See comment in RenderSVGRoot::computeReplacedLogicalWidth().
    217     // Similarly, if there are positioning properties specified on the referencing element or on the outermost svg element that
    218     // are sufficient to establish the height of the viewport, then these positioning properties establish the viewport's height;
    219     // otherwise, the ‘height’ attribute on the outermost svg element establishes the viewport's height.
    220     return ownerRenderer->computeReplacedLogicalHeightRespectingMinMaxHeight(ownerRenderer->computeReplacedLogicalHeightUsing(ownerHeight));
     95
     96    // FIXME: Investigate in size rounding issues
     97    SVGSVGElement* svg = static_cast<SVGSVGElement*>(node());
     98    return static_cast<int>(roundf(replacedHeight * svg->currentScale()));
    22199}
    222100
     
    232110
    233111    LayoutSize oldSize(width(), height());
    234     negotiateSizeWithHostDocumentIfNeeded();
    235112    computeLogicalWidth();
    236113    computeLogicalHeight();
  • branches/chromium/835/Source/WebCore/rendering/svg/RenderSVGRoot.h

    r90734 r92293  
    4040    virtual ~RenderSVGRoot();
    4141
    42     virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicRatio, bool& isPercentageIntrinsicSize) const;
    4342    const RenderObjectChildList* children() const { return &m_children; }
    4443    RenderObjectChildList* children() { return &m_children; }
     
    4948
    5049private:
    51     LayoutUnit computeIntrinsicWidth(LayoutUnit replacedWidth) const;
    52     LayoutUnit computeIntrinsicHeight(LayoutUnit replacedHeight) const;
    53     void negotiateSizeWithHostDocumentIfNeeded();
    54 
    5550    virtual RenderObjectChildList* virtualChildren() { return children(); }
    5651    virtual const RenderObjectChildList* virtualChildren() const { return children(); }
     
    10499    bool m_isLayoutSizeChanged : 1;
    105100    bool m_needsBoundariesOrTransformUpdate : 1;
    106     bool m_didNegotiateSize : 1;
    107101};
    108102
  • branches/chromium/835/Source/WebCore/svg/SVGLength.cpp

    r91437 r92293  
    2727#include "CSSHelper.h"
    2828#include "FloatConversion.h"
    29 #include "Frame.h"
    3029#include "FrameView.h"
    3130#include "RenderObject.h"
    32 #include "RenderPart.h"
    3331#include "RenderView.h"
    3432#include "SVGException.h"
     
    358356    Document* document = context->document();
    359357    if (document->documentElement() == context) {
    360         if (context->isSVG()) {
    361             Frame* frame = context->document() ? context->document()->frame() : 0;
    362             if (!frame)
    363                 return false;
    364 
    365             if (RenderPart* ownerRenderer = frame->ownerRenderer()) {
    366                 width = ownerRenderer->width();
    367                 height = ownerRenderer->height();
    368                 return true;
    369             }
     358        if (RenderView* view = toRenderView(document->renderer())) {
     359            width = view->viewWidth();
     360            height = view->viewHeight();
     361            return true;
    370362        }
    371363
    372         RenderView* view = toRenderView(document->renderer());
    373         if (!view)
    374             return false;
    375 
    376         width = view->viewWidth();
    377         height = view->viewHeight();
    378         return true;
    379     }
    380 
    381     // Take size from nearest viewport element (common case: inner <svg> elements)
     364        return false;
     365    }
     366
     367    // Resolve value against nearest viewport element (common case: inner <svg> elements)
    382368    SVGElement* viewportElement = context->viewportElement();
    383369    if (viewportElement && viewportElement->isSVG()) {
     
    394380    }
    395381   
    396     // Take size from enclosing non-SVG RenderBox (common case: inline SVG)
     382    // Resolve value against enclosing non-SVG RenderBox
    397383    if (!context->parentNode() || context->parentNode()->isSVGElement())
    398384        return false;
  • branches/chromium/835/Source/WebCore/svg/SVGSVGElement.cpp

    r90680 r92293  
    3535#include "FloatRect.h"
    3636#include "Frame.h"
    37 #include "FrameTree.h"
    3837#include "FrameSelection.h"
    3938#include "FrameView.h"
     
    8685    , m_useCurrentView(false)
    8786    , m_timeContainer(SMILTimeContainer::create(this))
     87    , m_scale(1.0f)
    8888    , m_containerSize(300, 150)
    8989    , m_hasSetContainerSize(false)
     
    212212float SVGSVGElement::currentScale() const
    213213{
    214     if (!inDocument() || !isOutermostSVG())
    215         return 1;
    216 
    217     Frame* frame = document()->frame();
    218     if (!frame)
    219         return 1;
    220 
    221     FrameTree* frameTree = frame->tree();
    222     ASSERT(frameTree);
    223 
    224     // The behaviour of currentScale() is undefined, when we're dealing with non-standalone SVG documents.
    225     // If the svg is embedded, the scaling is handled by the host renderer, so when asking from inside
    226     // the SVG document, a scale value of 1 seems reasonable, as it doesn't know anything about the parent scale.
    227     return frameTree->parent() ? 1 : frame->pageZoomFactor();
     214    // Only the page zoom factor is relevant for SVG
     215    if (Frame* frame = document()->frame())
     216        return frame->pageZoomFactor();
     217    return m_scale;
    228218}
    229219
    230220void SVGSVGElement::setCurrentScale(float scale)
    231221{
    232     if (!inDocument() || !isOutermostSVG())
     222    if (Frame* frame = document()->frame()) {
     223        // Calling setCurrentScale() on the outermost <svg> element in a standalone SVG document
     224        // is allowed to change the page zoom factor, influencing the document size, scrollbars etc.
     225        if (parentNode() == document())
     226            frame->setPageZoomFactor(scale);
    233227        return;
    234 
    235     Frame* frame = document()->frame();
    236     if (!frame)
    237         return;
    238 
    239     FrameTree* frameTree = frame->tree();
    240     ASSERT(frameTree);
    241 
    242     // The behaviour of setCurrentScale() is undefined, when we're dealing with non-standalone SVG documents.
    243     // We choose the ignore this call, it's pretty useless to support calling setCurrentScale() from within
    244     // an embedded SVG document, for the same reasons as in currentScale() - needs resolution by SVG WG.
    245     if (frameTree->parent())
    246         return;
    247 
    248     frame->setPageZoomFactor(scale);
     228    }
     229
     230    m_scale = scale;
     231    if (RenderObject* object = renderer())
     232        RenderSVGResource::markForLayoutAndParentResourceInvalidation(object);
    249233}
    250234
     
    567551}
    568552
    569 FloatRect SVGSVGElement::currentViewBoxRect() const
    570 {
     553AffineTransform SVGSVGElement::viewBoxToViewTransform(float viewWidth, float viewHeight) const
     554{
     555    FloatRect viewBoxRect;
    571556    if (useCurrentView()) {
    572         if (SVGViewSpec* view = currentView()) // what if we should use it but it is not set?
    573             return view->viewBox();
    574         return FloatRect();
    575     }
    576 
    577     return viewBox();
    578 }
    579 
    580 AffineTransform SVGSVGElement::viewBoxToViewTransform(float viewWidth, float viewHeight) const
    581 {
    582     AffineTransform ctm = SVGFitToViewBox::viewBoxToViewTransform(currentViewBoxRect(), preserveAspectRatio(), viewWidth, viewHeight);
     557        if (currentView()) // what if we should use it but it is not set?
     558            viewBoxRect = currentView()->viewBox();
     559    } else
     560        viewBoxRect = viewBox();
     561
     562    AffineTransform ctm = SVGFitToViewBox::viewBoxToViewTransform(viewBoxRect, preserveAspectRatio(), viewWidth, viewHeight);
     563
    583564    if (useCurrentView() && currentView()) {
    584565        AffineTransform transform;
  • branches/chromium/835/Source/WebCore/svg/SVGSVGElement.h

    r90680 r92293  
    7979
    8080    SVGViewSpec* currentView() const;
    81     FloatRect currentViewBoxRect() const;
    8281
    8382    float currentScale() const;
     
    173172    bool m_useCurrentView;
    174173    RefPtr<SMILTimeContainer> m_timeContainer;
     174    float m_scale;
    175175    FloatPoint m_translation;
    176176    mutable OwnPtr<SVGViewSpec> m_viewSpec;
Note: See TracChangeset for help on using the changeset viewer.