<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165472] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165472">165472</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-03-12 08:41:55 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Remove deprecated shapes
https://bugs.webkit.org/show_bug.cgi?id=125235
Reviewed by Dirk Schulze.
Source/WebCore:
Remove support for deprecated shape types and syntax. These have
already been removed from the CSS Shapes specification, so this aligns
the implementation with the specification.
The "new" tests below were simply moved from the old csswg directory,
as they were the only tests there that applied to the current syntax.
Tests: fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000.html
fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001.html
fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002.html
* css/BasicShapeFunctions.cpp:
(WebCore::valueForBasicShape):
(WebCore::basicShapeForValue):
* css/BasicShapeFunctions.h:
* css/CSSBasicShapes.cpp:
* css/CSSBasicShapes.h:
* css/CSSParser.cpp:
(WebCore::CSSParser::parseBasicShape):
* rendering/shapes/Shape.cpp:
(WebCore::Shape::createShape):
* rendering/shapes/ShapeInsideInfo.cpp:
(WebCore::ShapeInsideInfo::isEnabledFor):
* rendering/style/BasicShapes.cpp:
* rendering/style/BasicShapes.h:
LayoutTests:
Remove tests for deprecated shape syntax.
There are also a few shape-inside tests that have been removed because
they were very difficult to make work without the rectangle shape, and
the future of the current shape-inside implementation is questionable
at best.
* animations/resources/animation-test-helpers.js:
(parseBasicShape):
* compositing/contents-opaque/opaque-with-clip-path-expected.html:
* compositing/contents-opaque/opaque-with-clip-path.html:
* css3/masking/clip-path-animation-expected.txt:
* css3/masking/clip-path-animation.html:
* css3/masking/clip-path-rectangle-expected.txt: Removed.
* css3/masking/clip-path-rectangle.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/resources/rounded-rectangle.js: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/resources/subpixel-utils.js: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/resources/w3c-import.log: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-ref-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-ref.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-002-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-002.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-005-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-005.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-006-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-006.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-007-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-007.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-008-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-008.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-009-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-009.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-001-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-001.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-stacked-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002-expected.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002.html: Removed.
* csswg/contributors/adobe/submitted/shapes/shape-outside/w3c-import.log: Removed.
* fast/masking/parsing-clip-path-shape-expected.txt:
* fast/masking/parsing-clip-path-shape.html:
* fast/regions/shape-inside/shape-inside-on-additional-regions.html:
* fast/regions/shape-inside/shape-inside-on-first-region-block-content.html:
* fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html:
* fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions.html:
* fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html:
* fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes.html:
* fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html:
* fast/regions/shape-inside/shape-inside-on-regions-expected.html:
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html:
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes.html:
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html:
* fast/regions/shape-inside/shape-inside-on-regions-inline-content.html:
* fast/regions/shape-inside/shape-inside-on-regions.html:
* fast/regions/shape-inside/shape-inside-on-second-region-block-content.html:
* fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html:
* fast/regions/shape-inside/shape-inside-recursive-layout-expected.html:
* fast/regions/shape-inside/shape-inside-recursive-layout.html:
* fast/regions/shape-inside/shape-inside-with-region-borders.html:
* fast/regions/shape-inside/shape-inside-with-region-padding.html:
* fast/shapes/css-shapes-disabled-expected.txt:
* fast/shapes/css-shapes-disabled.html:
* fast/shapes/css-shapes-enabled-expected.txt:
* fast/shapes/css-shapes-enabled.html:
* fast/shapes/parsing/parsing-shape-inside-expected.txt:
* fast/shapes/parsing/parsing-shape-inside.html:
* fast/shapes/parsing/parsing-shape-lengths-expected.txt:
* fast/shapes/parsing/parsing-shape-lengths.html:
* fast/shapes/parsing/parsing-shape-outside-expected.txt:
* fast/shapes/parsing/parsing-shape-outside.html:
* fast/shapes/parsing/parsing-test-utils.js:
* fast/shapes/resources/simple-rectangle.js:
(drawTextRectangle):
* fast/shapes/shape-inside/shape-inside-animation-expected.txt:
* fast/shapes/shape-inside/shape-inside-animation.html:
* fast/shapes/shape-inside/shape-inside-bottom-edge-expected.html:
* fast/shapes/shape-inside/shape-inside-bottom-edge.html:
* fast/shapes/shape-inside/shape-inside-box-sizing.html:
* fast/shapes/shape-inside/shape-inside-dynamic-nested-expected.html:
* fast/shapes/shape-inside/shape-inside-dynamic-nested.html:
* fast/shapes/shape-inside/shape-inside-dynamic-shape.html:
* fast/shapes/shape-inside/shape-inside-dynamic-text.html:
* fast/shapes/shape-inside/shape-inside-empty-expected.html:
* fast/shapes/shape-inside/shape-inside-empty.html:
* fast/shapes/shape-inside/shape-inside-inline-elements-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-inline-elements.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical.html:
* fast/shapes/shape-inside/shape-inside-multiple-blocks.html:
* fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html:
* fast/shapes/shape-inside/shape-inside-outside-shape.html:
* fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content.html:
* fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions.html:
* fast/shapes/shape-inside/shape-inside-overflow.html:
* fast/shapes/shape-inside/shape-inside-percentage-auto.html:
* fast/shapes/shape-inside/shape-inside-percentage.html:
* fast/shapes/shape-inside/shape-inside-rectangle-padding-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rectangle-padding.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-001-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-001.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-002-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-003-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-003.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-004-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-004.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding.html: Removed.
* fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html:
* fast/shapes/shape-inside/shape-inside-text.html:
* fast/shapes/shape-inside/shape-inside-vertical-text.html:
* fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt:
* fast/shapes/shape-outside-floats/shape-outside-animation.html:
* fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-margin.html:
* fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-overhang.html:
* fast/shapes/shape-outside-floats/shape-outside-dynamic-shape.html:
* fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html:
* fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-bottom.html:
* fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html:
* fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html:
* fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash-expected.txt: Removed.
* fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash.html: Removed.
* fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass.html:
* fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html:
* fast/shapes/shape-outside-floats/shape-outside-floats-outermost.html:
* fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000-expected.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html.
* fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html.
* fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001-expected.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html.
* fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html.
* fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002-expected.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html.
* fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html.
* fast/shapes/shape-outside-floats/shape-outside-shape-margin-animation.html:
* svg/clip-path/clip-path-shape-rounded-rect-1-expected.svg: Removed.
* svg/clip-path/clip-path-shape-rounded-rect-1.svg: Removed.
* svg/clip-path/clip-path-shape-rounded-rect-2-expected.svg: Removed.
* svg/clip-path/clip-path-shape-rounded-rect-2.svg: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsanimationsresourcesanimationtesthelpersjs">trunk/LayoutTests/animations/resources/animation-test-helpers.js</a></li>
<li><a href="#trunkLayoutTestscompositingcontentsopaqueopaquewithclippathexpectedhtml">trunk/LayoutTests/compositing/contents-opaque/opaque-with-clip-path-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingcontentsopaqueopaquewithclippathhtml">trunk/LayoutTests/compositing/contents-opaque/opaque-with-clip-path.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathanimationexpectedtxt">trunk/LayoutTests/css3/masking/clip-path-animation-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathanimationhtml">trunk/LayoutTests/css3/masking/clip-path-animation.html</a></li>
<li><a href="#trunkLayoutTestsfastmaskingparsingclippathshapeexpectedtxt">trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmaskingparsingclippathshapehtml">trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonadditionalregionshtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-additional-regions.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonfirstregionblockcontenthtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-block-content.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonfirstregioninlinecontenthtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleautoheightregionshtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentbasicoverflowshapetopoffsethtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentoverflowbottompositionedmultipleshapeshtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentoverflowmultipleshapeshtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsexpectedhtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentbasicoverflowshapetopoffsethtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentoverflowbottompositionedmultipleshapeshtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentoverflowmultipleshapeshtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontenthtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionshtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonsecondregionblockcontenthtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-block-content.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonsecondregioninlinecontenthtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsiderecursivelayoutexpectedhtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsiderecursivelayouthtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsidewithregionbordershtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-with-region-borders.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsidewithregionpaddinghtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-with-region-padding.html</a></li>
<li><a href="#trunkLayoutTestsfastshapescssshapesdisabledexpectedtxt">trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapescssshapesdisabledhtml">trunk/LayoutTests/fast/shapes/css-shapes-disabled.html</a></li>
<li><a href="#trunkLayoutTestsfastshapescssshapesenabledexpectedtxt">trunk/LayoutTests/fast/shapes/css-shapes-enabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapescssshapesenabledhtml">trunk/LayoutTests/fast/shapes/css-shapes-enabled.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeinsidehtml">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapelengthsexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapelengthshtml">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeoutsidehtml">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingtestutilsjs">trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js</a></li>
<li><a href="#trunkLayoutTestsfastshapesresourcessimplerectanglejs">trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideanimationexpectedtxt">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideanimationhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidebottomedgeexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-bottom-edge-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidebottomedgehtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-bottom-edge.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideboxsizinghtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidedynamicnestedexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-nested-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidedynamicnestedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-nested.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidedynamicshapehtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-shape.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidedynamictexthtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-text.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideemptyexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideemptyhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidemultipleblocksverticalhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidemultipleblockshtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideonnestedcontainerwithunresolvedheighthtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideoutsideshapehtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideoverflowfixeddimensionsblockcontenthtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideoverflowfixeddimensionshtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideoverflowhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidepercentageautohtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-percentage-auto.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidepercentagehtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-percentage.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidesubpixelrectangletophtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidetexthtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-text.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideverticaltexthtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-vertical-text.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideanimationexpectedtxt">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideanimationhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidedynamicshapemarginhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-margin.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidedynamicshapeoverhanghtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-overhang.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidedynamicshapehtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsdifferentwritingmodeshtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsemarginbottomhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-bottom.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsemarginlefthtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsemarginrighthtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatslayoutafterinitiallayoutpasshtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsnotalayerhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsoutermosthtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-outermost.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapemarginanimationhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-margin-animation.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssBasicShapeFunctionscpp">trunk/Source/WebCore/css/BasicShapeFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorecssBasicShapeFunctionsh">trunk/Source/WebCore/css/BasicShapeFunctions.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSBasicShapescpp">trunk/Source/WebCore/css/CSSBasicShapes.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSBasicShapesh">trunk/Source/WebCore/css/CSSBasicShapes.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapecpp">trunk/Source/WebCore/rendering/shapes/Shape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleBasicShapescpp">trunk/Source/WebCore/rendering/style/BasicShapes.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleBasicShapesh">trunk/Source/WebCore/rendering/style/BasicShapes.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon000expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon000html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon001expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon001html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon002expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon002html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3maskingclippathrectangleexpectedtxt">trunk/LayoutTests/css3/masking/clip-path-rectangle-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathrectanglehtml">trunk/LayoutTests/css3/masking/clip-path-rectangle.html</a></li>
<li>trunk/LayoutTests/csswg/</li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleregionswithnegativeshapetopexpectedhtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleregionswithnegativeshapetophtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideinlineelementsexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-inline-elements-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideinlineelementshtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-inline-elements.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsiderectanglepaddingexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rectangle-padding-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsiderectanglepaddinghtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rectangle-padding.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle001expectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle001html">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle002expectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle002html">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-002.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle003expectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-003-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle003html">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-003.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle004expectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-004-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle004html">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-004.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit001expectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit001html">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit002expectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit002html">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit003expectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit003html">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglelargeradiusexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglelargeradiushtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglepaddingexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglepaddinghtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsimginsetrectanglenegativewidthcrashexpectedtxt">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsimginsetrectanglenegativewidthcrashhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash.html</a></li>
<li><a href="#trunkLayoutTestssvgclippathclippathshaperoundedrect1expectedsvg">trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-1-expected.svg</a></li>
<li><a href="#trunkLayoutTestssvgclippathclippathshaperoundedrect1svg">trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-1.svg</a></li>
<li><a href="#trunkLayoutTestssvgclippathclippathshaperoundedrect2expectedsvg">trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-2-expected.svg</a></li>
<li><a href="#trunkLayoutTestssvgclippathclippathshaperoundedrect2svg">trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-2.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/ChangeLog 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,3 +1,262 @@
</span><ins>+2014-03-12 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] Remove deprecated shapes
+ https://bugs.webkit.org/show_bug.cgi?id=125235
+
+ Reviewed by Dirk Schulze.
+
+ Remove tests for deprecated shape syntax.
+
+ There are also a few shape-inside tests that have been removed because
+ they were very difficult to make work without the rectangle shape, and
+ the future of the current shape-inside implementation is questionable
+ at best.
+
+ * animations/resources/animation-test-helpers.js:
+ (parseBasicShape):
+ * compositing/contents-opaque/opaque-with-clip-path-expected.html:
+ * compositing/contents-opaque/opaque-with-clip-path.html:
+ * css3/masking/clip-path-animation-expected.txt:
+ * css3/masking/clip-path-animation.html:
+ * css3/masking/clip-path-rectangle-expected.txt: Removed.
+ * css3/masking/clip-path-rectangle.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/rounded-rectangle.js: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/subpixel-utils.js: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/w3c-import.log: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-ref-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001-ref.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-001.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-002-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-002.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-003.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-004.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-005.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-clipped-006.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-003.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-004.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-002.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-013.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-019.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-020.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-005-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-005.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-006-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-006.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-007-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-007.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-008-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-008.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-009-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-009.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-001-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-shape-margin-001.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-stacked-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002-expected.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002.html: Removed.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/w3c-import.log: Removed.
+ * fast/masking/parsing-clip-path-shape-expected.txt:
+ * fast/masking/parsing-clip-path-shape.html:
+ * fast/regions/shape-inside/shape-inside-on-additional-regions.html:
+ * fast/regions/shape-inside/shape-inside-on-first-region-block-content.html:
+ * fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html:
+ * fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions.html:
+ * fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html:
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes.html:
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html:
+ * fast/regions/shape-inside/shape-inside-on-regions-expected.html:
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html:
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes.html:
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html:
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content.html:
+ * fast/regions/shape-inside/shape-inside-on-regions.html:
+ * fast/regions/shape-inside/shape-inside-on-second-region-block-content.html:
+ * fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html:
+ * fast/regions/shape-inside/shape-inside-recursive-layout-expected.html:
+ * fast/regions/shape-inside/shape-inside-recursive-layout.html:
+ * fast/regions/shape-inside/shape-inside-with-region-borders.html:
+ * fast/regions/shape-inside/shape-inside-with-region-padding.html:
+ * fast/shapes/css-shapes-disabled-expected.txt:
+ * fast/shapes/css-shapes-disabled.html:
+ * fast/shapes/css-shapes-enabled-expected.txt:
+ * fast/shapes/css-shapes-enabled.html:
+ * fast/shapes/parsing/parsing-shape-inside-expected.txt:
+ * fast/shapes/parsing/parsing-shape-inside.html:
+ * fast/shapes/parsing/parsing-shape-lengths-expected.txt:
+ * fast/shapes/parsing/parsing-shape-lengths.html:
+ * fast/shapes/parsing/parsing-shape-outside-expected.txt:
+ * fast/shapes/parsing/parsing-shape-outside.html:
+ * fast/shapes/parsing/parsing-test-utils.js:
+ * fast/shapes/resources/simple-rectangle.js:
+ (drawTextRectangle):
+ * fast/shapes/shape-inside/shape-inside-animation-expected.txt:
+ * fast/shapes/shape-inside/shape-inside-animation.html:
+ * fast/shapes/shape-inside/shape-inside-bottom-edge-expected.html:
+ * fast/shapes/shape-inside/shape-inside-bottom-edge.html:
+ * fast/shapes/shape-inside/shape-inside-box-sizing.html:
+ * fast/shapes/shape-inside/shape-inside-dynamic-nested-expected.html:
+ * fast/shapes/shape-inside/shape-inside-dynamic-nested.html:
+ * fast/shapes/shape-inside/shape-inside-dynamic-shape.html:
+ * fast/shapes/shape-inside/shape-inside-dynamic-text.html:
+ * fast/shapes/shape-inside/shape-inside-empty-expected.html:
+ * fast/shapes/shape-inside/shape-inside-empty.html:
+ * fast/shapes/shape-inside/shape-inside-inline-elements-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-inline-elements.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical.html:
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks.html:
+ * fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html:
+ * fast/shapes/shape-inside/shape-inside-outside-shape.html:
+ * fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content.html:
+ * fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions.html:
+ * fast/shapes/shape-inside/shape-inside-overflow.html:
+ * fast/shapes/shape-inside/shape-inside-percentage-auto.html:
+ * fast/shapes/shape-inside/shape-inside-percentage.html:
+ * fast/shapes/shape-inside/shape-inside-rectangle-padding-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rectangle-padding.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-001-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-001.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-002-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-003-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-003.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-004-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-004.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html:
+ * fast/shapes/shape-inside/shape-inside-text.html:
+ * fast/shapes/shape-inside/shape-inside-vertical-text.html:
+ * fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt:
+ * fast/shapes/shape-outside-floats/shape-outside-animation.html:
+ * fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-margin.html:
+ * fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-overhang.html:
+ * fast/shapes/shape-outside-floats/shape-outside-dynamic-shape.html:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-bottom.html:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash-expected.txt: Removed.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash.html: Removed.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass.html:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-outermost.html:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000-expected.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001-expected.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002-expected.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002.html: Renamed from LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html.
+ * fast/shapes/shape-outside-floats/shape-outside-shape-margin-animation.html:
+ * svg/clip-path/clip-path-shape-rounded-rect-1-expected.svg: Removed.
+ * svg/clip-path/clip-path-shape-rounded-rect-1.svg: Removed.
+ * svg/clip-path/clip-path-shape-rounded-rect-2-expected.svg: Removed.
+ * svg/clip-path/clip-path-shape-rounded-rect-2.svg: Removed.
+
</ins><span class="cx"> 2014-03-12 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add hiDPI support for compositing content in DumpRenderTree/WebKitTestRunner
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsresourcesanimationtesthelpersjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/resources/animation-test-helpers.js (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/resources/animation-test-helpers.js 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/animations/resources/animation-test-helpers.js 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -181,8 +181,8 @@
</span><span class="cx">
</span><span class="cx"> var matches;
</span><span class="cx"> switch (shapeFunction[1]) {
</span><del>- case "rectangle":
- matches = s.match("rectangle\\((.*)\\s*,\\s*(.*)\\s*,\\s*(.*)\\,\\s*(.*)\\)");
</del><ins>+ case "inset":
+ matches = s.match("inset\\((.*)\\s+(.*)\\s+(.*)\\s+(.*)\\s+round\\s+(.*)\\s+(.*)\\s+(.*)\\s+(.*)\\s+/\\s+(.*)\\s+(.*)\\s+(.*)\\s+(.*)\\)");
</ins><span class="cx"> break;
</span><span class="cx"> case "circle":
</span><span class="cx"> matches = s.match("circle\\((.*)\\s+at\\s+(.*)\\s+(.*)\\)");
</span></span></pre></div>
<a id="trunkLayoutTestscompositingcontentsopaqueopaquewithclippathexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/contents-opaque/opaque-with-clip-path-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/contents-opaque/opaque-with-clip-path-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/compositing/contents-opaque/opaque-with-clip-path-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> margin: 20px;
</span><span class="cx"> background: blue;
</span><span class="cx"> border: solid red 20px;
</span><del>- -webkit-clip-path: rectangle(50px, 0, 80%, 100%) border-box;
</del><ins>+ -webkit-clip-path: inset(0 20% 0 50px) border-box;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <div id="parent"></div>
</span></span></pre></div>
<a id="trunkLayoutTestscompositingcontentsopaqueopaquewithclippathhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/contents-opaque/opaque-with-clip-path.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/contents-opaque/opaque-with-clip-path.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/compositing/contents-opaque/opaque-with-clip-path.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> margin: 20px;
</span><span class="cx"> background: blue;
</span><span class="cx"> border: solid red 20px;
</span><del>- -webkit-clip-path: rectangle(50px, 0, 80%, 100%) border-box;
</del><ins>+ -webkit-clip-path: inset(0 20% 0 50px) border-box;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .composited {
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathanimationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/masking/clip-path-animation-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-animation-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/css3/masking/clip-path-animation-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx">
</span><del>-PASS - "webkitClipPath" property for "rectangle-box" element at 1s saw something close to: rectangle(10%, 10%, 80%, 80%, 0px, 0px)
</del><ins>+PASS - "webkitClipPath" property for "inset-box" element at 1s saw something close to: inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)
</ins><span class="cx"> PASS - "webkitClipPath" property for "circle-box" element at 1s saw something close to: circle(35% at 35% 35%)
</span><span class="cx"> PASS - "webkitClipPath" property for "ellipse-box" element at 1s saw something close to: ellipse(35% 30% at 35% 35%)
</span><span class="cx"> PASS - "webkitClipPath" property for "polygon-box" element at 1s saw something close to: polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathanimationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/masking/clip-path-animation.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-animation.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/css3/masking/clip-path-animation.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -11,8 +11,8 @@
</span><span class="cx"> display: inline-block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #rectangle-box {
- -webkit-animation: rectangle-anim 2s linear
</del><ins>+ #inset-box {
+ -webkit-animation: inset-anim 2s linear
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #circle-box {
</span><span class="lines">@@ -31,9 +31,9 @@
</span><span class="cx"> -webkit-animation: none-anim 2s linear
</span><span class="cx"> }
</span><span class="cx">
</span><del>- @-webkit-keyframes rectangle-anim {
- from { -webkit-clip-path: rectangle(0%, 0%, 100%, 100%); }
- to { -webkit-clip-path: rectangle(20%, 20%, 60%, 60%); }
</del><ins>+ @-webkit-keyframes inset-anim {
+ from { -webkit-clip-path: inset(0); }
+ to { -webkit-clip-path: inset(20%); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes circle-anim {
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> const expectedValues = [
</span><span class="cx"> // [animation-name, time, element-id, property, expected-value, tolerance]
</span><del>- ["rectangle-anim", 1, "rectangle-box", "webkitClipPath", "rectangle(10%, 10%, 80%, 80%, 0px, 0px)", 0.05],
</del><ins>+ ["inset-anim", 1, "inset-box", "webkitClipPath", "inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)", 0.05],
</ins><span class="cx"> ["circle-anim", 1, "circle-box", "webkitClipPath", "circle(35% at 35% 35%)", 0.05],
</span><span class="cx"> ["ellipse-anim", 1, "ellipse-box", "webkitClipPath", "ellipse(35% 30% at 35% 35%)", 0.05],
</span><span class="cx"> ["polygon-anim", 1, "polygon-box", "webkitClipPath", "polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx">
</span><del>-<div class="box" id="rectangle-box"></div>
</del><ins>+<div class="box" id="inset-box"></div>
</ins><span class="cx"> <div class="box" id="circle-box"></div>
</span><span class="cx"> <div class="box" id="ellipse-box"></div>
</span><span class="cx"> <div class="box" id="polygon-box"></div>
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathrectangleexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/masking/clip-path-rectangle-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-rectangle-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/css3/masking/clip-path-rectangle-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x216
- RenderBlock {HTML} at (0,0) size 800x216
- RenderBody {BODY} at (8,8) size 784x200
-layer at (8,8) size 200x200
- RenderBlock {DIV} at (0,0) size 200x200 [bgcolor=#008000] [border: (10px solid #000000)]
</del></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathrectanglehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/masking/clip-path-rectangle.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-rectangle.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/css3/masking/clip-path-rectangle.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html lang="en">
-<head>
-<style>
-div {
- width: 180px;
- height: 180px;
- background-color: green;
- border: 10px solid black;
- -webkit-clip-path: rectangle(0, 0, 200px, 200px, 100px, 100px);
-}
-</style>
-</head>
-<body>
-<div>
-</body>
-</html>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastmaskingparsingclippathshapeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -3,22 +3,10 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS innerStyle("-webkit-clip-path", "circle(0, 0, 0)") is "circle(0px, 0px, 0px)"
-PASS innerStyle("-webkit-clip-path", "circle(-1px, +1px, 1px)") is "circle(-1px, 1px, 1px)"
-PASS innerStyle("-webkit-clip-path", "circle(-1.5px, +1.5px, 1.5px)") is "circle(-1.5px, 1.5px, 1.5px)"
-PASS innerStyle("-webkit-clip-path", "circle(-.5px, +.5px, .5px)") is "circle(-0.5px, 0.5px, 0.5px)"
</del><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(0 at 0 0)") is "circle(0px at 0% 0%)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1px at -1px +1px)") is "circle(1px at -1px 1px)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1.5px at -1.5px +1.5px)") is "circle(1.5px at -1.5px 1.5px)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(.5px at -.5px +.5px)") is "circle(0.5px at -0.5px 0.5px)"
</span><del>-PASS innerStyle("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)"
-PASS innerStyle("-webkit-clip-path", "circle(-1em, +1em, 1em)") is "circle(-1em, 1em, 1em)"
-PASS innerStyle("-webkit-clip-path", "circle(-1.5em, +1.5em, 1.5em)") is "circle(-1.5em, 1.5em, 1.5em)"
-PASS innerStyle("-webkit-clip-path", "circle(-.5em, +.5em, .5em)") is "circle(-0.5em, 0.5em, 0.5em)"
-PASS innerStyle("-webkit-clip-path", "circle(1ex, 1ex, 1ex)") is "circle(1ex, 1ex, 1ex)"
-PASS innerStyle("-webkit-clip-path", "circle(1rem, 1rem, 1rem)") is "circle(1rem, 1rem, 1rem)"
-PASS computedStyle("-webkit-clip-path", "circle(.5em, 1em, 1.5em)") is "circle(4px, 8px, 12px)"
-PASS computedStyle("-webkit-clip-path", "circle(.5rem, 1rem, 1.5rem)") is "circle(8px, 16px, 24px)"
</del><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1em at -1em +1em)") is "circle(1em at -1em 1em)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1.5em at -1.5em +1.5em)") is "circle(1.5em at -1.5em 1.5em)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(.5em at -.5em +.5em)") is "circle(0.5em at -0.5em 0.5em)"
</span><span class="lines">@@ -26,27 +14,15 @@
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1rem at 1rem 1rem)") is "circle(1rem at 1rem 1rem)"
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(1.5em at .5em 1em)") is "circle(12px at 4px 8px)"
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(1.5rem at .5rem 1rem)") is "circle(24px at 8px 16px)"
</span><del>-PASS innerStyle("-webkit-clip-path", "circle(1vw, 1vw, 1vw)") is "circle(1vw, 1vw, 1vw)"
-PASS innerStyle("-webkit-clip-path", "circle(1vh, 1vh, 1vh)") is "circle(1vh, 1vh, 1vh)"
-PASS innerStyle("-webkit-clip-path", "circle(1vmin, 1vmin, 1vmin)") is "circle(1vmin, 1vmin, 1vmin)"
-PASS computedStyle("-webkit-clip-path", "circle(.5vw, 1vw, 1.5vw)") is "circle(0.5vw, 1vw, 1.5vw)"
-PASS computedStyle("-webkit-clip-path", "circle(.5vh, 1vh, 1.5vh)") is "circle(0.5vh, 1vh, 1.5vh)"
-PASS computedStyle("-webkit-clip-path", "circle(.5vmin, 1vmin, 1.5vmin)") is "circle(0.5vmin, 1vmin, 1.5vmin)"
</del><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1vw at 1vw 1vw)") is "circle(1vw at 1vw 1vw)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1vh at 1vh 1vh)") is "circle(1vh at 1vh 1vh)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1vmin at 1vmin 1vmin)") is "circle(1vmin at 1vmin 1vmin)"
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(1.5vw at .5vw 1vw)") is "circle(1.5vw at 0.5vw 1vw)"
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(1.5vh at .5vh 1vh)") is "circle(1.5vh at 0.5vh 1vh)"
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(1.5vmin at .5vmin 1vmin)") is "circle(1.5vmin at 0.5vmin 1vmin)"
</span><del>-PASS innerStyle("-webkit-clip-path", "circle(100%, 100%, 100%)") is "circle(100%, 100%, 100%)"
-PASS innerStyle("-webkit-clip-path", "circle(100% at 100% 100%)") is "circle(100% at 100% 100%)"
-PASS innerStyle("-webkit-clip-path", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "rectangle(45%, 45%, 90%, 60%, 25%, 10%)"
-PASS innerStyle("-webkit-clip-path", "ellipse(100%, 100%, 100%, 100%)") is "ellipse(100%, 100%, 100%, 100%)"
-PASS innerStyle("-webkit-clip-path", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
-PASS computedStyle("-webkit-clip-path", "circle(50%, 100%, 150%)") is "circle(50%, 100%, 150%)"
</del><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(150% at 50% 100%)") is "circle(150% at 50% 100%)"
</span><del>-PASS computedStyle("-webkit-clip-path", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "rectangle(45%, 45%, 90%, 60%, 25%, 10%)"
-PASS computedStyle("-webkit-clip-path", "ellipse(100%, 100%, 100%, 100%)") is "ellipse(100%, 100%, 100%, 100%)"
</del><ins>+PASS computedStyle("-webkit-clip-path", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)"
+PASS computedStyle("-webkit-clip-path", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
</ins><span class="cx"> PASS computedStyle("-webkit-clip-path", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "content-box") is "content-box"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "padding-box") is "padding-box"
</span><span class="lines">@@ -72,14 +48,6 @@
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "margin-box circle(50% at 50% 50%)") is "circle(50% at 50% 50%) margin-box"
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "border-box circle(50% at 50% 50%)") is "circle(50% at 50% 50%) border-box"
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(50% at 50% 50%) fill") is "circle(50% at 50% 50%) fill"
</span><del>-PASS innerStyle("-webkit-clip-path", "circle(1px, 1px, 1)") is null
-PASS computedStyle("-webkit-clip-path", "circle(1px, 1px, 1)") is "none"
-PASS innerStyle("-webkit-clip-path", "circle(1px, 1px, px)") is null
-PASS computedStyle("-webkit-clip-path", "circle(1px, 1px, px)") is "none"
-PASS innerStyle("-webkit-clip-path", "circle(1px, 1px, 1p)") is null
-PASS computedStyle("-webkit-clip-path", "circle(1px, 1px, 1p)") is "none"
-PASS innerStyle("-webkit-clip-path", "circle(1px, 1px, calc())") is null
-PASS computedStyle("-webkit-clip-path", "circle(1px, 1px, calc())") is "none"
</del><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1 at 1px 1px)") is null
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(1 at 1px 1px)") is "none"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(px at 1px 1px)") is null
</span><span class="lines">@@ -88,22 +56,16 @@
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(1p at 1px 1px)") is "none"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(calc() at 1px 1px)") is null
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(calc() at 1px 1px)") is "none"
</span><del>-PASS innerStyle("-webkit-clip-path", "circle(-1.5px, +1.5px, -1.5px)") is null
-PASS computedStyle("-webkit-clip-path", "circle(-1.5px, +1.5px, -1.5px)") is "none"
</del><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(-1.5px at -1.5px +1.5px)") is null
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(-1.5px at -1.5px +1.5px)") is "none"
</span><del>-PASS innerStyle("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
-PASS computedStyle("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "none"
-PASS innerStyle("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
-PASS computedStyle("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "none"
-PASS innerStyle("-webkit-clip-path", "ellipse(1em, 1em, -1em, 1em)") is null
-PASS computedStyle("-webkit-clip-path", "ellipse(1em, 1em, -1em, 1em)") is "none"
-PASS innerStyle("-webkit-clip-path", "ellipse(1em, 1em, 1em, -1em)") is null
-PASS computedStyle("-webkit-clip-path", "ellipse(1em, 1em, 1em, -1em)") is "none"
-PASS innerStyle("-webkit-clip-path", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
-PASS computedStyle("-webkit-clip-path", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "none"
-PASS innerStyle("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
-PASS computedStyle("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "none"
</del><ins>+PASS innerStyle("-webkit-clip-path", "inset(1cm 1mm 1in 1px round -1pt, 1pc)") is null
+PASS computedStyle("-webkit-clip-path", "inset(1cm 1mm 1in 1px round -1pt, 1pc)") is "none"
+PASS innerStyle("-webkit-clip-path", "inset(1cm 1mm 1in 1px round 1pt -1pc)") is null
+PASS computedStyle("-webkit-clip-path", "inset(1cm 1mm 1in 1px round 1pt -1pc)") is "none"
+PASS innerStyle("-webkit-clip-path", "ellipse(-1em 1em at 1em 1em)") is null
+PASS computedStyle("-webkit-clip-path", "ellipse(-1em 1em at 1em 1em)") is "none"
+PASS innerStyle("-webkit-clip-path", "ellipse(1em -1em at 1em 1em)") is null
+PASS computedStyle("-webkit-clip-path", "ellipse(1em -1em at 1em 1em)") is "none"
</ins><span class="cx"> PASS innerStyle("-webkit-clip-path", "fill circle(50% at 50% 50%) content-box") is null
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "fill circle(50% at 50% 50%) content-box") is "none"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "margin-box padding-box") is null
</span><span class="lines">@@ -118,8 +80,6 @@
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "none content-box") is "none"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "url(#test) padding-box") is null
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "url(#test) padding-box") is "none"
</span><del>-PASS innerStyle("-webkit-clip-path", "circle(0, 0)") is null
-PASS computedStyle("-webkit-clip-path", "circle(0, 0)") is "none"
</del><span class="cx"> PASS innerStyle("-webkit-clip-path", "polygon(0, 0)") is null
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "polygon(0, 0)") is "none"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "polygon(0 0, 0)") is null
</span></span></pre></div>
<a id="trunkLayoutTestsfastmaskingparsingclippathshapehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -41,30 +41,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // absolute lengths - number serialization, units
</span><del>-testInner("-webkit-clip-path", "circle(0, 0, 0)", "circle(0px, 0px, 0px)");
-testInner("-webkit-clip-path", "circle(-1px, +1px, 1px)", "circle(-1px, 1px, 1px)");
-testInner("-webkit-clip-path", "circle(-1.5px, +1.5px, 1.5px)", "circle(-1.5px, 1.5px, 1.5px)");
-testInner("-webkit-clip-path", "circle(-.5px, +.5px, .5px)", "circle(-0.5px, 0.5px, 0.5px)");
-
</del><span class="cx"> testInner("-webkit-clip-path", "circle(0 at 0 0)", "circle(0px at 0% 0%)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(1px at -1px +1px)", "circle(1px at -1px 1px)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(1.5px at -1.5px +1.5px)", "circle(1.5px at -1.5px 1.5px)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(.5px at -.5px +.5px)", "circle(0.5px at -0.5px 0.5px)");
</span><span class="cx">
</span><del>-testInner("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)", "rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)");
-
</del><span class="cx"> // font-relative lengths - number serialization, units, resolution
</span><del>-testInner("-webkit-clip-path", "circle(-1em, +1em, 1em)", "circle(-1em, 1em, 1em)");
-testInner("-webkit-clip-path", "circle(-1.5em, +1.5em, 1.5em)", "circle(-1.5em, 1.5em, 1.5em)");
-testInner("-webkit-clip-path", "circle(-.5em, +.5em, .5em)", "circle(-0.5em, 0.5em, 0.5em)");
-
-testInner("-webkit-clip-path", "circle(1ex, 1ex, 1ex)", "circle(1ex, 1ex, 1ex)");
-// FIXME: Add ch test when it is supported
-testInner("-webkit-clip-path", "circle(1rem, 1rem, 1rem)", "circle(1rem, 1rem, 1rem)");
-
-testComputed("-webkit-clip-path", "circle(.5em, 1em, 1.5em)", "circle(4px, 8px, 12px)");
-testComputed("-webkit-clip-path", "circle(.5rem, 1rem, 1.5rem)", "circle(8px, 16px, 24px)");
-
</del><span class="cx"> testInner("-webkit-clip-path", "circle(1em at -1em +1em)", "circle(1em at -1em 1em)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(1.5em at -1.5em +1.5em)", "circle(1.5em at -1.5em 1.5em)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(.5em at -.5em +.5em)", "circle(0.5em at -0.5em 0.5em)");
</span><span class="lines">@@ -77,14 +59,6 @@
</span><span class="cx"> testComputed("-webkit-clip-path", "circle(1.5rem at .5rem 1rem)", "circle(24px at 8px 16px)");
</span><span class="cx">
</span><span class="cx"> // viewport-percentage lengths - units, resolution
</span><del>-testInner("-webkit-clip-path", "circle(1vw, 1vw, 1vw)", "circle(1vw, 1vw, 1vw)");
-testInner("-webkit-clip-path", "circle(1vh, 1vh, 1vh)", "circle(1vh, 1vh, 1vh)");
-testInner("-webkit-clip-path", "circle(1vmin, 1vmin, 1vmin)", "circle(1vmin, 1vmin, 1vmin)");
-
-testComputed("-webkit-clip-path", "circle(.5vw, 1vw, 1.5vw)", "circle(0.5vw, 1vw, 1.5vw)");
-testComputed("-webkit-clip-path", "circle(.5vh, 1vh, 1.5vh)", "circle(0.5vh, 1vh, 1.5vh)");
-testComputed("-webkit-clip-path", "circle(.5vmin, 1vmin, 1.5vmin)", "circle(0.5vmin, 1vmin, 1.5vmin)");
-
</del><span class="cx"> testInner("-webkit-clip-path", "circle(1vw at 1vw 1vw)", "circle(1vw at 1vw 1vw)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(1vh at 1vh 1vh)", "circle(1vh at 1vh 1vh)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(1vmin at 1vmin 1vmin)", "circle(1vmin at 1vmin 1vmin)");
</span><span class="lines">@@ -94,16 +68,9 @@
</span><span class="cx"> testComputed("-webkit-clip-path", "circle(1.5vmin at .5vmin 1vmin)", "circle(1.5vmin at 0.5vmin 1vmin)");
</span><span class="cx">
</span><span class="cx"> // percentage lengths - units
</span><del>-testInner("-webkit-clip-path", "circle(100%, 100%, 100%)", "circle(100%, 100%, 100%)");
-testInner("-webkit-clip-path", "circle(100% at 100% 100%)", "circle(100% at 100% 100%)");
-testInner("-webkit-clip-path", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)");
-testInner("-webkit-clip-path", "ellipse(100%, 100%, 100%, 100%)", "ellipse(100%, 100%, 100%, 100%)");
-testInner("-webkit-clip-path", "polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)");
-
-testComputed("-webkit-clip-path", "circle(50%, 100%, 150%)", "circle(50%, 100%, 150%)");
</del><span class="cx"> testComputed("-webkit-clip-path", "circle(150% at 50% 100%)", "circle(150% at 50% 100%)");
</span><del>-testComputed("-webkit-clip-path", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)");
-testComputed("-webkit-clip-path", "ellipse(100%, 100%, 100%, 100%)", "ellipse(100%, 100%, 100%, 100%)");
</del><ins>+testComputed("-webkit-clip-path", "inset(45% 45% 90% 60% round 25% 10%)", "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)");
+testComputed("-webkit-clip-path", "ellipse(100% 100% at 100% 100%)", "ellipse(100% 100% at 100% 100%)");
</ins><span class="cx"> testComputed("-webkit-clip-path", "polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)");
</span><span class="cx">
</span><span class="cx"> // boxes
</span><span class="lines">@@ -134,28 +101,18 @@
</span><span class="cx"> testComputed("-webkit-clip-path", "circle(50% at 50% 50%) fill", "circle(50% at 50% 50%) fill");
</span><span class="cx">
</span><span class="cx"> // reject non-lengths
</span><del>-negativeTest("-webkit-clip-path", "circle(1px, 1px, 1)");
-negativeTest("-webkit-clip-path", "circle(1px, 1px, px)");
-negativeTest("-webkit-clip-path", "circle(1px, 1px, 1p)");
-negativeTest("-webkit-clip-path", "circle(1px, 1px, calc())");
-
</del><span class="cx"> negativeTest("-webkit-clip-path", "circle(1 at 1px 1px)");
</span><span class="cx"> negativeTest("-webkit-clip-path", "circle(px at 1px 1px)");
</span><span class="cx"> negativeTest("-webkit-clip-path", "circle(1p at 1px 1px)");
</span><span class="cx"> negativeTest("-webkit-clip-path", "circle(calc() at 1px 1px)");
</span><span class="cx">
</span><span class="cx"> // reject negative radiuses
</span><del>-negativeTest("-webkit-clip-path", "circle(-1.5px, +1.5px, -1.5px)");
</del><span class="cx"> negativeTest("-webkit-clip-path", "circle(-1.5px at -1.5px +1.5px)");
</span><del>-negativeTest("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)");
-negativeTest("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)");
-negativeTest("-webkit-clip-path", "ellipse(1em, 1em, -1em, 1em)");
-negativeTest("-webkit-clip-path", "ellipse(1em, 1em, 1em, -1em)");
</del><ins>+negativeTest("-webkit-clip-path", "inset(1cm 1mm 1in 1px round -1pt, 1pc)");
+negativeTest("-webkit-clip-path", "inset(1cm 1mm 1in 1px round 1pt -1pc)");
+negativeTest("-webkit-clip-path", "ellipse(-1em 1em at 1em 1em)");
+negativeTest("-webkit-clip-path", "ellipse(1em -1em at 1em 1em)");
</ins><span class="cx">
</span><del>-// reject negative height and width
-negativeTest("-webkit-clip-path", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)");
-negativeTest("-webkit-clip-path", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)");
-
</del><span class="cx"> // reject multiple <box> values
</span><span class="cx"> negativeTest("-webkit-clip-path", "fill circle(50% at 50% 50%) content-box");
</span><span class="cx"> negativeTest("-webkit-clip-path", "margin-box padding-box");
</span><span class="lines">@@ -166,7 +123,6 @@
</span><span class="cx"> negativeTest("-webkit-clip-path", "url(#test) padding-box");
</span><span class="cx">
</span><span class="cx"> // general negative tests
</span><del>-negativeTest("-webkit-clip-path", "circle(0, 0)");
</del><span class="cx"> negativeTest("-webkit-clip-path", "polygon(0, 0)");
</span><span class="cx"> negativeTest("-webkit-clip-path", "polygon(0 0, 0)");
</span><span class="cx"> negativeTest("-webkit-clip-path", "polygon(0)");
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonadditionalregionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-additional-regions.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-additional-regions.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-additional-regions.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> }
</span><span class="cx"> #region_with_shape_inside {
</span><span class="cx"> border: 1px solid black;
</span><del>- -webkit-shape-inside: rectangle(50px, 0px, 250px, 300px);
</del><ins>+ -webkit-shape-inside: polygon(50px 0px, 300px 0px, 300px 300px, 50px 300px);
</ins><span class="cx"> overflow: hidden;
</span><span class="cx"> background-color: orange;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonfirstregionblockcontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-block-content.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-block-content.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-block-content.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> -webkit-flow-from: flow;
</span><span class="cx"> }
</span><span class="cx"> #shape_inside {
</span><del>- -webkit-shape-inside: rectangle(50px, 0px, 250px, 300px);
</del><ins>+ -webkit-shape-inside: polygon(50px 0px, 300px 0px, 300px 300px, 50px 300px);
</ins><span class="cx"> background-color: orange;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonfirstregioninlinecontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> -webkit-flow-from: flow;
</span><span class="cx"> }
</span><span class="cx"> #shape_inside {
</span><del>- -webkit-shape-inside: rectangle(50px, 0px, 250px, 300px);
</del><ins>+ -webkit-shape-inside: polygon(50px 0px, 300px 0px, 300px 300px, 50px 300px);
</ins><span class="cx"> background-color: orange;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleautoheightregionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> #source { -webkit-flow-into: article; }
</span><span class="cx"> .regions {
</span><span class="cx"> -webkit-flow-from: article;
</span><del>- -webkit-shape-inside: rectangle(90px, 0px, 100%, 100%);
</del><ins>+ -webkit-shape-inside: polygon(90px 0px, 140px 0px, 140px 100%, 90px 100%);
</ins><span class="cx"> width: 250px;
</span><span class="cx"> background-color: #dedede;
</span><span class="cx"> margin-top: 10px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleregionswithnegativeshapetopexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-article { font: 20px/1 Ahem, sans-serif; }
-.regions {
- width: 260px;
- height: 200px;
- margin: 0px 20px 20px;
- background-color: #b0dcff;
- -webkit-shape-inside: rectangle(10px, -20px, 100%, 50%);
-}
-.overflow {
- margin-top: -20px;
- margin-left: 20px;
-}
-</style>
-</head>
-<body>
-<article>
- <div class="regions">
- X X X X X X X X X X X X X X X X X X X X X X X X
- </div>
- <div class="regions">
- X X X X X X X X X X X X X X X X X X X X X X X X
- </div>
- <div class="overflow">
- X X X X X
- </div>
-</article>
-<p style="margin-top: 20px">
-Requires Ahem font. We have two regions, a rectangle shape with negative top coordinate and 10px left offset is applied on the regions.
-The content should flow from the first shape to the second shape. The overflow should be pushed down below the content box.
-</p>
-<p>Bug <a href="http://webkit.org/b/123346">123346</a>: [CSS Shapes][CSS Regions] Don't apply shape-inside when we have multiple auto-height regions and the height is not resolved</p>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleregionswithnegativeshapetophtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-#source {
- font: 20px/1 Ahem, sans-serif;
- -webkit-flow-into: article;
-}
-.regions {
- -webkit-flow-from: article;
- width: 260px;
- height: 200px;
- margin: 0px 20px 20px;
- background-color: #b0dcff;
- -webkit-shape-inside: rectangle(10px, -20px, 100%, 50%);
-}
-</style>
-</head>
-<body>
-<article>
- <div class="regions"></div>
- <div class="regions"></div>
-</article>
-<div id="source">
- X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X
-</div>
-
-<p style="margin-top: 40px;">
-Requires Ahem font. We have two regions, a rectangle shape with negative top coordinate and 10px left offset is applied on the regions.
-The content should flow from the first shape to the second shape. The overflow should be pushed down below the content box.
-</p>
-<p>Bug <a href="http://webkit.org/b/123346">123346</a>: [CSS Shapes][CSS Regions] Don't apply shape-inside when we have multiple auto-height regions and the height is not resolved</p>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentbasicoverflowshapetopoffsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> -webkit-flow-from: flow;
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 200px;
</span><del>- -webkit-shape-inside: rectangle(50px, 50px, 100px, 100px);
</del><ins>+ -webkit-shape-inside: polygon(50px 50px, 150px 50px, 150px 150px, 50px 150px);
</ins><span class="cx"> border: 2px solid green;
</span><span class="cx"> }
</span><span class="cx"> #border {
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentoverflowbottompositionedmultipleshapeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -14,10 +14,10 @@
</span><span class="cx"> border: 2px solid green;
</span><span class="cx"> padding: 10px;
</span><span class="cx"> }
</span><del>- #region1 { -webkit-shape-inside: rectangle(50px, 100px, 100px, 100px); }
</del><ins>+ #region1 { -webkit-shape-inside: polygon(50px 100px, 150px 100px, 150px 200px, 50px 200px); }
</ins><span class="cx"> #region2 {
</span><span class="cx"> margin-top: 10px;
</span><del>- -webkit-shape-inside: rectangle(25px, 100px, 150px, 100px);
</del><ins>+ -webkit-shape-inside: polygon(25px 100px, 175px 100px, 175px 200px, 25px 200px);
</ins><span class="cx"> }
</span><span class="cx"> #border1 {
</span><span class="cx"> position: absolute;
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentoverflowmultipleshapeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -13,11 +13,11 @@
</span><span class="cx"> height: 200px;
</span><span class="cx"> border: 2px solid green;
</span><span class="cx"> }
</span><del>- #region1 { -webkit-shape-inside: rectangle(50px, 50px, 100px, 100px); }
</del><ins>+ #region1 { -webkit-shape-inside: polygon(50px 50px, 150px 50px, 150px 150px, 50px 150px); }
</ins><span class="cx"> #region2 {
</span><span class="cx"> margin-top: 10px;
</span><span class="cx"> border-bottom: 10px solid yellow;
</span><del>- -webkit-shape-inside: rectangle(25px, 50px, 150px, 100px);
</del><ins>+ -webkit-shape-inside: polygon(25px 50px, 175px 50px, 175px 150px, 25px 150px);
</ins><span class="cx"> }
</span><span class="cx"> #border1 {
</span><span class="cx"> position: absolute;
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> #region1 {
</span><span class="cx"> width: 180px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-inside: rectangle(0, 0, 130px, 100px);
</del><ins>+ -webkit-shape-inside: polygon(0px 0px, 130px 0px, 130px 100px, 0px 100px);
</ins><span class="cx"> margin-top: 10px;
</span><span class="cx"> }
</span><span class="cx"> #region2 {
</span><span class="cx"> width: 300px;
</span><span class="cx"> height: 150px;
</span><del>- -webkit-shape-inside: rectangle(0, 0, 220px, 150px);
</del><ins>+ -webkit-shape-inside: polygon(0px 0px, 220px 0px, 200px 150px, 0px 150px);
</ins><span class="cx"> margin-top: 60px;
</span><span class="cx"> }
</span><span class="cx"> #region3 {
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentbasicoverflowshapetopoffsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> -webkit-flow-from: flow;
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 200px;
</span><del>- -webkit-shape-inside: rectangle(50px, 50px, 100px, 100px);
</del><ins>+ -webkit-shape-inside: polygon(50px 50px, 150px 50px, 150px 150px, 50px 150px);
</ins><span class="cx"> border: 2px solid green;
</span><span class="cx"> }
</span><span class="cx"> #border {
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentoverflowbottompositionedmultipleshapeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -14,10 +14,10 @@
</span><span class="cx"> border: 2px solid green;
</span><span class="cx"> padding: 10px;
</span><span class="cx"> }
</span><del>- #region1 { -webkit-shape-inside: rectangle(50px, 100px, 100px, 100px); }
</del><ins>+ #region1 { -webkit-shape-inside: polygon(50px 100px, 150px 100px, 150px 200px, 50px 200px); }
</ins><span class="cx"> #region2 {
</span><span class="cx"> margin-top: 10px;
</span><del>- -webkit-shape-inside: rectangle(25px, 100px, 140px, 100px);
</del><ins>+ -webkit-shape-inside: polygon(25px 100px, 165px 100px, 165px 200px, 25px 200px);
</ins><span class="cx"> }
</span><span class="cx"> #border1 {
</span><span class="cx"> position: absolute;
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentoverflowmultipleshapeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -13,10 +13,10 @@
</span><span class="cx"> height: 200px;
</span><span class="cx"> border: 2px solid green;
</span><span class="cx"> }
</span><del>- #region1 { -webkit-shape-inside: rectangle(50px, 50px, 100px, 100px); }
</del><ins>+ #region1 { -webkit-shape-inside: polygon(50px 50px, 150px 50px, 150px 150px, 50px 150px); }
</ins><span class="cx"> #region2 {
</span><span class="cx"> margin-top: 10px;
</span><del>- -webkit-shape-inside: rectangle(25px, 50px, 140px, 100px);
</del><ins>+ -webkit-shape-inside: polygon(25px 50px, 165px 50px, 165px 150px, 25px 150px);
</ins><span class="cx"> }
</span><span class="cx"> #border1 {
</span><span class="cx"> position: absolute;
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -13,14 +13,14 @@
</span><span class="cx"> width: 180px;
</span><span class="cx"> height: 100px;
</span><span class="cx"> border: 1px solid green;
</span><del>- -webkit-shape-inside: rectangle(0, 0, 130px, 100px);
</del><ins>+ -webkit-shape-inside: polygon(0px 0px, 130px 0px, 130px 100px, 0px 100px);
</ins><span class="cx"> margin-top: 10px;
</span><span class="cx"> }
</span><span class="cx"> #region2 {
</span><span class="cx"> width: 300px;
</span><span class="cx"> height: 150px;
</span><span class="cx"> border: 1px solid green;
</span><del>- -webkit-shape-inside: rectangle(0, 0, 220px, 150px);
</del><ins>+ -webkit-shape-inside: polygon(0px 0px, 220px 0px, 220px 150px, 0px 150px);
</ins><span class="cx"> margin-top: 60px;
</span><span class="cx"> }
</span><span class="cx"> #region3 {
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -12,13 +12,13 @@
</span><span class="cx"> #region1 {
</span><span class="cx"> width: 180px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-inside: rectangle(0, 0, 130px, 100px);
</del><ins>+ -webkit-shape-inside: polygon(0px 0px, 130px 0px, 130px 100px, 0px 100px);
</ins><span class="cx"> margin-top: 10px;
</span><span class="cx"> }
</span><span class="cx"> #region2 {
</span><span class="cx"> width: 300px;
</span><span class="cx"> height: 150px;
</span><del>- -webkit-shape-inside: rectangle(0, 0, 220px, 150px);
</del><ins>+ -webkit-shape-inside: polygon(0px 0px, 220px 0px, 200px 150px, 0px 150px);
</ins><span class="cx"> margin-top: 60px;
</span><span class="cx"> }
</span><span class="cx"> #region3 {
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonsecondregionblockcontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-block-content.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-block-content.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-block-content.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> -webkit-flow-from: flow;
</span><span class="cx"> }
</span><span class="cx"> #shape_inside {
</span><del>- -webkit-shape-inside: rectangle(50px, 0px, 250px, 300px);
</del><ins>+ -webkit-shape-inside: polygon(50px 0px, 300px 0px, 300px 300px, 50px 300px);
</ins><span class="cx"> background-color: orange;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonsecondregioninlinecontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> -webkit-flow-from: flow;
</span><span class="cx"> }
</span><span class="cx"> #shape_inside {
</span><del>- -webkit-shape-inside: rectangle(50px, 0px, 250px, 300px);
</del><ins>+ -webkit-shape-inside: polygon(50px 0px, 300px 0px, 300px 300px, 50px 300px);
</ins><span class="cx"> background-color: orange;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsiderecursivelayoutexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> .region {
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-inside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-inside: polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%);
</ins><span class="cx"> }
</span><span class="cx"> .content * {
</span><span class="cx"> color: green;
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsiderecursivelayouthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> .region {
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-inside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-inside: polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%);
</ins><span class="cx"> }
</span><span class="cx"> .content * {
</span><span class="cx"> color: green;
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsidewithregionbordershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-with-region-borders.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-with-region-borders.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-with-region-borders.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> -webkit-flow-from: flow;
</span><span class="cx"> }
</span><span class="cx"> #shape_inside {
</span><del>- -webkit-shape-inside: rectangle(50px, 0px, 200px, 300px);
</del><ins>+ -webkit-shape-inside: polygon(50px 0px, 250px 0px, 250px 300px, 50px 300px);
</ins><span class="cx"> background-color: orange;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsidewithregionpaddinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-with-region-padding.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-with-region-padding.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-with-region-padding.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> -webkit-flow-from: flow;
</span><span class="cx"> }
</span><span class="cx"> #shape_inside {
</span><del>- -webkit-shape-inside: rectangle(50px, 0px, 200px, 300px);
</del><ins>+ -webkit-shape-inside: polygon(50px 0px, 250px 0px, 250px 300px, 50px 300px);
</ins><span class="cx"> background-color: orange;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapescssshapesdisabledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -7,10 +7,10 @@
</span><span class="cx"> PASS testComputedStyle("-webkit-shape-margin", "10px") is "0px"
</span><span class="cx"> PASS testInlineStyle("-webkit-shape-padding", "10px") is null
</span><span class="cx"> PASS testComputedStyle("-webkit-shape-padding", "10px") is "0px"
</span><del>-PASS testInlineStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is null
-PASS testComputedStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is "none"
-PASS testInlineStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is null
-PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "none"
</del><ins>+PASS testInlineStyle("-webkit-shape-outside", "circle(10px at 10px 10px)") is null
+PASS testComputedStyle("-webkit-shape-outside", "circle(10px at 10px 10px)") is "none"
+PASS testInlineStyle("-webkit-shape-inside", "circle(10px at 10px 10px)") is null
+PASS testComputedStyle("-webkit-shape-inside", "circle(10px at 10px 10px)") is "none"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapescssshapesdisabledhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/css-shapes-disabled.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-disabled.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/css-shapes-disabled.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> testStyle("-webkit-shape-margin", "10px", "0px");
</span><span class="cx"> testStyle("-webkit-shape-padding", "10px", "0px");
</span><span class="cx">
</span><del>-testStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)", "none");
-testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "none");
</del><ins>+testStyle("-webkit-shape-outside", "circle(10px at 10px 10px)", "none");
+testStyle("-webkit-shape-inside", "circle(10px at 10px 10px)", "none");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapescssshapesenabledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/css-shapes-enabled-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-enabled-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/css-shapes-enabled-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -7,10 +7,10 @@
</span><span class="cx"> PASS testComputedStyle("-webkit-shape-margin", "10px") is "10px"
</span><span class="cx"> PASS testInlineStyle("-webkit-shape-padding", "10px") is "10px"
</span><span class="cx"> PASS testComputedStyle("-webkit-shape-padding", "10px") is "10px"
</span><del>-PASS testInlineStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is "circle(10px, 10px, 10px)"
-PASS testComputedStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is "circle(10px, 10px, 10px)"
-PASS testInlineStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "circle(10px, 10px, 10px)"
-PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "circle(10px, 10px, 10px)"
</del><ins>+PASS testInlineStyle("-webkit-shape-outside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
+PASS testComputedStyle("-webkit-shape-outside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
+PASS testInlineStyle("-webkit-shape-inside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
+PASS testComputedStyle("-webkit-shape-inside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapescssshapesenabledhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/css-shapes-enabled.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-enabled.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/css-shapes-enabled.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> testStyle("-webkit-shape-margin", "10px", "10px");
</span><span class="cx"> testStyle("-webkit-shape-padding", "10px", "10px");
</span><span class="cx">
</span><del>-testStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)", "circle(10px, 10px, 10px)");
-testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "circle(10px, 10px, 10px)");
</del><ins>+testStyle("-webkit-shape-outside", "circle(10px at 10px 10px)", "circle(10px at 10px 10px)");
+testStyle("-webkit-shape-inside", "circle(10px at 10px 10px)", "circle(10px at 10px 10px)");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5,18 +5,6 @@
</span><span class="cx">
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "none") is "none"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "none") is "none"
</span><del>-PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)") is "rectangle(10px, 20px, 30px, 40px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)") is "rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
-PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 5px)") is "rectangle(10px, 20px, 30px, 40px, 5px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 5px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 5px)"
-PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
-PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px)") is "inset-rectangle(10px, 20px, 30px, 40px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px)") is "inset-rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
-PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 5px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 5px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 5px)"
-PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
</del><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset(10px)") is "inset(10px 10px 10px 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px)") is "inset(10px 10px 10px 10px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset(10px 9px)") is "inset(10px 9px 10px 9px)"
</span><span class="lines">@@ -67,8 +55,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 20px 30px 40px round 5px 6px)") is "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)") is "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)") is "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
</del><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle()") is "circle(at 50% 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle()") is "circle(closest-side at 50% 50%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
</span><span class="lines">@@ -99,8 +85,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at right 0px bottom 0px)") is "circle(10px at 100% 100%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px, 30px, 40px)") is "ellipse(10px, 20px, 30px, 40px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px, 40px)") is "ellipse(10px, 20px, 30px, 40px)"
</del><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse()") is "ellipse(at 50% 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is "ellipse(closest-side closest-side at 50% 50%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px)") is "ellipse(10px at 50% 50%)"
</span><span class="lines">@@ -175,30 +159,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "auto") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "auto") is "none"
</span><del>-PASS getCSSText("-webkit-shape-inside", "rectangle()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle()") is "none"
-PASS getCSSText("-webkit-shape-inside", "rectangle(10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset-rectangle()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle()") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "none"
</del><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset()") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset()") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset(10px, 10px)") is ""
</span><span class="lines">@@ -229,12 +189,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(/ 10px)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset(round /)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(round /)") is "none"
</span><del>-PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(10px 20px 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px 30px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is "none"
</del><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px 20px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is ""
</span><span class="lines">@@ -251,12 +205,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(at center center 10px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "none"
</span><del>-PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is "none"
</del><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px 30px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px at 10px 10px 10px)") is ""
</span><span class="lines">@@ -305,11 +253,11 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "none"
</span><del>-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "none", "rectangle(10px, 20px, 30px, 40px)") is "parent: none, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "outside-shape", "rectangle(10px, 20px, 30px, 40px)") is "parent: outside-shape, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: none"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: none"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "inherit") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
</del><ins>+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "none", "circle(30px at 10px 20px)") is "parent: none, child: circle(30px at 10px 20px)"
+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "outside-shape", "circle(30px at 10px 20px)") is "parent: outside-shape, child: circle(30px at 10px 20px)"
+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "circle(30px at 10px 20px)", "initial") is "parent: circle(30px at 10px 20px), child: none"
+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "circle(30px at 10px 20px)", "") is "parent: circle(30px at 10px 20px), child: none"
+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "circle(30px at 10px 20px)", "inherit") is "parent: circle(30px at 10px 20px), child: circle(30px at 10px 20px)"
</ins><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "", "inherit") is "parent: none, child: none"
</span><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "none", "inherit") is "parent: none, child: none"
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> applyToEachArglist(
</span><span class="cx"> testNotInheritedShapeProperty,
</span><span class="cx"> [// [property, parentValue, childValue, expectedValue]
</span><del>- ["-webkit-shape-inside", "none", "rectangle(10px, 20px, 30px, 40px)", "parent: none, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
- ["-webkit-shape-inside", "outside-shape", "rectangle(10px, 20px, 30px, 40px)", "parent: outside-shape, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
- ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: none"],
- ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: none"],
- ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "inherit", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
</del><ins>+ ["-webkit-shape-inside", "none", "circle(30px at 10px 20px)", "parent: none, child: circle(30px at 10px 20px)"],
+ ["-webkit-shape-inside", "outside-shape", "circle(30px at 10px 20px)", "parent: outside-shape, child: circle(30px at 10px 20px)"],
+ ["-webkit-shape-inside", "circle(30px at 10px 20px)", "initial", "parent: circle(30px at 10px 20px), child: none"],
+ ["-webkit-shape-inside", "circle(30px at 10px 20px)", "", "parent: circle(30px at 10px 20px), child: none"],
+ ["-webkit-shape-inside", "circle(30px at 10px 20px)", "inherit", "parent: circle(30px at 10px 20px), child: circle(30px at 10px 20px)"],
</ins><span class="cx"> ["-webkit-shape-inside", "", "inherit", "parent: none, child: none"],
</span><span class="cx"> ["-webkit-shape-inside", "none", "inherit", "parent: none, child: none"]]
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapelengthsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -3,78 +3,52 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS getStyleValue("-webkit-shape-inside", "circle(0, 0, 0)") is "circle(0px, 0px, 0px)"
-PASS getStyleValue("-webkit-shape-inside", "circle(-1px, +1px, 1px)") is "circle(-1px, 1px, 1px)"
-PASS getStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, 1.5px)") is "circle(-1.5px, 1.5px, 1.5px)"
-PASS getStyleValue("-webkit-shape-inside", "circle(-.5px, +.5px, .5px)") is "circle(-0.5px, 0.5px, 0.5px)"
-PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)"
-PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)"
</del><ins>+PASS getStyleValue("-webkit-shape-inside", "circle(0 at 0 0)") is "circle(0px at 0% 0%)"
+PASS getStyleValue("-webkit-shape-inside", "circle(1px at +1px -1px)") is "circle(1px at 1px -1px)"
+PASS getStyleValue("-webkit-shape-inside", "circle(1.5px at -1.5px +1.5px)") is "circle(1.5px at -1.5px 1.5px)"
+PASS getStyleValue("-webkit-shape-inside", "circle(.5px at -.5px +.5px)") is "circle(0.5px at -0.5px 0.5px)"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset(1cm 1mm 1in 1px round 1pt 1pc)") is "inset(1cm 1mm 1in 1px round 1pt 1pc 1pt 1pc / 1pt 1pc 1pt 1pc)"
</span><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset(-1px 1px 1px 1px round 1px 1px 1px 1px)") is "inset(-1px 1px 1px 1px round 1px 1px 1px 1px / 1px 1px 1px 1px)"
</span><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset(1px -1px 1px 1px round 1px 1px 1px 1px)") is "inset(1px -1px 1px 1px round 1px 1px 1px 1px / 1px 1px 1px 1px)"
</span><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset(1px 1px -1px 1px round 1px 1px 1px 1px)") is "inset(1px 1px -1px 1px round 1px 1px 1px 1px / 1px 1px 1px 1px)"
</span><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset(1px 1px 1px -1px round 1px 1px 1px 1px)") is "inset(1px 1px 1px -1px round 1px 1px 1px 1px / 1px 1px 1px 1px)"
</span><del>-PASS getStyleValue("-webkit-shape-inside", "circle(-1em, +1em, 1em)") is "circle(-1em, 1em, 1em)"
-PASS getStyleValue("-webkit-shape-inside", "circle(-1.5em, +1.5em, 1.5em)") is "circle(-1.5em, 1.5em, 1.5em)"
-PASS getStyleValue("-webkit-shape-inside", "circle(-.5em, +.5em, .5em)") is "circle(-0.5em, 0.5em, 0.5em)"
-PASS getStyleValue("-webkit-shape-inside", "circle(1ex, 1ex, 1ex)") is "circle(1ex, 1ex, 1ex)"
-PASS getStyleValue("-webkit-shape-inside", "circle(1rem, 1rem, 1rem)") is "circle(1rem, 1rem, 1rem)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(.5em, 1em, 1.5em)") is "circle(4px, 8px, 12px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(.5rem, 1rem, 1.5rem)") is "circle(8px, 16px, 24px)"
-PASS getStyleValue("-webkit-shape-inside", "circle(1vw, 1vw, 1vw)") is "circle(1vw, 1vw, 1vw)"
-PASS getStyleValue("-webkit-shape-inside", "circle(1vh, 1vh, 1vh)") is "circle(1vh, 1vh, 1vh)"
-PASS getStyleValue("-webkit-shape-inside", "circle(1vmin, 1vmin, 1vmin)") is "circle(1vmin, 1vmin, 1vmin)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(.5vw, 1vw, 1.5vw)") is "circle(0.5vw, 1vw, 1.5vw)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(.5vh, 1vh, 1.5vh)") is "circle(0.5vh, 1vh, 1.5vh)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(.5vmin, 1vmin, 1.5vmin)") is "circle(0.5vmin, 1vmin, 1.5vmin)"
-PASS getStyleValue("-webkit-shape-inside", "circle(100%, 100%, 100%)") is "circle(100%, 100%, 100%)"
-PASS getStyleValue("-webkit-shape-inside", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "rectangle(45%, 45%, 90%, 60%, 25%, 10%)"
-PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)"
</del><ins>+PASS getStyleValue("-webkit-shape-inside", "circle(1em at -1em +1em)") is "circle(1em at -1em 1em)"
+PASS getStyleValue("-webkit-shape-inside", "circle(1.5em at -1.5em +1.5em)") is "circle(1.5em at -1.5em 1.5em)"
+PASS getStyleValue("-webkit-shape-inside", "circle(.5em at -.5em +.5em)") is "circle(0.5em at -0.5em 0.5em)"
+PASS getStyleValue("-webkit-shape-inside", "circle(1ex at 1ex 1ex)") is "circle(1ex at 1ex 1ex)"
+PASS getStyleValue("-webkit-shape-inside", "circle(1rem at 1rem 1rem)") is "circle(1rem at 1rem 1rem)"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1.5em at .5em 1em)") is "circle(12px at 4px 8px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1.5rem at .5rem 1rem)") is "circle(24px at 8px 16px)"
+PASS getStyleValue("-webkit-shape-inside", "circle(1vw at 1vw 1vw)") is "circle(1vw at 1vw 1vw)"
+PASS getStyleValue("-webkit-shape-inside", "circle(1vh at 1vh 1vh)") is "circle(1vh at 1vh 1vh)"
+PASS getStyleValue("-webkit-shape-inside", "circle(1vmin at 1vmin 1vmin)") is "circle(1vmin at 1vmin 1vmin)"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1.5vw at .5vw 1vw)") is "circle(1.5vw at 0.5vw 1vw)"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1.5vh at .5vh 1vh)") is "circle(1.5vh at 0.5vh 1vh)"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1.5vmin at .5vmin 1vmin)") is "circle(1.5vmin at 0.5vmin 1vmin)"
+PASS getStyleValue("-webkit-shape-inside", "circle(100% at 100% 100%)") is "circle(100% at 100% 100%)"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)"
</span><del>-PASS getStyleValue("-webkit-shape-inside", "ellipse(100%, 100%, 100%, 100%)") is "ellipse(100%, 100%, 100%, 100%)"
</del><ins>+PASS getStyleValue("-webkit-shape-inside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(50%, 100%, 150%)") is "circle(50%, 100%, 150%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "rectangle(45%, 45%, 90%, 60%, 25%, 10%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(150% at 50% 100%)") is "circle(150% at 50% 100%)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(100%, 100%, 100%, 100%)") is "ellipse(100%, 100%, 100%, 100%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
</span><del>-PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is "none"
-PASS getStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "none"
</del><ins>+PASS getStyleValue("-webkit-shape-inside", "circle(1 at 1px 1px)") is null
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1 at 1px 1px)") is "none"
+PASS getStyleValue("-webkit-shape-inside", "circle(px at 1px 1px)") is null
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(px at 1px 1px)") is "none"
+PASS getStyleValue("-webkit-shape-inside", "circle(1p at 1px 1px)") is null
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1p at 1px 1px)") is "none"
+PASS getStyleValue("-webkit-shape-inside", "circle(calc( at 1px 1px))") is null
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(calc( at 1px 1px))") is "none"
+PASS getStyleValue("-webkit-shape-inside", "circle(-1.5px at -1.5px +1.5px)") is null
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(-1.5px at -1.5px +1.5px)") is "none"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset(1cm 1mm 1in 1px round 1pt -1pc)") is null
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(1cm 1mm 1in 1px round 1pt -1pc)") is "none"
</span><del>-PASS getStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "none"
-PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "none"
</del><ins>+PASS getStyleValue("-webkit-shape-inside", "ellipse(-1em 1em at 1em 1em)") is null
+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(-1em 1em at 1em 1em)") is "none"
+PASS getStyleValue("-webkit-shape-inside", "ellipse(1em -1em at 1em 1em)") is null
+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em -1em at 1em 1em)") is "none"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapelengthshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -36,13 +36,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // absolute lengths - number serialization, units
</span><del>-testStyleValue("circle(0, 0, 0)", "circle(0px, 0px, 0px)");
-testStyleValue("circle(-1px, +1px, 1px)", "circle(-1px, 1px, 1px)");
-testStyleValue("circle(-1.5px, +1.5px, 1.5px)", "circle(-1.5px, 1.5px, 1.5px)");
-testStyleValue("circle(-.5px, +.5px, .5px)", "circle(-0.5px, 0.5px, 0.5px)");
</del><ins>+testStyleValue("circle(0 at 0 0)", "circle(0px at 0% 0%)");
+testStyleValue("circle(1px at +1px -1px)", "circle(1px at 1px -1px)");
+testStyleValue("circle(1.5px at -1.5px +1.5px)", "circle(1.5px at -1.5px 1.5px)");
+testStyleValue("circle(.5px at -.5px +.5px)", "circle(0.5px at -0.5px 0.5px)");
</ins><span class="cx">
</span><del>-testStyleValue("rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)", "rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)");
-testStyleValue("inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)");
</del><span class="cx"> testStyleValue("inset(1cm 1mm 1in 1px round 1pt 1pc)", "inset(1cm 1mm 1in 1px round 1pt 1pc 1pt 1pc / 1pt 1pc 1pt 1pc)");
</span><span class="cx"> testStyleValue("inset(-1px 1px 1px 1px round 1px 1px 1px 1px)", "inset(-1px 1px 1px 1px round 1px 1px 1px 1px / 1px 1px 1px 1px)");
</span><span class="cx"> testStyleValue("inset(1px -1px 1px 1px round 1px 1px 1px 1px)", "inset(1px -1px 1px 1px round 1px 1px 1px 1px / 1px 1px 1px 1px)");
</span><span class="lines">@@ -50,67 +48,49 @@
</span><span class="cx"> testStyleValue("inset(1px 1px 1px -1px round 1px 1px 1px 1px)", "inset(1px 1px 1px -1px round 1px 1px 1px 1px / 1px 1px 1px 1px)");
</span><span class="cx">
</span><span class="cx"> // font-relative lengths - number serialization, units, resolution
</span><del>-testStyleValue("circle(-1em, +1em, 1em)", "circle(-1em, 1em, 1em)");
-testStyleValue("circle(-1.5em, +1.5em, 1.5em)", "circle(-1.5em, 1.5em, 1.5em)");
-testStyleValue("circle(-.5em, +.5em, .5em)", "circle(-0.5em, 0.5em, 0.5em)");
</del><ins>+testStyleValue("circle(1em at -1em +1em)", "circle(1em at -1em 1em)");
+testStyleValue("circle(1.5em at -1.5em +1.5em)", "circle(1.5em at -1.5em 1.5em)");
+testStyleValue("circle(.5em at -.5em +.5em)", "circle(0.5em at -0.5em 0.5em)");
</ins><span class="cx">
</span><del>-testStyleValue("circle(1ex, 1ex, 1ex)", "circle(1ex, 1ex, 1ex)");
</del><ins>+testStyleValue("circle(1ex at 1ex 1ex)", "circle(1ex at 1ex 1ex)");
</ins><span class="cx"> // FIXME: Add ch test when it is supported
</span><del>-testStyleValue("circle(1rem, 1rem, 1rem)", "circle(1rem, 1rem, 1rem)");
</del><ins>+testStyleValue("circle(1rem at 1rem 1rem)", "circle(1rem at 1rem 1rem)");
</ins><span class="cx">
</span><del>-testComputedStyleValue("circle(.5em, 1em, 1.5em)", "circle(4px, 8px, 12px)");
-testComputedStyleValue("circle(.5rem, 1rem, 1.5rem)", "circle(8px, 16px, 24px)");
</del><ins>+testComputedStyleValue("circle(1.5em at .5em 1em)", "circle(12px at 4px 8px)");
+testComputedStyleValue("circle(1.5rem at .5rem 1rem)", "circle(24px at 8px 16px)");
</ins><span class="cx">
</span><span class="cx"> // viewport-percentage lengths - units, resolution
</span><del>-testStyleValue("circle(1vw, 1vw, 1vw)", "circle(1vw, 1vw, 1vw)");
-testStyleValue("circle(1vh, 1vh, 1vh)", "circle(1vh, 1vh, 1vh)");
-testStyleValue("circle(1vmin, 1vmin, 1vmin)", "circle(1vmin, 1vmin, 1vmin)");
</del><ins>+testStyleValue("circle(1vw at 1vw 1vw)", "circle(1vw at 1vw 1vw)");
+testStyleValue("circle(1vh at 1vh 1vh)", "circle(1vh at 1vh 1vh)");
+testStyleValue("circle(1vmin at 1vmin 1vmin)", "circle(1vmin at 1vmin 1vmin)");
</ins><span class="cx">
</span><del>-testComputedStyleValue("circle(.5vw, 1vw, 1.5vw)", "circle(0.5vw, 1vw, 1.5vw)");
-testComputedStyleValue("circle(.5vh, 1vh, 1.5vh)", "circle(0.5vh, 1vh, 1.5vh)");
-testComputedStyleValue("circle(.5vmin, 1vmin, 1.5vmin)", "circle(0.5vmin, 1vmin, 1.5vmin)");
</del><ins>+testComputedStyleValue("circle(1.5vw at .5vw 1vw)", "circle(1.5vw at 0.5vw 1vw)");
+testComputedStyleValue("circle(1.5vh at .5vh 1vh)", "circle(1.5vh at 0.5vh 1vh)");
+testComputedStyleValue("circle(1.5vmin at .5vmin 1vmin)", "circle(1.5vmin at 0.5vmin 1vmin)");
</ins><span class="cx">
</span><span class="cx"> // percentage lengths - units
</span><del>-testStyleValue("circle(100%, 100%, 100%)", "circle(100%, 100%, 100%)");
-testStyleValue("rectangle(45%, 45%, 90%, 60%, 25%, 10%)", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)");
-testStyleValue("inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)", "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)");
</del><ins>+testStyleValue("circle(100% at 100% 100%)", "circle(100% at 100% 100%)");
</ins><span class="cx"> testStyleValue("inset(45% 45% 90% 60% round 25% 10%)", "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)");
</span><del>-testStyleValue("ellipse(100%, 100%, 100%, 100%)", "ellipse(100%, 100%, 100%, 100%)");
</del><ins>+testStyleValue("ellipse(100% 100% at 100% 100%)", "ellipse(100% 100% at 100% 100%)");
</ins><span class="cx"> testStyleValue("polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)");
</span><span class="cx">
</span><del>-testComputedStyleValue("circle(50%, 100%, 150%)", "circle(50%, 100%, 150%)");
-testComputedStyleValue("rectangle(45%, 45%, 90%, 60%, 25%, 10%)", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)");
-testComputedStyleValue("inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)", "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)");
</del><ins>+testComputedStyleValue("circle(150% at 50% 100%)", "circle(150% at 50% 100%)");
</ins><span class="cx"> testComputedStyleValue("inset(45% 45% 90% 60% round 25% 10%)", "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)");
</span><del>-testComputedStyleValue("ellipse(100%, 100%, 100%, 100%)", "ellipse(100%, 100%, 100%, 100%)");
</del><ins>+testComputedStyleValue("ellipse(100% 100% at 100% 100%)", "ellipse(100% 100% at 100% 100%)");
</ins><span class="cx"> testComputedStyleValue("polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)");
</span><span class="cx">
</span><span class="cx"> // reject non-lengths
</span><del>-testInvalidValue("-webkit-shape-inside", "circle(1px, 1px, 1)");
-testInvalidValue("-webkit-shape-inside", "circle(1px, 1px, px)");
-testInvalidValue("-webkit-shape-inside", "circle(1px, 1px, 1p)");
-testInvalidValue("-webkit-shape-inside", "circle(1px, 1px, calc())");
</del><ins>+testInvalidValue("-webkit-shape-outside", "circle(1 at 1px 1px)");
+testInvalidValue("-webkit-shape-outside", "circle(px at 1px 1px)");
+testInvalidValue("-webkit-shape-outside", "circle(1p at 1px 1px)");
+testInvalidValue("-webkit-shape-outside", "circle(calc( at 1px 1px))");
</ins><span class="cx">
</span><span class="cx"> // reject negative radiuses
</span><del>-testInvalidValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)");
-testInvalidValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)");
-testInvalidValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)");
-testInvalidValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)");
-testInvalidValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)");
-testInvalidValue("-webkit-shape-inside", "inset(1cm 1mm 1in 1px round 1pt -1pc)");
-testInvalidValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)");
-testInvalidValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)");
</del><ins>+testInvalidValue("-webkit-shape-outside", "circle(-1.5px at -1.5px +1.5px)");
+testInvalidValue("-webkit-shape-outside", "inset(1cm 1mm 1in 1px round 1pt -1pc)");
+testInvalidValue("-webkit-shape-outside", "ellipse(-1em 1em at 1em 1em)");
+testInvalidValue("-webkit-shape-outside", "ellipse(1em -1em at 1em 1em)");
</ins><span class="cx">
</span><del>-// reject negative height and width
-testInvalidValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)");
-testInvalidValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)");
-
-// reject negative top, right, bottom, and left
-testInvalidValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)");
-testInvalidValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)");
-testInvalidValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)");
-testInvalidValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)");
-
</del><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5,18 +5,6 @@
</span><span class="cx">
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "none") is "none"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "none") is "none"
</span><del>-PASS getCSSText("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px)") is "rectangle(10px, 20px, 30px, 40px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px)") is "rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
-PASS getCSSText("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px, 5px)") is "rectangle(10px, 20px, 30px, 40px, 5px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px, 5px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 5px)"
-PASS getCSSText("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
-PASS getCSSText("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px)") is "inset-rectangle(10px, 20px, 30px, 40px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px)") is "inset-rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
-PASS getCSSText("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px, 5px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px, 5px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 5px)"
-PASS getCSSText("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
</del><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset(10px)") is "inset(10px 10px 10px 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px)") is "inset(10px 10px 10px 10px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset(10px 9px)") is "inset(10px 9px 10px 9px)"
</span><span class="lines">@@ -67,8 +55,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 20px 30px 40px round 5px 6px)") is "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)") is "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)") is "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
</del><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle()") is "circle(at 50% 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle()") is "circle(closest-side at 50% 50%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
</span><span class="lines">@@ -99,8 +85,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at right 0px bottom 0px)") is "circle(10px at 100% 100%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "ellipse(10px, 20px, 30px, 40px)") is "ellipse(10px, 20px, 30px, 40px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px, 20px, 30px, 40px)") is "ellipse(10px, 20px, 30px, 40px)"
</del><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse()") is "ellipse(at 50% 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "ellipse()") is "ellipse(closest-side closest-side at 50% 50%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px)") is "ellipse(10px at 50% 50%)"
</span><span class="lines">@@ -173,30 +157,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "calc()") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "auto") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "auto") is "none"
</span><del>-PASS getCSSText("-webkit-shape-outside", "rectangle()") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "rectangle()") is "none"
-PASS getCSSText("-webkit-shape-outside", "rectangle(10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "rectangle(10px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "rectangle(10px, 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "rectangle(10px, 10px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "rectangle(10px, 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "rectangle(10px, 20px, 30px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "rectangle(10px 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "rectangle(10px 20px 30px 40px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "inset-rectangle()") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle()") is "none"
-PASS getCSSText("-webkit-shape-outside", "inset-rectangle(10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "inset-rectangle(10px, 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px, 10px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "inset-rectangle(10px 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px 20px 30px 40px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "none"
</del><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset()") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset()") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset(10px, 10px)") is ""
</span><span class="lines">@@ -227,12 +187,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(/ 10px)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset(round /)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(round /)") is "none"
</span><del>-PASS getCSSText("-webkit-shape-outside", "circle(10px, 20px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px, 20px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "circle(10px 20px 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px 20px 30px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "circle(10px, 20px, 30px, 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px, 20px, 30px, 40px)") is "none"
</del><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px 20px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px 20px)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px at 10px 10px 10px)") is ""
</span><span class="lines">@@ -249,12 +203,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(at 10px 10px at center)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(at center center 10px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(at center center 10px)") is "none"
</span><del>-PASS getCSSText("-webkit-shape-outside", "ellipse(10px, 20px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px, 20px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "ellipse(10px, 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px, 20px, 30px)") is "none"
-PASS getCSSText("-webkit-shape-outside", "ellipse(10px 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px 20px 30px 40px)") is "none"
</del><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px 20px 30px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px 20px 30px)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px at 10px 10px 10px)") is ""
</span><span class="lines">@@ -305,10 +253,10 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "outside-shape") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "outside-shape") is "none"
</span><del>-PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "none", "rectangle(10px, 20px, 30px, 40px)") is "parent: none, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
-PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: none"
-PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: none"
-PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px)", "inherit") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
</del><ins>+PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "none", "circle(30px at 10px 20px)") is "parent: none, child: circle(30px at 10px 20px)"
+PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "circle(30px at 10px 20px)", "initial") is "parent: circle(30px at 10px 20px), child: none"
+PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "circle(30px at 10px 20px)", "") is "parent: circle(30px at 10px 20px), child: none"
+PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "circle(30px at 10px 20px)", "inherit") is "parent: circle(30px at 10px 20px), child: circle(30px at 10px 20px)"
</ins><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "", "inherit") is "parent: none, child: none"
</span><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "none", "inherit") is "parent: none, child: none"
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx"> applyToEachArglist(
</span><span class="cx"> testNotInheritedShapeProperty,
</span><span class="cx"> [// [property, parentValue, childValue, expectedValue]
</span><del>- ["-webkit-shape-outside", "none", "rectangle(10px, 20px, 30px, 40px)", "parent: none, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
- ["-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px)", "initial", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: none"],
- ["-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px)", "", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: none"],
- ["-webkit-shape-outside", "rectangle(10px, 20px, 30px, 40px)", "inherit", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
</del><ins>+ ["-webkit-shape-outside", "none", "circle(30px at 10px 20px)", "parent: none, child: circle(30px at 10px 20px)"],
+ ["-webkit-shape-outside", "circle(30px at 10px 20px)", "initial", "parent: circle(30px at 10px 20px), child: none"],
+ ["-webkit-shape-outside", "circle(30px at 10px 20px)", "", "parent: circle(30px at 10px 20px), child: none"],
+ ["-webkit-shape-outside", "circle(30px at 10px 20px)", "inherit", "parent: circle(30px at 10px 20px), child: circle(30px at 10px 20px)"],
</ins><span class="cx"> ["-webkit-shape-outside", "", "inherit", "parent: none, child: none"],
</span><span class="cx"> ["-webkit-shape-outside", "none", "inherit", "parent: none, child: none"]]
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingtestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -6,14 +6,7 @@
</span><span class="cx"> // or: ["specified value", "CSS Text value", "Computed style value"]
</span><span class="cx"> var validShapeValues = [
</span><span class="cx"> "none",
</span><del>- ["rectangle(10px, 20px, 30px, 40px)", "rectangle(10px, 20px, 30px, 40px)", "rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
- ["rectangle(10px, 20px, 30px, 40px, 5px)", "rectangle(10px, 20px, 30px, 40px, 5px)", "rectangle(10px, 20px, 30px, 40px, 5px, 5px)"],
- "rectangle(10px, 20px, 30px, 40px, 5px, 10px)",
</del><span class="cx">
</span><del>- ["inset-rectangle(10px, 20px, 30px, 40px)", "inset-rectangle(10px, 20px, 30px, 40px)", "inset-rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
- ["inset-rectangle(10px, 20px, 30px, 40px, 5px)", "inset-rectangle(10px, 20px, 30px, 40px, 5px)", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 5px)"],
- "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)",
-
</del><span class="cx"> ["inset(10px)", "inset(10px 10px 10px 10px)", "inset(10px 10px 10px 10px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
</span><span class="cx"> ["inset(10px 9px)", "inset(10px 9px 10px 9px)", "inset(10px 9px 10px 9px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
</span><span class="cx"> ["inset(10px 9px 8px)", "inset(10px 9px 8px 9px)", "inset(10px 9px 8px 9px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
</span><span class="lines">@@ -40,8 +33,6 @@
</span><span class="cx"> ["inset(10px 20px 30px 40px round 5px 6px)", "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)", "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)"],
</span><span class="cx"> "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)",
</span><span class="cx">
</span><del>- "circle(10px, 20px, 30px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
-
</del><span class="cx"> ["circle()", "circle(at 50% 50%)", "circle(closest-side at 50% 50%)"],
</span><span class="cx"> ["circle(farthest-side)", "circle(farthest-side at 50% 50%)", "circle(farthest-side at 50% 50%)"],
</span><span class="cx"> ["circle(closest-side)", "circle(closest-side at 50% 50%)", "circle(closest-side at 50% 50%)"],
</span><span class="lines">@@ -58,8 +49,6 @@
</span><span class="cx"> ["circle(10px at right 0px bottom 0px)", "circle(10px at 100% 100%)"],
</span><span class="cx"> ["circle(10px at right 10px bottom 10px)", "circle(10px at right 10px bottom 10px)"],
</span><span class="cx">
</span><del>- "ellipse(10px, 20px, 30px, 40px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
-
</del><span class="cx"> ["ellipse()", "ellipse(at 50% 50%)", "ellipse(closest-side closest-side at 50% 50%)"],
</span><span class="cx"> ["ellipse(10px)", "ellipse(10px at 50% 50%)", "ellipse(10px closest-side at 50% 50%)"],
</span><span class="cx"> ["ellipse(10px 20px)", "ellipse(10px 20px at 50% 50%)", "ellipse(10px 20px at 50% 50%)"],
</span><span class="lines">@@ -105,20 +94,6 @@
</span><span class="cx"> "calc()",
</span><span class="cx"> "auto",
</span><span class="cx">
</span><del>- "rectangle()",
- "rectangle(10px)",
- "rectangle(10px, 10px)",
- "rectangle(10px, 20px, 30px)",
- "rectangle(10px 20px 30px 40px)",
- "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)",
-
- "inset-rectangle()",
- "inset-rectangle(10px)",
- "inset-rectangle(10px, 10px)",
- "inset-rectangle(10px, 20px, 30px)",
- "inset-rectangle(10px 20px 30px 40px)",
- "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)",
-
</del><span class="cx"> "inset()",
</span><span class="cx"> "inset(10px, 10px)",
</span><span class="cx"> "inset(10px 20px, 30px)",
</span><span class="lines">@@ -135,10 +110,6 @@
</span><span class="cx"> "inset(/ 10px)",
</span><span class="cx"> "inset(round /)",
</span><span class="cx">
</span><del>- "circle(10px, 20px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
- "circle(10px 20px 30px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
- "circle(10px, 20px, 30px, 40px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
-
</del><span class="cx"> "circle(10px 20px)",
</span><span class="cx"> "circle(10px at 10px 10px 10px)",
</span><span class="cx"> "circle(10px at 10px 10px at center)",
</span><span class="lines">@@ -148,10 +119,6 @@
</span><span class="cx"> "circle(at 10px 10px at center)",
</span><span class="cx"> "circle(at center center 10px)",
</span><span class="cx">
</span><del>- "ellipse(10px, 20px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
- "ellipse(10px, 20px, 30px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
- "ellipse(10px 20px 30px 40px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
-
</del><span class="cx"> "ellipse(10px 20px 30px)",
</span><span class="cx"> "ellipse(10px at 10px 10px 10px)",
</span><span class="cx"> "ellipse(10px at 10px 10px at center)",
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesresourcessimplerectanglejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -12,14 +12,23 @@
</span><span class="cx"> var rules = [];
</span><span class="cx"> for (var i in bounds)
</span><span class="cx"> rules.push(i + ':' + bounds[i] + units);
</span><del>- var rectangleBounds = [shapeBounds.x + units, shapeBounds.y + units, shapeBounds.width + units, shapeBounds.height + units];
- rules.push('-webkit-shape-inside: rectangle(' + rectangleBounds.join(',') + ')');
</del><ins>+ var rectangleBounds = {
+ top: shapeBounds.x + units,
+ left: shapeBounds.y + units,
+ bottom: (shapeBounds.y + shapeBounds.height) + units,
+ right: (shapeBounds.x + shapeBounds.width) + units
+ };
+ rules.push('-webkit-shape-inside: polygon(' +
+ rectangleBounds.left + " " + rectangleBounds.top + "," +
+ rectangleBounds.right + " " + rectangleBounds.top + "," +
+ rectangleBounds.right + " " + rectangleBounds.bottom + "," +
+ rectangleBounds.left + " " + rectangleBounds.bottom + ')');
</ins><span class="cx"> rules.push('position: relative');
</span><span class="cx"> rules.push('overflow-wrap: break-word');
</span><span class="cx"> stylesheet.insertRule('#' + elementId + '{' + rules.join(';') + '}');
</span><span class="cx">
</span><span class="cx"> rules = [];
</span><del>- rules.push('left: ' + (shapeBounds.x - 1) + units, 'top: ' + (shapeBounds.y - 1) + units, 'width: ' + rectangleBounds[2], 'height: ' + rectangleBounds[3]);
</del><ins>+ rules.push('left: ' + (shapeBounds.x - 1) + units, 'top: ' + (shapeBounds.y - 1) + units, 'width: ' + shapeBounds.width + units, 'height: ' + shapeBounds.height + units);
</ins><span class="cx"> rules.push('position: absolute', 'display: block', 'content: \' \'');
</span><span class="cx"> rules.push('border: 1px solid blue');
</span><span class="cx"> stylesheet.insertRule('#' + elementId + ':before{' + rules.join(';') + '}');
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideanimationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> Moving Text Moving Text Moving Text Moving Text
</span><del>-PASS - "webkitShapeInside" property for "rectangle-box" element at 1s saw something close to: rectangle(10%, 10%, 80%, 80%, 0px, 0px)
</del><ins>+PASS - "webkitShapeInside" property for "inset-box" element at 1s saw something close to: inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)
</ins><span class="cx"> PASS - "webkitShapeInside" property for "circle-box" element at 1s saw something close to: circle(35% at 35% 35%)
</span><span class="cx"> PASS - "webkitShapeInside" property for "ellipse-box" element at 1s saw something close to: ellipse(35% 30% at 35% 35%)
</span><span class="cx"> PASS - "webkitShapeInside" property for "polygon-box" element at 1s saw something close to: polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideanimationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx"> display: inline-block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #rectangle-box {
- -webkit-animation: rectangle-anim 2s linear
</del><ins>+ #inset-box {
+ -webkit-animation: inset-anim 2s linear
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #circle-box {
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- @-webkit-keyframes rectangle-anim {
- from { -webkit-shape-inside: rectangle(0%, 0%, 100%, 100%); }
- to { -webkit-shape-inside: rectangle(20%, 20%, 60%, 60%); }
</del><ins>+ @-webkit-keyframes inset-anim {
+ from { -webkit-shape-inside: inset(0%); }
+ to { -webkit-shape-inside: inset(20%); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes circle-anim {
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> const expectedValues = [
</span><span class="cx"> // [animation-name, time, element-id, property, expected-value, tolerance]
</span><del>- ["rectangle-anim", 1, "rectangle-box", "webkitShapeInside", "rectangle(10%, 10%, 80%, 80%, 0px, 0px)", 0.05],
</del><ins>+ ["inset-anim", 1, "inset-box", "webkitShapeInside", "inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)", 0.05],
</ins><span class="cx"> ["circle-anim", 1, "circle-box", "webkitShapeInside", "circle(35% at 35% 35%)", 0.05],
</span><span class="cx"> ["ellipse-anim", 1, "ellipse-box", "webkitShapeInside", "ellipse(35% 30% at 35% 35%)", 0.05],
</span><span class="cx"> ["polygon-anim", 1, "polygon-box", "webkitShapeInside", "polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx">
</span><del>-<div class="box" id="rectangle-box">Moving Text</div>
</del><ins>+<div class="box" id="inset-box">Moving Text</div>
</ins><span class="cx"> <div class="box" id="circle-box">Moving Text</div>
</span><span class="cx"> <div class="box" id="ellipse-box">Moving Text</div>
</span><span class="cx"> <div class="box" id="polygon-box">Moving Text</div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidebottomedgeexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-bottom-edge-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-bottom-edge-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-bottom-edge-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -9,11 +9,6 @@
</span><span class="cx"> outline: 2px solid green;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.rounded-rectangle {
- width: 100px;
- height: 100px;
-}
-
</del><span class="cx"> .details {
</span><span class="cx"> padding-top: 15px;
</span><span class="cx"> font-style: italic;
</span><span class="lines">@@ -26,35 +21,23 @@
</span><span class="cx"> <div class="box">
</span><span class="cx"> <p style="padding-top: 55px; padding-left: 25px;">Content1</p>
</span><span class="cx"> </div>
</span><del>-<p class="details">There is a 400x50px shape-inside rectangle inside the green box.<br/>The Content1 text line's bottom equals to the shape-inside's rectangle bottom boundary, so it should fit in the shape-inside.</p>
</del><ins>+<p class="details">There is a 400x50px shape-inside polygon inside the green box.<br/>The Content1 text line's bottom equals to the shape-inside's polygon bottom boundary, so it should fit in the shape-inside.</p>
</ins><span class="cx"> <hr>
</span><span class="cx">
</span><span class="cx"> <div class="box">
</span><span class="cx"> <p style="padding-top: 100px;">Content2</p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<p class="details">There is a 400x50px shape-inside rectangle inside the green box.<br/>The Content2 text line overlaps with the shape-inside's rectangle bottom boundary, so the Content2 should be pushed below the content box.</p>
</del><ins>+<p class="details">There is a 400x50px shape-inside polygon inside the green box.<br/>The Content2 text line overlaps with the shape-inside's polygon bottom boundary, so the Content2 should be pushed below the content box.</p>
</ins><span class="cx"> <hr>
</span><span class="cx">
</span><span class="cx"> <div class="box">
</span><span class="cx"> <p style="padding-top: 100px;">Content3</p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<p class="details">There is a 400x50px shape-inside rectangle inside the green box.<br/>The Content3 text line starts after the shape-inside's rectangle bottom boundary, so the Content3 should be pushed below the content box.</p>
</del><ins>+<p class="details">There is a 400x50px shape-inside polygon inside the green box.<br/>The Content3 text line starts after the shape-inside's polygon bottom boundary, so the Content3 should be pushed below the content box.</p>
</ins><span class="cx"> <hr>
</span><span class="cx">
</span><del>-<div class="box rounded-rectangle">
- <p style="padding-top: 100px;">Content4</p>
-</div>
-<p class="details">There is a 100x100px shape-inside rounded rectangle inside the green box.<br/>The shape top and bottom boundaries match with the content box boundaries, the overflow should start on the left, below the green content box.</p>
-<hr>
-
-<div class="box rounded-rectangle">
- <p style="padding-top: 100px;">Content5</p>
-</div>
-<p class="details">There is a 75x75px shape-inside rounded rectangle inside the green 100x100px box.<br/>The forth line should overflow, the overflow should start on the left, below the green content box.</p>
-<hr>
-
</del><span class="cx"> <p>Based on a recent change on the <a href="http://dev.w3.org/csswg/css-exclusions/#shape-inside-property">exclusions specification</a>. The 'shape-inside' property adds an exclusion area to the element's wrapping context.
</span><span class="cx"> This modifies the normal rectangular shape of the content area to a possibly non-rectangular wrapping area. The exclusion area added is defined by subtracting the shape from the element's content area.</p>
</span><span class="cx"> <p>Bug <a href="http://webkit.org/b/114526 ">114526</a>: [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidebottomedgehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-bottom-edge.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-bottom-edge.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-bottom-edge.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -9,22 +9,10 @@
</span><span class="cx"> outline: 2px solid green;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.rectangle {
- -webkit-shape-inside: rectangle(25px, 25px, 400px, 50px);
</del><ins>+.polygon {
+ -webkit-shape-inside: polygon(25px 25px, 425px 25px, 425px 75px, 25px 75px);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.rounded-rectangle {
- width: 100px;
- height: 100px;
- -webkit-shape-inside: rectangle(0, 0, 100%, 100%, 25%, 25%);
-}
-
-.smaller-rounded-rectangle {
- width: 100px;
- height: 100px;
- -webkit-shape-inside: rectangle(0, 0, 75%, 75%, 25%, 25%);
-}
-
</del><span class="cx"> .details {
</span><span class="cx"> padding-top: 15px;
</span><span class="cx"> font-style: italic;
</span><span class="lines">@@ -33,36 +21,24 @@
</span><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body>
</span><del>- <div class="box rectangle">
</del><ins>+ <div class="box polygon">
</ins><span class="cx"> <p style="padding-top: 55px;">Content1</p>
</span><span class="cx"> </div>
</span><del>-<p class="details">There is a 400x50px shape-inside rectangle inside the green box.<br/>The Content1 text line's bottom equals to the shape-inside's rectangle bottom boundary, so it should fit in the shape-inside.</p>
</del><ins>+<p class="details">There is a 400x50px shape-inside polygon inside the green box.<br/>The Content1 text line's bottom equals to the shape-inside's polygon bottom boundary, so it should fit in the shape-inside.</p>
</ins><span class="cx"> <hr>
</span><span class="cx">
</span><del>-<div class="box rectangle">
</del><ins>+<div class="box polygon">
</ins><span class="cx"> <p style="padding-top: 60px;">Content2</p>
</span><span class="cx"> </div>
</span><del>-<p class="details">There is a 400x50px shape-inside rectangle inside the green box.<br/>The Content2 text line overlaps with the shape-inside's rectangle bottom boundary, so the Content2 should be pushed below the content box.</p>
</del><ins>+<p class="details">There is a 400x50px shape-inside polygon inside the green box.<br/>The Content2 text line overlaps with the shape-inside's polygon bottom boundary, so the Content2 should be pushed below the content box.</p>
</ins><span class="cx"> <hr>
</span><span class="cx">
</span><del>-<div class="box rectangle">
</del><ins>+<div class="box polygon">
</ins><span class="cx"> <p style="padding-top: 76px;">Content3</p>
</span><span class="cx"> </div>
</span><del>-<p class="details">There is a 400x50px shape-inside rectangle inside the green box.<br/>The Content3 text line starts after the shape-inside's rectangle bottom boundary, so the Content3 should be pushed below the content box.</p>
</del><ins>+<p class="details">There is a 400x50px shape-inside polygon inside the green box.<br/>The Content3 text line starts after the shape-inside's polygon bottom boundary, so the Content3 should be pushed below the content box.</p>
</ins><span class="cx"> <hr>
</span><span class="cx">
</span><del>-<div class="box rounded-rectangle">
- <p style="padding-top: 90px;">Content4</p>
-</div>
-<p class="details">There is a 100x100px shape-inside rounded rectangle inside the green box.<br/>The shape top and bottom boundaries match with the content box boundaries, the overflow should start on the left, below the green content box.</p>
-<hr>
-
-<div class="box smaller-rounded-rectangle">
- <p style="padding-top: 60px;">Content5</p>
-</div>
-<p class="details">There is a 75x75px shape-inside rounded rectangle inside the green 100x100px box.<br/>The forth line should overflow, the overflow should start on the left, below the green content box.</p>
-<hr>
-
</del><span class="cx"> <p>Based on a recent change on the <a href="http://dev.w3.org/csswg/css-exclusions/#shape-inside-property">exclusions specification</a>. The 'shape-inside' property adds an exclusion area to the element's wrapping context.
</span><span class="cx"> This modifies the normal rectangular shape of the content area to a possibly non-rectangular wrapping area. The exclusion area added is defined by subtracting the shape from the element's content area.</p>
</span><span class="cx"> <p>Bug <a href="http://webkit.org/b/114526 ">114526</a>: [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideboxsizinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -26,16 +26,16 @@
</span><span class="cx"> height: 130px;
</span><span class="cx"> }
</span><span class="cx"> .shape-inside {
</span><del>- -webkit-shape-inside: rectangle(5px, 10px, 30px, 40px);
</del><ins>+ -webkit-shape-inside: polygon(5px 10px, 35px 10px, 35px 50px, 5px 50px);
</ins><span class="cx"> font-family: Ahem, sans-serif;
</span><span class="cx"> font-size: 10px;
</span><span class="cx"> color: green;
</span><span class="cx"> }
</span><span class="cx"> .border-box.shape-inside {
</span><del>- -webkit-shape-inside: rectangle(10px, 20px, 30px, 40px) border-box;
</del><ins>+ -webkit-shape-inside: polygon(10px 20px, 40px 20px, 40px 60px, 10px 60px) border-box;
</ins><span class="cx"> }
</span><span class="cx"> .border-box.border.padding.shape-inside {
</span><del>- -webkit-shape-inside: rectangle(15px, 30px, 30px, 40px) border-box;
</del><ins>+ -webkit-shape-inside: polygon(15px 30px, 45px 30px, 45px 70px, 15px 70px) border-box;
</ins><span class="cx"> }
</span><span class="cx"> .vertical-lr {
</span><span class="cx"> -webkit-writing-mode: vertical-lr;
</span><span class="lines">@@ -91,4 +91,4 @@
</span><span class="cx"> xxxx xxxx xxxx
</span><span class="cx"> </div>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidedynamicnestedexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-nested-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-nested-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-nested-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -24,10 +24,10 @@
</span><span class="cx"> content: ' ';
</span><span class="cx"> }
</span><span class="cx"> .inside {
</span><del>- -webkit-shape-inside: rectangle(10px, 10px, 180px, 180px);
</del><ins>+ -webkit-shape-inside: polygon(10px 10px, 190px 10px, 190px 190px, 10px 190px);
</ins><span class="cx"> }
</span><span class="cx"> .outside {
</span><del>- -webkit-shape-outside: rectangle(10px, 10px, 180px, 180px);
</del><ins>+ -webkit-shape-outside: polygon(10px 10px, 190px 10px, 190px 190px, 10px 190px);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="lines">@@ -55,4 +55,4 @@
</span><span class="cx"> <p>Removing shape-outside with a prior entry</p>
</span><span class="cx"> <div id='remove-outside-shape' class='container'><div><div>xxxxxxxxxx</div></div></div>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidedynamicnestedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-nested.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-nested.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-nested.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -52,13 +52,13 @@
</span><span class="cx"> content: ' ';
</span><span class="cx"> }
</span><span class="cx"> .inside {
</span><del>- -webkit-shape-inside: rectangle(10px, 10px, 180px, 180px);
</del><ins>+ -webkit-shape-inside: polygon(10px 10px, 190px 10px, 190px 190px, 10px 190px);
</ins><span class="cx"> }
</span><span class="cx"> .inside-alt {
</span><span class="cx"> -webkit-shape-inside: circle(50% at 50% 50%);
</span><span class="cx"> }
</span><span class="cx"> .outside {
</span><del>- -webkit-shape-outside: rectangle(10px, 10px, 180px, 180px);
</del><ins>+ -webkit-shape-inside: polygon(10px 10px, 190px 10px, 190px 190px, 10px 190px);
</ins><span class="cx"> }
</span><span class="cx"> .outside-alt {
</span><span class="cx"> -webkit-shape-inside: circle(50% at 50% 50%);
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidedynamicshapehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-shape.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-shape.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-shape.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <script>
</span><span class="cx"> window.onload = function() {
</span><span class="cx"> var elem = document.getElementById("shape-inside");
</span><del>- elem.setAttribute("style", "-webkit-shape-inside: rectangle(10px, 10px, 180px, 180px);");
</del><ins>+ elem.setAttribute("style", "-webkit-shape-inside: polygon(10px 10px, 190px 10px, 190px 190px, 10px 190px);");
</ins><span class="cx"> };
</span><span class="cx"> </script>
</span><span class="cx"> <style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidedynamictexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-text.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-text.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-dynamic-text.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> #shape-inside {
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 200px;
</span><del>- -webkit-shape-inside: rectangle(10px, 10px, 180px, 180px);
</del><ins>+ -webkit-shape-inside: polygon(10px 10px, 190px 10px, 190px 190px, 10px 190px);
</ins><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx"> #border {
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideemptyexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -15,12 +15,6 @@
</span><span class="cx"> <body>
</span><span class="cx"> <div id="rectangles">
</span><span class="cx"> <div style="margin-top: 0px;">
</span><del>- <p>This text should be pushed down below the green rectangle. (There is a rectangle(0px, 0px, 0px, 1em) shape-inside CSS property on the green rectangle.)</p>
- </div>
- <div>
- <p>This text should be pushed down below the green rectangle. (There is a rectangle(0px, 0px, 1em, 0px) shape-inside CSS property on the green rectangle.)</p>
- </div>
- <div>
</del><span class="cx"> <p>This text should be pushed down below the green rectangle. (There is a circle(0px at 0px 0px) shape-inside CSS property on the green rectangle.)</p>
</span><span class="cx"> </div>
</span><span class="cx"> <div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideemptyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -10,14 +10,6 @@
</span><span class="cx"> background-color: green;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #shape-inside-rectangle-width0 {
- -webkit-shape-inside: rectangle(0px, 0px, 0px, 1em);
- }
-
- #shape-inside-rectangle-height0 {
- -webkit-shape-inside: rectangle(0px, 0px, 1em, 0px);
- }
-
</del><span class="cx"> #shape-inside-circle-radius0 {
</span><span class="cx"> -webkit-shape-inside: circle(0px at 0px 0px);
</span><span class="cx"> }
</span><span class="lines">@@ -41,13 +33,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <div id="rectangles">
</span><del>- <p id="shape-inside-rectangle-width0" style="margin-top: 0px;">
- This text should be pushed down below the green rectangle. (There is a rectangle(0px, 0px, 0px, 1em) shape-inside CSS property on the green rectangle.)
- </p>
- <p id="shape-inside-rectangle-height0">
- This text should be pushed down below the green rectangle. (There is a rectangle(0px, 0px, 1em, 0px) shape-inside CSS property on the green rectangle.)
- </p>
- <p id="shape-inside-circle-radius0">
</del><ins>+ <p id="shape-inside-circle-radius0" style="margin-top: 0px;">
</ins><span class="cx"> This text should be pushed down below the green rectangle. (There is a circle(0px at 0px 0px) shape-inside CSS property on the green rectangle.)
</span><span class="cx"> </p>
</span><span class="cx"> <p id="shape-inside-ellipse-radiusX0">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideinlineelementsexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-inline-elements-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-inline-elements-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-inline-elements-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- div {
- width: 200px;
- height: 200px;
- }
- #shape-inside {
- font-size: 0;
- padding: 100px;
- position: relative;
- }
- #border {
- position: absolute;
- left: 98px;
- top: 98px;
- border: 2px solid blue;
- }
- .inline {
- width: 100px;
- height: 100px;
- display: inline-block;
- background-color: green;
- }
-</style>
-</head>
-<body>
- Should display a green square with a blue outline.
- <div id="shape-inside">
- <div id="border"></div>
- <div class="inline"></div><div class="inline"></div><div class="inline"></div><div class="inline"></div>
- </div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideinlineelementshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-inline-elements.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-inline-elements.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-inline-elements.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- #shape-inside {
- font-size: 0;
- width: 300px;
- height: 300px;
- -webkit-shape-inside: rectangle(100px, 100px, 200px, 200px);
- position: relative;
- }
- #border {
- position: absolute;
- width: 200px;
- height: 200px;
- left: 98px;
- top: 98px;
- border: 2px solid blue;
- }
- .inline {
- width: 100px;
- height: 100px;
- display: inline-block;
- background-color: green;
- }
-</style>
-</head>
-<body>
- Should display a green square with a blue outline.
- <div id="shape-inside">
- <div id="border"></div>
- <div class="inline"></div><div class="inline"></div><div class="inline"></div><div class="inline"></div>
- </div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidemultipleblocksverticalhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> .shape-inside {
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span><del>- -webkit-shape-inside: rectangle(10px, 15px, 170px, 280px);
</del><ins>+ -webkit-shape-inside: polygon(10px 15px, 180px 15px, 180px 295px, 10px 295px);
</ins><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx"> .rl { -webkit-writing-mode: vertical-rl; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidemultipleblockshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> #shape-inside {
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span><del>- -webkit-shape-inside: rectangle(10px, 15px, 170px, 280px);
</del><ins>+ -webkit-shape-inside: polygon(10px 15px, 180px 15px, 180px 295px, 10px 295px);
</ins><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx"> #border {
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideonnestedcontainerwithunresolvedheighthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx"> .container {
</span><span class="cx"> background-color: green;
</span><del>- -webkit-shape-inside: rectangle(0, 0, 50%, 100%);
</del><ins>+ -webkit-shape-inside: polygon(0 0, 50% 0, 50% 100%, 0 100%);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideoutsideshapehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> drawTextRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px');
</span><span class="cx"> var inlineStyle = document.getElementById('shape-inside2').style;
</span><span class="cx"> inlineStyle.setProperty('-webkit-shape-inside', 'outside-shape');
</span><del>- inlineStyle.setProperty('-webkit-shape-outside', 'rectangle(50px, 50px, 100px, 100px)');
</del><ins>+ inlineStyle.setProperty('-webkit-shape-outside', 'polygon(50px 50px, 150px 50px, 150px 150px, 50px 150px)');
</ins><span class="cx"> };
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideoverflowfixeddimensionsblockcontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> #shape-inside {
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 200px;
</span><del>- -webkit-shape-inside: rectangle(50px, 0px, 100px, 60px);
</del><ins>+ -webkit-shape-inside: polygon(50px 0px, 150px 0px, 150px 60px, 50px 60px);
</ins><span class="cx"> }
</span><span class="cx"> #border {
</span><span class="cx"> position: absolute;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideoverflowfixeddimensionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> border-bottom: 30px solid yellow;
</span><span class="cx"> padding-top: 15px;
</span><span class="cx"> padding-bottom: 10px;
</span><del>- -webkit-shape-inside: rectangle(50px, 0px, 100px, 50px);
</del><ins>+ -webkit-shape-inside: polygon(50px 0px, 150px 0px, 150px 50px, 50px 50px);
</ins><span class="cx"> }
</span><span class="cx"> #border {
</span><span class="cx"> position: absolute;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideoverflowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> height: 200px;
</span><span class="cx"> border: 2px solid blue;
</span><span class="cx"> }
</span><del>- #shape-inside { -webkit-shape-inside: rectangle(50px, 0px, 100px, 50px); }
</del><ins>+ #shape-inside { -webkit-shape-inside: polygon(50px 0px, 150px 0px, 150px 50px, 50px 50px); }
</ins><span class="cx"> #border {
</span><span class="cx"> position: absolute;
</span><span class="cx"> left: 49px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidepercentageautohtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-percentage-auto.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-percentage-auto.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-percentage-auto.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> #shape-inside {
</span><del>- -webkit-shape-inside: rectangle(10%, 100%, 80%, 200px);
</del><ins>+ -webkit-shape-inside: polygon(10% 100%, 90% 100%, 90% 200px, 10% 200px);
</ins><span class="cx"> position: relative;
</span><span class="cx"> max-height: 200px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidepercentagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-percentage.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-percentage.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-percentage.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> margin-bottom: 60px;
</span><span class="cx"> }
</span><span class="cx"> #shape-inside {
</span><del>- -webkit-shape-inside: rectangle(25%, 0, 50%, 25%);
</del><ins>+ -webkit-shape-inside: polygon(25% 0, 75% 0, 75% 25%, 25% 25%);
</ins><span class="cx"> height: 100%;
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsiderectanglepaddingexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rectangle-padding-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rectangle-padding-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rectangle-padding-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- #shape-inside {
- position: relative;
- }
-
- #shape-outline {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 400px;
- height: 400px;
- }
-
- #shape-content {
- position: absolute;
- top: 60px;
- left: 60px;
- width: 150px;
- height: 150px;
- font: 50px/1 Ahem, sans-serif;
- color: green;
- }
-</style>
-</head>
-<body>
- <p>You should see a filled green square within a black outline.</p>
- <div id="shape-inside">
- <svg id="shape-outline" xmlns="http://www.w3.org/2000/svg">
- <rect x="58" y="58" width="154" height="154" stroke="black" fill="none"/>
- </svg>
- <div id="shape-content">XXX<br/>XXX<br/>XXX</div>
- </div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsiderectanglepaddinghtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rectangle-padding.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rectangle-padding.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rectangle-padding.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- #shape-inside {
- position: relative;
- width: 400px;
- height: 400px;
- -webkit-shape-inside: rectangle(10px, 10px, 250px, 250px);
- -webkit-shape-padding: 50px;
- font: 50px/1 Ahem, sans-serif;
- color: green;
- }
-
- #shape-outline {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 400px;
- height: 400px;
- }
-</style>
-</head>
-<body>
- <p>You should see a filled green square within a black outline.</p>
- <div id="shape-inside">
- <svg id="shape-outline" xmlns="http://www.w3.org/2000/svg">
- <rect x="58" y="58" width="154" height="154" stroke="black" fill="none"/>
- </svg>
- XXX XXX XXX
- </div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle001expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-001-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-001-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-001-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- #shape-inside {
- font: 100px/1 Ahem, sans-serif;
- white-space: pre;
- color: green;
- width: 300px;
- height: 300px;
- }
-</style>
-</head>
-<body>
- Requires Ahem font. Tests that inline content avoids the border radius of a rounded rectangle.
- Should display five green boxes in the shape of a plus.
- <div id="shape-inside"> X <br/>XXX<br/> X </div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle001html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-001.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-001.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-001.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- #shape-inside {
- font: 100px/1 Ahem, sans-serif;
- color: green;
- word-wrap: break-word;
- width: 300px;
- height: 300px;
- -webkit-shape-inside: rectangle(0, 0, 300px, 300px, 100px, 100px);
- }
-</style>
-</head>
-<body>
- Requires Ahem font. Tests that inline content avoids the border radius of a rounded rectangle.
- Should display five green boxes in the shape of a plus.
- <div id="shape-inside">XXXXX</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle002expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-002-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-002-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-002-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/subpixel-utils.js"></script>
-<script src="../resources/rounded-rectangle.js"></script>
-<script>
- function createSimulatedShapeElement() {
- var stylesheet = document.getElementById("stylesheet");
- var dimensions = { width: 200, height: 300,
- shapeX: 25, shapeY: 45,
- shapeWidth: 100, shapeHeight: 200,
- shapeRadiusX: 0, shapeRadiusY: 55 };
- generateSimulatedShapeElement("shape-inside1", stylesheet.sheet, dimensions, 9);
- dimensions.shapeRadiusX = 55;
- dimensions.shapeRadiusY = 0;
- generateSimulatedShapeElement("shape-inside2", stylesheet.sheet, dimensions, 9);
- }
-</script>
-<style id="stylesheet">
- body { margin: 0; }
-</style>
-</head>
-<body onload="createSimulatedShapeElement()">
-<div id="shape-inside1" style="display:inline-block"></div>
-<div id="shape-inside2" style="display:inline-block"></div>
-<div>
- This test requires the Ahem font. It creates two rectangular shape-insides with one of
- corner radius X or corner radius Y equal to zero. The content should fill and slightly
- overflow these two rectangular areas with alternating black and white boxes.
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle002html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-002.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-002.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-002.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/rounded-rectangle.js"></script>
-<script>
- function createShapeElement() {
- var stylesheet = document.getElementById("stylesheet");
- var dimensions = { width: 200, height: 300,
- shapeX: 25, shapeY: 45,
- shapeWidth: 100, shapeHeight: 200,
- shapeRadiusX: 55, shapeRadiusY: 0 };
- generateShapeElement("shape-inside1", stylesheet.sheet, dimensions, 9);
- dimensions.shapeRadiusX = 55;
- dimensions.shapeRadiusY = 0;
- generateShapeElement("shape-inside2", stylesheet.sheet, dimensions, 9);
- }
-</script>
-<style id="stylesheet">
- body { margin: 0; }
-</style>
-</head>
-<body onload="createShapeElement()">
-<div id="shape-inside1" style="display:inline-block"></div>
-<div id="shape-inside2" style="display:inline-block"></div>
-<div>
- This test requires the Ahem font. It creates two rectangular shape-insides with one of
- corner radius X or corner radius Y equal to zero. The content should fill and slightly
- overflow these two rectangular areas with alternating black and white boxes.
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle003expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-003-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-003-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-003-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/subpixel-utils.js"></script>
-<script src="../resources/rounded-rectangle.js"></script>
-<script>
- function createSimulatedShapeElement() {
- var stylesheet = document.getElementById("stylesheet");
- var dimensions = { width: 400, height: 600,
- shapeX: 45, shapeY: 25,
- shapeWidth: 300, shapeHeight: 500,
- shapeRadiusX: 75, shapeRadiusY: 55 };
- generateSimulatedShapeElement("shape-inside", stylesheet.sheet, dimensions, 22);
- }
-</script>
-<style id="stylesheet">
- body { margin: 0; }
-</style>
-</head>
-<body onload="createSimulatedShapeElement()">
-<div id="shape-inside"></div>
-<div>
- This test requires the Ahem font. It creates a rounded rectangle shape-inside and fills it
- with alternating black and white squares as inline content. The entire shape-inside should
- be filled, with a small amount of overflow.
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle003html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-003.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-003.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-003.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/rounded-rectangle.js"></script>
-<script>
- function createShapeElement() {
- var stylesheet = document.getElementById("stylesheet");
- var dimensions = { width: 400, height: 600,
- shapeX: 45, shapeY: 25,
- shapeWidth: 300, shapeHeight: 500,
- shapeRadiusX: 75, shapeRadiusY: 55 };
- generateShapeElement("shape-inside", stylesheet.sheet, dimensions, 22);
- }
-</script>
-<style id="stylesheet">
- body { margin: 0; }
-</style>
-</head>
-<body onload="createShapeElement()">
-<div id="shape-inside"></div>
-<div>
- This test requires the Ahem font. It creates a rounded rectangle shape-inside and fills it
- with alternating black and white squares as inline content. The entire shape-inside should
- be filled, with a small amount of overflow.
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle004expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-004-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-004-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-004-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/subpixel-utils.js"></script>
-<script src="../resources/rounded-rectangle.js"></script>
-<script>
- function createSimulatedShapeElement() {
- var stylesheet = document.getElementById("stylesheet");
- var dimensions = { width: 700, height: 500,
- shapeX: 25, shapeY: 45,
- shapeWidth: 600, shapeHeight: 300,
- shapeRadiusX: 100, shapeRadiusY: 150 };
- generateSimulatedShapeElement("shape-inside", stylesheet.sheet, dimensions, 90);
- }
-</script>
-<style id="stylesheet">
- body { margin: 0; }
-</style>
-</head>
-<body onload="createSimulatedShapeElement()">
-<div id="shape-inside"></div>
-<div>
- This test requires the Ahem font. It creates a rounded rectangle shape-inside and fills it
- with alternating black and white squares as inline content. The middle line overlaps the top
- and bottom rounded corner area. The entire shape-inside should be filled, without any overflow.
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectangle004html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-004.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-004.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-004.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/rounded-rectangle.js"></script>
-<script>
- function createShapeElement() {
- var stylesheet = document.getElementById("stylesheet");
- var dimensions = { width: 700, height: 500,
- shapeX: 25, shapeY: 45,
- shapeWidth: 600, shapeHeight: 300,
- shapeRadiusX: 100, shapeRadiusY: 150 };
- generateShapeElement("shape-inside", stylesheet.sheet, dimensions, 90);
- }
-</script>
-<style id="stylesheet">
- body { margin: 0; }
-</style>
-</head>
-<body onload="createShapeElement()">
-<div id="shape-inside"></div>
-<div>
- This test requires the Ahem font. It creates a rounded rectangle shape-inside and fills it
- with alternating black and white squares as inline content. The middle line overlaps the top
- and bottom rounded corner area. The entire shape-inside should be filled, without any overflow.
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit001expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.shape-container {
- position: relative;
- width: 400px;
- height: 20px;
- margin: 10px;
-}
-
-.shape-background {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 400px;
- height: 200px;
- border-radius: 200px / 50px;
- background-color: rgb(200,200,200);
-}
-
-.shape-inside {
- position: absolute;
- top: 50px;
- left: 0px;
- width: 400px;
- height: 200px;
- font: 50px/1 Ahem, sans-serif;
- color: green;
-}
-</style>
-</head>
-<body>
-<p>The green rectangle should appear just below the grey rounded rectangle's upper corners.</p>
-<div class="shape-container">
- <div class="shape-background"></div>
- <div class="shape-inside">XXXXXXXX</div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit001html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-001.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.shape-container {
- position: relative;
- width: 400px;
- height: 20px;
- margin: 10px;
-}
-
-.shape-background {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 400px;
- height: 200px;
- border-radius: 200px / 50px;
- background-color: rgb(200,200,200);
-}
-
-.shape-inside {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 400px;
- height: 200px;
- -webkit-shape-inside: rectangle(0px, 0px, 400px, 200px, 200px, 50px);
- font: 50px/1 Ahem, sans-serif;
- color: green;
-}
-</style>
-</head>
-<body>
-<p>The green rectangle should appear just below the grey rounded rectangle's upper corners.</p>
-<div class="shape-container">
- <div class="shape-background"></div>
- <div class="shape-inside">XXXXXXXX</div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit002expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/subpixel-utils.js"></script>
-<!--
-In this test the shape-inside shape is a rounded rectangle configured as a circle with radius of 100px.
-The shape-inside element contains a single square Ahem font character that just fits wthin the circle.
-That means that the character's size is sqrt(2)*100px, which is 141.41356px.
-
-The x and y coordinates of the points at which the square intersects the circle are half of the
-difference between circle's diameter and the size of the square: (200px - sqrt(2)*100px) / 2 = 29.2893219px.
--->
-<style>
-#shape-container {
- position: relative;
- display: inline-block;
- width: 200px;
- height: 200px;
- margin: 10px;
-}
-
-#shape-background {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 200px;
- height: 200px;
- border-radius: 100px / 100px;
- background-color: rgb(200,200,200);
-}
-
-#shape-inside {
- position: absolute;
- top: 29.2893219px;
- left: 29.2893219px;
- width: 200px;
- height: 200px;
- font: 141.421356px/1 Ahem, sans-serif;
- color: green;
-}
-</style>
-</head>
-<body onload="init()">
-<script>
- function init() {
- if (!SubPixelLayout.isEnabled())
- document.getElementById("shape-inside").style.top = "30px";
- }
-</script>
-<p>The green rectangle should appear within the grey circle.</p>
-<div id="shape-container">
- <div id="shape-background"></div>
- <div id="shape-inside">X</div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit002html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-002.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<!--
-In this test the shape-inside shape is a rounded rectangle configured as a circle with radius of 100px.
-The shape-inside element contains a single square Ahem font character that just fits wthin the circle.
-That means that the character's size is sqrt(2)*100px, which is 141.41356px.
--->
-<style>
-#shape-container {
- position: relative;
- display: inline-block;
- width: 200px;
- height: 200px;
- margin: 10px;
-}
-
-#shape-background {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 200px;
- height: 200px;
- border-radius: 100px / 100px;
- background-color: rgb(200,200,200);
-}
-
-#shape-inside {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 200px;
- height: 200px;
- -webkit-shape-inside: rectangle(0px, 0px, 200px, 200px, 100px, 100px);
- font: 141.421356px/1 Ahem, sans-serif;
- color: green;
-}
-</style>
-</head>
-<body>
-<p>The green rectangle should appear within the grey circle.</p>
-<div id="shape-container">
- <div id="shape-background"></div>
- <div id="shape-inside">X</div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit003expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.shape-container {
- position: relative;
- width: 400px;
- height: 200px;
- margin: 10px;
-}
-
-.shape-background {
- position: absolute;
- left: 0px;
- top: 0px;
- width: 400px;
- height: 200px;
- border-radius: 50px / 50px;
- background-color: rgb(200,200,200);
-}
-
-.shape-inside-vertical-rl {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 400px;
- height: 200px;
- -webkit-writing-mode: vertical-rl;
- font: 50px/1 Ahem, sans-serif;
- color: green;
-}
-
-.shape-inside-vertical-lr {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 400px;
- height: 200px;
- -webkit-writing-mode: vertical-lr;
- font: 50px/1 Ahem, sans-serif;
- color: green;
-}
-</style>
-</head>
-<body>
-<p>The green rectangle should appear just to the left of the grey rounded rectangle's upper corners.</p>
-<div class="shape-container">
- <div class="shape-background"></div>
- <div class="shape-inside-vertical-rl"><br/>XXXX</div>
-</div>
-</p>
-
-<p>The green rectangle should appear just to the left of the grey rounded rectangle's upper corners.</p>
-<div class="shape-container">
- <div class="shape-background"></div>
- <div class="shape-inside-vertical-lr"><br/>XXXX</div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglefit003html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-fit-003.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,61 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.shape-container {
- position: relative;
- width: 400px;
- height: 200px;
- margin: 10px;
-}
-
-.shape-background {
- position: absolute;
- left: 0px;
- top: 0px;
- width: 400px;
- height: 200px;
- border-radius: 50px / 50px;
- background-color: rgb(200,200,200);
-}
-
-.shape-inside-vertical-rl {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 400px;
- height: 200px;
- -webkit-shape-inside: rectangle(0px, 0px, 400px, 200px, 50px, 50px);
- -webkit-writing-mode: vertical-rl;
- font: 50px/1 Ahem, sans-serif;
- color: green;
-}
-
-.shape-inside-vertical-lr {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 400px;
- height: 200px;
- -webkit-shape-inside: rectangle(0px, 0px, 400px, 200px, 50px, 50px);
- -webkit-writing-mode: vertical-lr;
- font: 50px/1 Ahem, sans-serif;
- color: green;
-}
-</style>
-</head>
-<body>
-<p>The green rectangle should appear just to the left of the grey rounded rectangle's upper corners.</p>
-<div class="shape-container">
- <div class="shape-background"></div>
- <div class="shape-inside-vertical-rl">XXXX</div>
-</div>
-</p>
-
-<p>The green rectangle should appear just to the left of the grey rounded rectangle's upper corners.</p>
-<div class="shape-container">
- <div class="shape-background"></div>
- <div class="shape-inside-vertical-lr">XXXX</div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglelargeradiusexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- /* The size of a square that just fits within a circle of radius r is r * sqrt(2). In this
- case that's the size of one Ahem character: 20 * sqrt(2) == 28.28.
- */
- .shape-inside {
- width: 40px;
- height: 40px;
- font: 28.28px/1 Ahem, sans-serif;
- color: green;
- border: 1px solid blue;
- border-radius: 20px;
- -webkit-shape-inside: rectangle(0px, 0px, 40px, 40px, 20px, 20px);
- }
-</style>
-</head>
-<body>
- <h1>Bug <a href="https://bugs.webkit.org/show_bug.cgi?id=116745">116745</a>: [CSS Shapes] rectangle and inset-rectangle do not properly handle rx and ry</h1>
- <h2>Test that if rx > 50% width and ry > 50% height, they are properly clamped to 50% of the respective dimension when doing layout on the shape. All of the following tests should look identical, and the blue circle should wrap around the green square.</h2>
- <div class="shape-inside fixed-units">
- X
- </div>
- <div class="shape-inside different-units">
- X
- </div>
- <div class="shape-inside relative-units">
- X
- </div>
- <div class="shape-inside edge-case">
- X
- </div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglelargeradiushtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-large-radius.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- /* The size of a square that just fits within a circle of radius r is r * sqrt(2). In this
- case that's the size of one Ahem character: 20 * sqrt(2) == 28.28.
- */
- .shape-inside {
- width: 40px;
- height: 40px;
- font: 28.28px/1 Ahem, sans-serif;
- color: green;
- border: 1px solid blue;
- border-radius: 20px;
- }
- .fixed-units {
- -webkit-shape-inside: rectangle(0px, 0px, 40px, 40px, 40px, 40px);
- }
- .different-units {
- -webkit-shape-inside: rectangle(0px, 0px, 40px, 40px, 100%, 100%);
- }
- .relative-units {
- -webkit-shape-inside: rectangle(0px, 0px, 100%, 100%, 700em, 700em);
- }
- .edge-case {
- -webkit-shape-inside: rectangle(0px, 0px, 100%, 100%, 50%, 50%);
- }
-</style>
-</head>
-<body>
- <h1>Bug <a href="https://bugs.webkit.org/show_bug.cgi?id=116745">116745</a>: [CSS Shapes] rectangle and inset-rectangle do not properly handle rx and ry</h1>
- <h2>Test that if rx > 50% width and ry > 50% height, they are properly clamped to 50% of the respective dimension when doing layout on the shape. All of the following tests should look identical, and the blue circle should wrap around the green square.</h2>
- <div class="shape-inside fixed-units">
- X
- </div>
- <div class="shape-inside different-units">
- X
- </div>
- <div class="shape-inside relative-units">
- X
- </div>
- <div class="shape-inside edge-case">
- X
- </div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglepaddingexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding-expected.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding-expected.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- #shape-inside {
- position: relative;
- }
-
- #shape-outline {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 500px;
- height: 500px;
- }
-
- #shape-content {
- position: absolute;
- top: 50px;
- left: 50px;
- width: 300px;
- height: 300px;
- font: 100px/1 Ahem, sans-serif;
- color: green;
- }
-</style>
-</head>
-<body>
- <p>The blue rounded rectangle should just contain a cross of five green squares.</p>
- <div id="shape-inside">
- <div id="shape-content">&nbsp;X<br/>XXX<br/>&nbsp;X</div>
- <svg id="shape-outline" xmlns="http://www.w3.org/2000/svg">
- <rect x="50" y="50" width="300" height="300" rx="100" ry="100" stroke="blue" fill="none"/>
- </svg>
- </div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideroundedrectanglepaddinghtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-rounded-rectangle-padding.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
- #shape-inside {
- position: relative;
- width: 500px;
- height: 500px;
- -webkit-shape-inside: rectangle(0px, 0px, 400px, 400px, 150px, 150px);
- -webkit-shape-padding: 50px;
- font: 100px/1 Ahem, sans-serif;
- color: green;
- }
-
- #shape-outline {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 500px;
- height: 500px;
- }
-</style>
-</head>
-<body>
- <p>The blue rounded rectangle should just contain a cross of five green squares.</p>
- <div id="shape-inside">
- <svg id="shape-outline" xmlns="http://www.w3.org/2000/svg">
- <rect x="50" y="50" width="300" height="300" rx="100" ry="100" stroke="blue" fill="none"/>
- </svg>
- X XXX X
- </div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidesubpixelrectangletophtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> #shape-inside {
</span><del>- -webkit-shape-inside: rectangle(0px, 1.3px, 200px, 200px);
</del><ins>+ -webkit-shape-inside: polygon(0px 1.3px, 200px 1.3px, 200px 201.3px, 0px 201.3px);
</ins><span class="cx"> font: 100px/1 Ahem, sans-serif;
</span><span class="cx"> -webkit-font-smoothing: antialiased;
</span><span class="cx"> color: green;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidetexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-text.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-text.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-text.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> #shape-inside {
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 200px;
</span><del>- -webkit-shape-inside: rectangle(10px, 10px, 180px, 180px);
</del><ins>+ -webkit-shape-inside: polygon(10px 10px, 190px 10px, 190px 190px, 10px 190px);
</ins><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx"> #border {
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideverticaltexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-vertical-text.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-vertical-text.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-vertical-text.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5,14 +5,14 @@
</span><span class="cx"> #shape-inside-vertical-lr {
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 220px;
</span><del>- -webkit-shape-inside: rectangle(15px, 20px, 150px, 175px);
</del><ins>+ -webkit-shape-inside: polygon(15px 20px, 165px 20px, 165px 195px, 15px 195px);
</ins><span class="cx"> -webkit-writing-mode: vertical-lr;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx"> #shape-inside-vertical-rl {
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 220px;
</span><del>- -webkit-shape-inside: rectangle(15px, 20px, 150px, 175px);
</del><ins>+ -webkit-shape-inside: polygon(15px 20px, 165px 20px, 165px 195px, 15px 195px);
</ins><span class="cx"> -webkit-writing-mode: vertical-rl;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideanimationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> Moving Text
</span><span class="cx"> Moving Text
</span><span class="cx"> Moving Text
</span><del>-PASS - "webkitShapeOutside" property for "rectangle-box" element at 1s saw something close to: rectangle(10%, 10%, 80%, 80%, 0px, 0px)
</del><ins>+PASS - "webkitShapeOutside" property for "inset-box" element at 1s saw something close to: inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)
</ins><span class="cx"> PASS - "webkitShapeOutside" property for "circle-box" element at 1s saw something close to: circle(35% at 35% 35%)
</span><span class="cx"> PASS - "webkitShapeOutside" property for "ellipse-box" element at 1s saw something close to: ellipse(35% 30% at 35% 35%)
</span><span class="cx"> PASS - "webkitShapeOutside" property for "polygon-box" element at 1s saw something close to: polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideanimationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -14,8 +14,8 @@
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #rectangle-box {
- -webkit-animation: rectangle-anim 2s linear
</del><ins>+ #inset-box {
+ -webkit-animation: inset-anim 2s linear
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #circle-box {
</span><span class="lines">@@ -66,9 +66,9 @@
</span><span class="cx"> -webkit-animation: circle-to-bottomright-extended-using-keyword-2-anim 2s linear
</span><span class="cx"> }
</span><span class="cx">
</span><del>- @-webkit-keyframes rectangle-anim {
- from { -webkit-shape-outside: rectangle(0%, 0%, 100%, 100%); }
- to { -webkit-shape-outside: rectangle(20%, 20%, 60%, 60%); }
</del><ins>+ @-webkit-keyframes inset-anim {
+ from { -webkit-shape-outside: inset(0%); }
+ to { -webkit-shape-outside: inset(20%); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes circle-anim {
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> const expectedValues = [
</span><span class="cx"> // [animation-name, time, element-id, property, expected-value, tolerance]
</span><del>- ["rectangle-anim", 1, "rectangle-box", "webkitShapeOutside", "rectangle(10%, 10%, 80%, 80%, 0px, 0px)", 0.05],
</del><ins>+ ["inset-anim", 1, "inset-box", "webkitShapeOutside", "inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)", 0.05],
</ins><span class="cx"> ["circle-anim", 1, "circle-box", "webkitShapeOutside", "circle(35% at 35% 35%)", 0.05],
</span><span class="cx"> ["ellipse-anim", 1, "ellipse-box", "webkitShapeOutside", "ellipse(35% 30% at 35% 35%)", 0.05],
</span><span class="cx"> ["polygon-anim", 1, "polygon-box", "webkitShapeOutside", "polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> <body>
</span><span class="cx">
</span><span class="cx"> <div class='container'>
</span><del>- <div class="box" id="rectangle-box"></div>
</del><ins>+ <div class="box" id="inset-box"></div>
</ins><span class="cx"> Moving Text
</span><span class="cx"> </div>
</span><span class="cx"> <div class='container'>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidedynamicshapemarginhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-margin.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-margin.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-margin.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 0, 0);
</del><ins>+ -webkit-shape-outside: inset(0 100% 100% 0);
</ins><span class="cx"> }
</span><span class="cx"> .shape::before {
</span><span class="cx"> position: absolute;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidedynamicshapeoverhanghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-overhang.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-overhang.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape-overhang.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .rectangle50 {
</span><del>- -webkit-shape-outside: rectangle(0, 0, 50px, 50px);
</del><ins>+ -webkit-shape-outside: polygon(0px 0px, 50px 0px, 50px 50px, 0px 50px);
</ins><span class="cx"> }
</span><span class="cx"> .rectangle50::before {
</span><span class="cx"> width: 50px;
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .rectangle25 {
</span><del>- -webkit-shape-outside: rectangle(0, 0, 25px, 25px);
</del><ins>+ -webkit-shape-outside: polygon(0px 0px, 25px 0px, 25px 25px, 0px 25px);
</ins><span class="cx"> }
</span><span class="cx"> .rectangle25::before {
</span><span class="cx"> width: 25px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidedynamicshapehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-dynamic-shape.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .rectangle50 {
</span><del>- -webkit-shape-outside: rectangle(0, 0, 50px, 50px);
</del><ins>+ -webkit-shape-outside: polygon(0px 0px, 50px 0px, 50px 50px, 0px 50px);
</ins><span class="cx"> }
</span><span class="cx"> .rectangle50::before {
</span><span class="cx"> width: 50px;
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .rectangle25 {
</span><del>- -webkit-shape-outside: rectangle(0, 0, 25px, 25px);
</del><ins>+ -webkit-shape-outside: polygon(0px 0px, 25px 0px, 25px 25px, 0px 25px);
</ins><span class="cx"> }
</span><span class="cx"> .rectangle25::before {
</span><span class="cx"> width: 25px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsdifferentwritingmodeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> }
</span><span class="cx"> .float {
</span><span class="cx"> -webkit-writing-mode: vertical-lr;
</span><del>- -webkit-shape-outside: rectangle(-20px, 0px, 20px, 20px) content-box;
</del><ins>+ -webkit-shape-outside: polygon(-20px 0px, 0px 0px, 0px 20px, -20px 20px) content-box;
</ins><span class="cx"> height: 20px;
</span><span class="cx"> width: 40px;
</span><span class="cx"> margin: 0px 20px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsemarginbottomhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-bottom.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-bottom.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-bottom.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> position: relative;
</span><span class="cx"> overflow: visible;
</span><del>- -webkit-shape-outside: ellipse(225px, 125px, 200px, 100px);
</del><ins>+ -webkit-shape-outside: ellipse(200px 100px at 225px 125px);
</ins><span class="cx"> -webkit-shape-margin: 25px;
</span><span class="cx"> width: 450px;
</span><span class="cx"> height: 250px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsemarginlefthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> position: relative;
</span><span class="cx"> overflow: visible;
</span><del>- -webkit-shape-outside: ellipse(225px, 125px, 200px, 100px);
</del><ins>+ -webkit-shape-outside: ellipse(200px 100px at 225px 125px);
</ins><span class="cx"> -webkit-shape-margin: 25px;
</span><span class="cx"> width: 450px;
</span><span class="cx"> height: 250px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsemarginrighthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> position: relative;
</span><span class="cx"> overflow: visible;
</span><del>- -webkit-shape-outside: ellipse(225px, 125px, 200px, 100px);
</del><ins>+ -webkit-shape-outside: ellipse(200px 100px at 225px 125px);
</ins><span class="cx"> -webkit-shape-margin: 25px;
</span><span class="cx"> width: 450px;
</span><span class="cx"> height: 250px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsimginsetrectanglenegativewidthcrashexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash-expected.txt (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash-expected.txt 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash-expected.txt 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-This test should not crash in a debug build.
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsimginsetrectanglenegativewidthcrashhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-img-inset-rectangle-negative-width-crash.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-<style>
- img {
- width: 10px;
- height: 10px;
- float: right;
- -webkit-shape-outside: inset-rectangle(0, 125%, 0, 0);
- }
-</style>
-This test should not crash in a debug build.
-<img></img>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatslayoutafterinitiallayoutpasshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 100px;
</span><span class="cx"> background-color: green;
</span><del>- -webkit-shape-outside: rectangle(0px, 0px, 50%, 100%);
</del><ins>+ -webkit-shape-outside: inset(0% 50% 0% 0%);
</ins><span class="cx"> }
</span><span class="cx"> #content {
</span><span class="cx"> font: 25px/1 Ahem, sans-serif;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsnotalayerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> height: 10px;
</span><span class="cx"> width: 50px;
</span><span class="cx"> background-color: red;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 0, 100%);
</del><ins>+ -webkit-shape-outside: inset(0 100% 0 0);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsoutermosthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-outermost.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-outermost.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-outermost.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> height: 20px;
</span><span class="cx"> margin-bottom: 10px;
</span><span class="cx"> background-color: black;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 50%, 100%);
</del><ins>+ -webkit-shape-outside: inset(0 50% 0 0);
</ins><span class="cx"> }
</span><span class="cx"> .short {
</span><span class="cx"> float: left;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon000expectedhtmlfromrev165470trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon000expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000-expected.html (from rev 165470, trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000-expected.html) (0 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+<!DOCTYPE html>
+<title>shape-outside-floats-polygon-000-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<meta name="flags" content="ahem">
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+}
+.float-left {
+ height: 20px;
+ float: left;
+}
+.float-right {
+ height: 20px;
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div style="width: 200px" class="float-left"></div>
+ XXXXXXXXXX
+ <div style="width: 180px" class="float-left"></div>
+ XXXXXXXXXXX
+ <div style="width: 160px" class="float-left"></div>
+ XXXXXXXXXXXX
+ <div style="width: 140px" class="float-left"></div>
+ XXXXXXXXXXXXX
+ <div style="width: 120px" class="float-left"></div>
+ XXXXXXXXXXXXXX
+ <div style="width: 100px" class="float-left"></div>
+ XXXXXXXXXXXXXXX
+ <div style="width: 80px" class="float-left"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="width: 60px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="width: 40px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="width: 20px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="width: 20px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="width: 40px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="width: 60px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="width: 80px" class="float-right"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="width: 100px" class="float-right"></div>
+ XXXXXXXXXXXXXXX
+ <div style="width: 120px" class="float-right"></div>
+ XXXXXXXXXXXXXX
+ <div style="width: 140px" class="float-right"></div>
+ XXXXXXXXXXXXX
+ <div style="width: 160px" class="float-right"></div>
+ XXXXXXXXXXXX
+ <div style="width: 180px" class="float-right"></div>
+ XXXXXXXXXXX
+ <div style="width: 200px" class="float-right"></div>
+ XXXXXXXXXX
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon000expectedhtml"></a>
<div class="propset"><h4>Property changes: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000-expected.html</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon000htmlfromrev165470trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon000html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000.html (from rev 165470, trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html) (0 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<!DOCTYPE html>
+<title>CSS Test: polygon shape-outside on floats</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-polygon-000-ref.html">
+<meta name="flags" content="ahem">
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+}
+.float-left {
+ width: 200px;
+ height: 200px;
+ -webkit-shape-outside: polygon(0px 0px, 200px 0px, 0px 200px);
+ float: left;
+}
+.float-right {
+ margin-left: 100px;
+ width: 100px;
+ height: 200px;
+ -webkit-shape-outside: polygon(100px 0px, -100px 200px, 100px 200px) content-box;
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div class="float-left"></div>
+ XXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXX
+ <div class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXX
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon000html"></a>
<div class="propset"><h4>Property changes: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000.html</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon001expectedhtmlfromrev165470trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon001expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001-expected.html (from rev 165470, trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001-expected.html) (0 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+<!DOCTYPE html>
+<title>shape-outside-floats-polygon-001-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<meta name="flags" content="ahem">
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+ -webkit-writing-mode: vertical-lr;
+}
+.float-left {
+ width: 20px;
+ float: left;
+}
+.float-right {
+ width: 20px;
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div style="height: 200px" class="float-left"></div>
+ XXXXXXXXXX
+ <div style="height: 180px" class="float-left"></div>
+ XXXXXXXXXXX
+ <div style="height: 160px" class="float-left"></div>
+ XXXXXXXXXXXX
+ <div style="height: 140px" class="float-left"></div>
+ XXXXXXXXXXXXX
+ <div style="height: 120px" class="float-left"></div>
+ XXXXXXXXXXXXXX
+ <div style="height: 100px" class="float-left"></div>
+ XXXXXXXXXXXXXXX
+ <div style="height: 80px" class="float-left"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="height: 60px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="height: 40px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="height: 20px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="height: 20px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="height: 40px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="height: 60px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="height: 80px" class="float-right"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="height: 100px" class="float-right"></div>
+ XXXXXXXXXXXXXXX
+ <div style="height: 120px" class="float-right"></div>
+ XXXXXXXXXXXXXX
+ <div style="height: 140px" class="float-right"></div>
+ XXXXXXXXXXXXX
+ <div style="height: 160px" class="float-right"></div>
+ XXXXXXXXXXXX
+ <div style="height: 180px" class="float-right"></div>
+ XXXXXXXXXXX
+ <div style="height: 200px" class="float-right"></div>
+ XXXXXXXXXX
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon001expectedhtml"></a>
<div class="propset"><h4>Property changes: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001-expected.html</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon001htmlfromrev165470trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon001html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001.html (from rev 165470, trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html) (0 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!DOCTYPE html>
+<title>CSS Test: polygon shape-outside on floats</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-polygon-001-ref.html">
+<meta name="flags" content="ahem">
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+ -webkit-writing-mode: vertical-lr;
+}
+.float-left {
+ width: 200px;
+ height: 200px;
+ -webkit-shape-outside: polygon(0px 0px, 0px 200px, 200px 0px);
+ float: left;
+}
+.float-right {
+ margin-top: 100px;
+ width: 200px;
+ height: 100px;
+ -webkit-shape-outside: polygon(0px 100px, 200px -100px, 200px 100px) content-box;
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div class="float-left"></div>
+ XXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXX
+ <div class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXX
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon001html"></a>
<div class="propset"><h4>Property changes: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001.html</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon002expectedhtmlfromrev165470trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon002expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002-expected.html (from rev 165470, trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002-expected.html) (0 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002-expected.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+<!DOCTYPE html>
+<title>shape-outside-floats-polygon-002-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<meta name="flags" content="ahem">
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+ -webkit-writing-mode: vertical-rl;
+}
+.float-left {
+ width: 20px;
+ float: left;
+}
+.float-right {
+ width: 20px;
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div style="height: 200px" class="float-left"></div>
+ XXXXXXXXXX
+ <div style="height: 180px" class="float-left"></div>
+ XXXXXXXXXXX
+ <div style="height: 160px" class="float-left"></div>
+ XXXXXXXXXXXX
+ <div style="height: 140px" class="float-left"></div>
+ XXXXXXXXXXXXX
+ <div style="height: 120px" class="float-left"></div>
+ XXXXXXXXXXXXXX
+ <div style="height: 100px" class="float-left"></div>
+ XXXXXXXXXXXXXXX
+ <div style="height: 80px" class="float-left"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="height: 60px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="height: 40px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="height: 20px" class="float-left"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="height: 20px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ <div style="height: 40px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXXX
+ <div style="height: 60px" class="float-right"></div>
+ XXXXXXXXXXXXXXXXX
+ <div style="height: 80px" class="float-right"></div>
+ XXXXXXXXXXXXXXXX
+ <div style="height: 100px" class="float-right"></div>
+ XXXXXXXXXXXXXXX
+ <div style="height: 120px" class="float-right"></div>
+ XXXXXXXXXXXXXX
+ <div style="height: 140px" class="float-right"></div>
+ XXXXXXXXXXXXX
+ <div style="height: 160px" class="float-right"></div>
+ XXXXXXXXXXXX
+ <div style="height: 180px" class="float-right"></div>
+ XXXXXXXXXXX
+ <div style="height: 200px" class="float-right"></div>
+ XXXXXXXXXX
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon002expectedhtml"></a>
<div class="propset"><h4>Property changes: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002-expected.html</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon002htmlfromrev165470trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon002html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002.html (from rev 165470, trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html) (0 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!DOCTYPE html>
+<title>CSS Test: polygon shape-outside on floats</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
+<link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
+<link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property">
+<link rel="match" href="shape-outside-floats-polygon-002-ref.html">
+<meta name="flags" content="ahem">
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 400px;
+ height: 400px;
+ background: blue;
+ -webkit-writing-mode: vertical-rl;
+}
+.float-left {
+ width: 200px;
+ height: 200px;
+ -webkit-shape-outside: polygon(0px 0px, 200px 200px, 200px 0px);
+ float: left;
+}
+.float-right {
+ margin-top: 100px;
+ width: 200px;
+ height: 100px;
+ -webkit-shape-outside: polygon(0px 100px, 0px -100px, 200px 100px) content-box;
+ float: right;
+}
+</style>
+<body>
+ <div class="container">
+ <div class="float-left"></div>
+ XXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXX
+ <div class="float-right"></div>
+ XXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXX
+ XXXXXXXXXXXXX
+ XXXXXXXXXXXX
+ XXXXXXXXXXX
+ XXXXXXXXXX
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatspolygon002html"></a>
<div class="propset"><h4>Property changes: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002.html</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapemarginanimationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-margin-animation.html (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-margin-animation.html 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-margin-animation.html 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> .box {
</span><span class="cx"> height: 100px;
</span><span class="cx"> width: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 0, 0);
</del><ins>+ -webkit-shape-outside: inset(0 100% 100% 0);
</ins><span class="cx"> float: left;
</span><span class="cx"> background: rgba(0, 0, 255, 0.5);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestssvgclippathclippathshaperoundedrect1expectedsvg"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-1-expected.svg (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-1-expected.svg 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-1-expected.svg 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<svg xmlns="http://www.w3.org/2000/svg">
-<defs>
- <clipPath id="clip">
- <rect x="20" y="20" width="160" height="160" rx="20" ry="20"/>
- </clipPath>
-</defs>
-<rect width="200" height="200" fill="green" clip-path="url(#clip)"/>
-</svg>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestssvgclippathclippathshaperoundedrect1svg"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-1.svg (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-1.svg 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-1.svg 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-<svg xmlns="http://www.w3.org/2000/svg">
-<rect width="200" height="200" fill="green" style="-webkit-clip-path: rectangle(10%, 10%, 80%, 80%, 10%, 10%)"/>
-</svg>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestssvgclippathclippathshaperoundedrect2expectedsvg"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-2-expected.svg (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-2-expected.svg 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-2-expected.svg 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<svg xmlns="http://www.w3.org/2000/svg">
-<defs>
- <clipPath id="clip">
- <rect x="20" y="20" width="160" height="160" rx="20" ry="20"/>
- </clipPath>
-</defs>
-<rect width="200" height="200" fill="green" clip-path="url(#clip)"/>
-</svg>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestssvgclippathclippathshaperoundedrect2svg"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-2.svg (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-2.svg 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/LayoutTests/svg/clip-path/clip-path-shape-rounded-rect-2.svg 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-<svg xmlns="http://www.w3.org/2000/svg">
-<rect width="200" height="200" fill="green" style="-webkit-clip-path: rectangle(20px, 20px, 160px, 160px, 20px, 20px)"/>
-</svg>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/ChangeLog 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-03-12 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] Remove deprecated shapes
+ https://bugs.webkit.org/show_bug.cgi?id=125235
+
+ Reviewed by Dirk Schulze.
+
+ Remove support for deprecated shape types and syntax. These have
+ already been removed from the CSS Shapes specification, so this aligns
+ the implementation with the specification.
+
+ The "new" tests below were simply moved from the old csswg directory,
+ as they were the only tests there that applied to the current syntax.
+
+ Tests: fast/shapes/shape-outside-floats/shape-outside-floats-polygon-000.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-polygon-001.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-polygon-002.html
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::valueForBasicShape):
+ (WebCore::basicShapeForValue):
+ * css/BasicShapeFunctions.h:
+ * css/CSSBasicShapes.cpp:
+ * css/CSSBasicShapes.h:
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseBasicShape):
+ * rendering/shapes/Shape.cpp:
+ (WebCore::Shape::createShape):
+ * rendering/shapes/ShapeInsideInfo.cpp:
+ (WebCore::ShapeInsideInfo::isEnabledFor):
+ * rendering/style/BasicShapes.cpp:
+ * rendering/style/BasicShapes.h:
+
</ins><span class="cx"> 2014-03-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [Stable] deadlock in gobject introspection
</span><span class="lines">@@ -564,7 +597,6 @@
</span><span class="cx"> * rendering/RenderLayer.cpp:
</span><span class="cx"> (WebCore::RenderLayer::calculateClipRects):
</span><span class="cx">
</span><del>->>>>>>> .r165392
</del><span class="cx"> 2014-03-10 Hans Muller <hmuller@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] SVG Image valued shape fails if root element's size is relative
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -70,31 +70,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSBasicShape> basicShapeValue;
</span><span class="cx"> switch (basicShape->type()) {
</span><del>- case BasicShape::BasicShapeRectangleType: {
- const BasicShapeRectangle* rectangle = static_cast<const BasicShapeRectangle*>(basicShape);
- RefPtr<CSSBasicShapeRectangle> rectangleValue = CSSBasicShapeRectangle::create();
-
- rectangleValue->setX(pool.createValue(rectangle->x(), style));
- rectangleValue->setY(pool.createValue(rectangle->y(), style));
- rectangleValue->setWidth(pool.createValue(rectangle->width(), style));
- rectangleValue->setHeight(pool.createValue(rectangle->height(), style));
- rectangleValue->setRadiusX(pool.createValue(rectangle->cornerRadiusX(), style));
- rectangleValue->setRadiusY(pool.createValue(rectangle->cornerRadiusY(), style));
-
- basicShapeValue = rectangleValue.release();
- break;
- }
- case BasicShape::DeprecatedBasicShapeCircleType: {
- const DeprecatedBasicShapeCircle* circle = static_cast<const DeprecatedBasicShapeCircle*>(basicShape);
- RefPtr<CSSDeprecatedBasicShapeCircle> circleValue = CSSDeprecatedBasicShapeCircle::create();
-
- circleValue->setCenterX(pool.createValue(circle->centerX(), style));
- circleValue->setCenterY(pool.createValue(circle->centerY(), style));
- circleValue->setRadius(pool.createValue(circle->radius(), style));
-
- basicShapeValue = circleValue.release();
- break;
- }
</del><span class="cx"> case BasicShape::BasicShapeCircleType: {
</span><span class="cx"> const BasicShapeCircle* circle = static_cast<const BasicShapeCircle*>(basicShape);
</span><span class="cx"> RefPtr<CSSBasicShapeCircle> circleValue = CSSBasicShapeCircle::create();
</span><span class="lines">@@ -105,18 +80,6 @@
</span><span class="cx"> basicShapeValue = circleValue.release();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case BasicShape::DeprecatedBasicShapeEllipseType: {
- const DeprecatedBasicShapeEllipse* ellipse = static_cast<const DeprecatedBasicShapeEllipse*>(basicShape);
- RefPtr<CSSDeprecatedBasicShapeEllipse> ellipseValue = CSSDeprecatedBasicShapeEllipse::create();
-
- ellipseValue->setCenterX(pool.createValue(ellipse->centerX(), style));
- ellipseValue->setCenterY(pool.createValue(ellipse->centerY(), style));
- ellipseValue->setRadiusX(pool.createValue(ellipse->radiusX(), style));
- ellipseValue->setRadiusY(pool.createValue(ellipse->radiusY(), style));
-
- basicShapeValue = ellipseValue.release();
- break;
- }
</del><span class="cx"> case BasicShape::BasicShapeEllipseType: {
</span><span class="cx"> const BasicShapeEllipse* ellipse = static_cast<const BasicShapeEllipse*>(basicShape);
</span><span class="cx"> RefPtr<CSSBasicShapeEllipse> ellipseValue = CSSBasicShapeEllipse::create();
</span><span class="lines">@@ -140,20 +103,6 @@
</span><span class="cx"> basicShapeValue = polygonValue.release();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case BasicShape::BasicShapeInsetRectangleType: {
- const BasicShapeInsetRectangle* rectangle = static_cast<const BasicShapeInsetRectangle*>(basicShape);
- RefPtr<CSSBasicShapeInsetRectangle> rectangleValue = CSSBasicShapeInsetRectangle::create();
-
- rectangleValue->setTop(pool.createValue(rectangle->top(), style));
- rectangleValue->setRight(pool.createValue(rectangle->right(), style));
- rectangleValue->setBottom(pool.createValue(rectangle->bottom(), style));
- rectangleValue->setLeft(pool.createValue(rectangle->left(), style));
- rectangleValue->setRadiusX(pool.createValue(rectangle->cornerRadiusX(), style));
- rectangleValue->setRadiusY(pool.createValue(rectangle->cornerRadiusY(), style));
-
- basicShapeValue = rectangleValue.release();
- break;
- }
</del><span class="cx"> case BasicShape::BasicShapeInsetType: {
</span><span class="cx"> const BasicShapeInset* inset = static_cast<const BasicShapeInset*>(basicShape);
</span><span class="cx"> RefPtr<CSSBasicShapeInset> insetValue = CSSBasicShapeInset::create();
</span><span class="lines">@@ -258,39 +207,6 @@
</span><span class="cx"> RefPtr<BasicShape> basicShape;
</span><span class="cx">
</span><span class="cx"> switch (basicShapeValue->type()) {
</span><del>- case CSSBasicShape::CSSBasicShapeRectangleType: {
- const CSSBasicShapeRectangle* rectValue = static_cast<const CSSBasicShapeRectangle *>(basicShapeValue);
- RefPtr<BasicShapeRectangle> rect = BasicShapeRectangle::create();
-
- rect->setX(convertToLength(style, rootStyle, rectValue->x()));
- rect->setY(convertToLength(style, rootStyle, rectValue->y()));
- rect->setWidth(convertToLength(style, rootStyle, rectValue->width()));
- rect->setHeight(convertToLength(style, rootStyle, rectValue->height()));
- if (rectValue->radiusX()) {
- Length radiusX = convertToLength(style, rootStyle, rectValue->radiusX());
- rect->setCornerRadiusX(radiusX);
- if (rectValue->radiusY())
- rect->setCornerRadiusY(convertToLength(style, rootStyle, rectValue->radiusY()));
- else
- rect->setCornerRadiusY(radiusX);
- } else {
- rect->setCornerRadiusX(Length(0, Fixed));
- rect->setCornerRadiusY(Length(0, Fixed));
- }
- basicShape = rect.release();
- break;
- }
- case CSSBasicShape::CSSDeprecatedBasicShapeCircleType: {
- const CSSDeprecatedBasicShapeCircle* circleValue = static_cast<const CSSDeprecatedBasicShapeCircle *>(basicShapeValue);
- RefPtr<DeprecatedBasicShapeCircle> circle = DeprecatedBasicShapeCircle::create();
-
- circle->setCenterX(convertToLength(style, rootStyle, circleValue->centerX()));
- circle->setCenterY(convertToLength(style, rootStyle, circleValue->centerY()));
- circle->setRadius(convertToLength(style, rootStyle, circleValue->radius()));
-
- basicShape = circle.release();
- break;
- }
</del><span class="cx"> case CSSBasicShape::CSSBasicShapeCircleType: {
</span><span class="cx"> const CSSBasicShapeCircle* circleValue = static_cast<const CSSBasicShapeCircle *>(basicShapeValue);
</span><span class="cx"> RefPtr<BasicShapeCircle> circle = BasicShapeCircle::create();
</span><span class="lines">@@ -302,18 +218,6 @@
</span><span class="cx"> basicShape = circle.release();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case CSSBasicShape::CSSDeprecatedBasicShapeEllipseType: {
- const CSSDeprecatedBasicShapeEllipse* ellipseValue = static_cast<const CSSDeprecatedBasicShapeEllipse *>(basicShapeValue);
- RefPtr<DeprecatedBasicShapeEllipse> ellipse = DeprecatedBasicShapeEllipse::create();
-
- ellipse->setCenterX(convertToLength(style, rootStyle, ellipseValue->centerX()));
- ellipse->setCenterY(convertToLength(style, rootStyle, ellipseValue->centerY()));
- ellipse->setRadiusX(convertToLength(style, rootStyle, ellipseValue->radiusX()));
- ellipse->setRadiusY(convertToLength(style, rootStyle, ellipseValue->radiusY()));
-
- basicShape = ellipse.release();
- break;
- }
</del><span class="cx"> case CSSBasicShape::CSSBasicShapeEllipseType: {
</span><span class="cx"> const CSSBasicShapeEllipse* ellipseValue = static_cast<const CSSBasicShapeEllipse *>(basicShapeValue);
</span><span class="cx"> RefPtr<BasicShapeEllipse> ellipse = BasicShapeEllipse::create();
</span><span class="lines">@@ -339,28 +243,6 @@
</span><span class="cx"> basicShape = polygon.release();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case CSSBasicShape::CSSBasicShapeInsetRectangleType: {
- const CSSBasicShapeInsetRectangle* rectValue = static_cast<const CSSBasicShapeInsetRectangle *>(basicShapeValue);
- RefPtr<BasicShapeInsetRectangle> rect = BasicShapeInsetRectangle::create();
-
- rect->setTop(convertToLength(style, rootStyle, rectValue->top()));
- rect->setRight(convertToLength(style, rootStyle, rectValue->right()));
- rect->setBottom(convertToLength(style, rootStyle, rectValue->bottom()));
- rect->setLeft(convertToLength(style, rootStyle, rectValue->left()));
- if (rectValue->radiusX()) {
- Length radiusX = convertToLength(style, rootStyle, rectValue->radiusX());
- rect->setCornerRadiusX(radiusX);
- if (rectValue->radiusY())
- rect->setCornerRadiusY(convertToLength(style, rootStyle, rectValue->radiusY()));
- else
- rect->setCornerRadiusY(radiusX);
- } else {
- rect->setCornerRadiusX(Length(0, Fixed));
- rect->setCornerRadiusY(Length(0, Fixed));
- }
- basicShape = rect.release();
- break;
- }
</del><span class="cx"> case CSSBasicShape::CSSBasicShapeInsetType: {
</span><span class="cx"> const CSSBasicShapeInset* rectValue = static_cast<const CSSBasicShapeInset* >(basicShapeValue);
</span><span class="cx"> RefPtr<BasicShapeInset> rect = BasicShapeInset::create();
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.h (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.h 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.h 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -43,9 +43,6 @@
</span><span class="cx"> PassRefPtr<CSSValue> valueForBasicShape(const RenderStyle*, const BasicShape*);
</span><span class="cx"> PassRefPtr<BasicShape> basicShapeForValue(const RenderStyle*, const RenderStyle* rootStyle, const CSSBasicShape*);
</span><span class="cx">
</span><del>-PassRefPtr<CSSPrimitiveValue> valueForBox(LayoutBox);
-LayoutBox boxForValue(const CSSPrimitiveValue*);
-
</del><span class="cx"> float floatValueForCenterCoordinate(const BasicShapeCenterCoordinate&, float);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -40,63 +40,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static String buildRectangleString(const String& x, const String& y, const String& width, const String& height, const String& radiusX, const String& radiusY, const String& box)
-{
- char opening[] = "rectangle(";
- char separator[] = ", ";
- StringBuilder result;
- // Compute the required capacity in advance to reduce allocations.
- result.reserveCapacity((sizeof(opening) - 1) + (5 * (sizeof(separator) - 1)) + 1 + x.length() + y.length() + width.length() + height.length() + radiusX.length() + radiusY.length() + (box.length() ? box.length() + 1 : 0));
- result.appendLiteral(opening);
- result.append(x);
- result.appendLiteral(separator);
- result.append(y);
- result.appendLiteral(separator);
- result.append(width);
- result.appendLiteral(separator);
- result.append(height);
- if (!radiusX.isNull()) {
- result.appendLiteral(separator);
- result.append(radiusX);
- if (!radiusY.isNull()) {
- result.appendLiteral(separator);
- result.append(radiusY);
- }
- }
- result.append(')');
- if (box.length()) {
- result.append(' ');
- result.append(box);
- }
- return result.toString();
-}
-
-String CSSBasicShapeRectangle::cssText() const
-{
- return buildRectangleString(m_x->cssText(),
- m_y->cssText(),
- m_width->cssText(),
- m_height->cssText(),
- m_radiusX.get() ? m_radiusX->cssText() : String(),
- m_radiusY.get() ? m_radiusY->cssText() : String(),
- m_layoutBox ? m_layoutBox->cssText() : String());
-}
-
-bool CSSBasicShapeRectangle::equals(const CSSBasicShape& shape) const
-{
- if (shape.type() != CSSBasicShapeRectangleType)
- return false;
-
- const CSSBasicShapeRectangle& other = static_cast<const CSSBasicShapeRectangle&>(shape);
- return compareCSSValuePtr(m_x, other.m_x)
- && compareCSSValuePtr(m_y, other.m_y)
- && compareCSSValuePtr(m_width, other.m_width)
- && compareCSSValuePtr(m_height, other.m_height)
- && compareCSSValuePtr(m_radiusX, other.m_radiusX)
- && compareCSSValuePtr(m_radiusY, other.m_radiusY)
- && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
-}
-
</del><span class="cx"> static String serializePositionOffset(const Pair& offset, const Pair& other)
</span><span class="cx"> {
</span><span class="cx"> if ((offset.first()->getValueID() == CSSValueLeft && other.first()->getValueID() == CSSValueTop)
</span><span class="lines">@@ -188,42 +131,6 @@
</span><span class="cx"> && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String buildDeprecatedCircleString(const String& x, const String& y, const String& radius, const String& box)
-{
- StringBuilder result;
- char opening[] = "circle(";
- char separator[] = ", ";
- result.appendLiteral(opening);
- result.append(x);
- result.appendLiteral(separator);
- result.append(y);
- result.appendLiteral(separator);
- result.append(radius);
- result.append(')');
- if (box.length()) {
- result.append(' ');
- result.append(box);
- }
- return result.toString();
-}
-
-String CSSDeprecatedBasicShapeCircle::cssText() const
-{
- return buildDeprecatedCircleString(m_centerX->cssText(), m_centerY->cssText(), m_radius->cssText(), m_layoutBox ? m_layoutBox->cssText() : String());
-}
-
-bool CSSDeprecatedBasicShapeCircle::equals(const CSSBasicShape& shape) const
-{
- if (shape.type() != CSSDeprecatedBasicShapeCircleType)
- return false;
-
- const CSSDeprecatedBasicShapeCircle& other = static_cast<const CSSDeprecatedBasicShapeCircle&>(shape);
- return compareCSSValuePtr(m_centerX, other.m_centerX)
- && compareCSSValuePtr(m_centerY, other.m_centerY)
- && compareCSSValuePtr(m_radius, other.m_radius)
- && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
-}
-
</del><span class="cx"> static String buildEllipseString(const String& radiusX, const String& radiusY, const String& centerX, const String& centerY, const String& box)
</span><span class="cx"> {
</span><span class="cx"> char opening[] = "ellipse(";
</span><span class="lines">@@ -285,45 +192,6 @@
</span><span class="cx"> && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String buildDeprecatedEllipseString(const String& x, const String& y, const String& radiusX, const String& radiusY, const String& box)
-{
- StringBuilder result;
- char opening[] = "ellipse(";
- char separator[] = ", ";
- result.appendLiteral(opening);
- result.append(x);
- result.appendLiteral(separator);
- result.append(y);
- result.appendLiteral(separator);
- result.append(radiusX);
- result.appendLiteral(separator);
- result.append(radiusY);
- result.append(')');
- if (box.length()) {
- result.append(' ');
- result.append(box);
- }
- return result.toString();
-}
-
-String CSSDeprecatedBasicShapeEllipse::cssText() const
-{
- return buildDeprecatedEllipseString(m_centerX->cssText(), m_centerY->cssText(), m_radiusX->cssText(), m_radiusY->cssText(), m_layoutBox ? m_layoutBox->cssText() : String());
-}
-
-bool CSSDeprecatedBasicShapeEllipse::equals(const CSSBasicShape& shape) const
-{
- if (shape.type() != CSSDeprecatedBasicShapeEllipseType)
- return false;
-
- const CSSDeprecatedBasicShapeEllipse& other = static_cast<const CSSDeprecatedBasicShapeEllipse&>(shape);
- return compareCSSValuePtr(m_centerX, other.m_centerX)
- && compareCSSValuePtr(m_centerY, other.m_centerY)
- && compareCSSValuePtr(m_radiusX, other.m_radiusX)
- && compareCSSValuePtr(m_radiusY, other.m_radiusY)
- && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
-}
-
</del><span class="cx"> static String buildPolygonString(const WindRule& windRule, const Vector<String>& points, const String& box)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!(points.size() % 2));
</span><span class="lines">@@ -392,63 +260,6 @@
</span><span class="cx"> && compareCSSValueVector<CSSPrimitiveValue>(m_values, rhs.m_values);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String buildInsetRectangleString(const String& top, const String& right, const String& bottom, const String& left, const String& radiusX, const String& radiusY, const String& box)
-{
- char opening[] = "inset-rectangle(";
- char separator[] = ", ";
- StringBuilder result;
- // Compute the required capacity in advance to reduce allocations.
- result.reserveCapacity((sizeof(opening) - 1) + (5 * (sizeof(separator) - 1)) + 1 + top.length() + right.length() + bottom.length() + left.length() + radiusX.length() + radiusY.length() + (box.length() ? box.length() + 1 : 0));
- result.appendLiteral(opening);
- result.append(top);
- result.appendLiteral(separator);
- result.append(right);
- result.appendLiteral(separator);
- result.append(bottom);
- result.appendLiteral(separator);
- result.append(left);
- if (!radiusX.isNull()) {
- result.appendLiteral(separator);
- result.append(radiusX);
- if (!radiusY.isNull()) {
- result.appendLiteral(separator);
- result.append(radiusY);
- }
- }
- result.append(')');
- if (box.length()) {
- result.append(' ');
- result.append(box);
- }
- return result.toString();
-}
-
-String CSSBasicShapeInsetRectangle::cssText() const
-{
- return buildInsetRectangleString(m_top->cssText(),
- m_right->cssText(),
- m_bottom->cssText(),
- m_left->cssText(),
- m_radiusX.get() ? m_radiusX->cssText() : String(),
- m_radiusY.get() ? m_radiusY->cssText() : String(),
- m_layoutBox ? m_layoutBox->cssText() : String());
-}
-
-bool CSSBasicShapeInsetRectangle::equals(const CSSBasicShape& shape) const
-{
- if (shape.type() != CSSBasicShapeInsetRectangleType)
- return false;
-
- const CSSBasicShapeInsetRectangle& other = static_cast<const CSSBasicShapeInsetRectangle&>(shape);
- return compareCSSValuePtr(m_top, other.m_top)
- && compareCSSValuePtr(m_right, other.m_right)
- && compareCSSValuePtr(m_bottom, other.m_bottom)
- && compareCSSValuePtr(m_left, other.m_left)
- && compareCSSValuePtr(m_radiusX, other.m_radiusX)
- && compareCSSValuePtr(m_radiusY, other.m_radiusY)
- && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
-}
-
</del><span class="cx"> static String buildInsetString(const String& top, const String& right, const String& bottom, const String& left,
</span><span class="cx"> const String& topLeftRadiusWidth, const String& topLeftRadiusHeight,
</span><span class="cx"> const String& topRightRadiusWidth, const String& topRightRadiusHeight,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.h (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.h 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/css/CSSBasicShapes.h 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -41,11 +41,7 @@
</span><span class="cx"> class CSSBasicShape : public RefCounted<CSSBasicShape> {
</span><span class="cx"> public:
</span><span class="cx"> enum Type {
</span><del>- CSSBasicShapeRectangleType,
- CSSDeprecatedBasicShapeCircleType,
- CSSDeprecatedBasicShapeEllipseType,
</del><span class="cx"> CSSBasicShapePolygonType,
</span><del>- CSSBasicShapeInsetRectangleType,
</del><span class="cx"> CSSBasicShapeCircleType,
</span><span class="cx"> CSSBasicShapeEllipseType,
</span><span class="cx"> CSSBasicShapeInsetType
</span><span class="lines">@@ -66,73 +62,6 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> m_layoutBox;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class CSSBasicShapeRectangle : public CSSBasicShape {
-public:
- static PassRefPtr<CSSBasicShapeRectangle> create() { return adoptRef(new CSSBasicShapeRectangle); }
-
- CSSPrimitiveValue* x() const { return m_x.get(); }
- CSSPrimitiveValue* y() const { return m_y.get(); }
- CSSPrimitiveValue* width() const { return m_width.get(); }
- CSSPrimitiveValue* height() const { return m_height.get(); }
- CSSPrimitiveValue* radiusX() const { return m_radiusX.get(); }
- CSSPrimitiveValue* radiusY() const { return m_radiusY.get(); }
-
- void setX(PassRefPtr<CSSPrimitiveValue> x) { m_x = x; }
- void setY(PassRefPtr<CSSPrimitiveValue> y) { m_y = y; }
- void setWidth(PassRefPtr<CSSPrimitiveValue> width) { m_width = width; }
- void setHeight(PassRefPtr<CSSPrimitiveValue> height) { m_height = height; }
- void setRadiusX(PassRefPtr<CSSPrimitiveValue> radiusX) { m_radiusX = radiusX; }
- void setRadiusY(PassRefPtr<CSSPrimitiveValue> radiusY) { m_radiusY = radiusY; }
-
- virtual Type type() const override { return CSSBasicShapeRectangleType; }
- virtual String cssText() const override;
- virtual bool equals(const CSSBasicShape&) const override;
-
-private:
- CSSBasicShapeRectangle() { }
-
- RefPtr<CSSPrimitiveValue> m_y;
- RefPtr<CSSPrimitiveValue> m_x;
- RefPtr<CSSPrimitiveValue> m_width;
- RefPtr<CSSPrimitiveValue> m_height;
- RefPtr<CSSPrimitiveValue> m_radiusX;
- RefPtr<CSSPrimitiveValue> m_radiusY;
-};
-
-class CSSBasicShapeInsetRectangle : public CSSBasicShape {
-public:
- static PassRefPtr<CSSBasicShapeInsetRectangle> create() { return adoptRef(new CSSBasicShapeInsetRectangle); }
-
- CSSPrimitiveValue* top() const { return m_top.get(); }
- CSSPrimitiveValue* right() const { return m_right.get(); }
- CSSPrimitiveValue* bottom() const { return m_bottom.get(); }
- CSSPrimitiveValue* left() const { return m_left.get(); }
- CSSPrimitiveValue* radiusX() const { return m_radiusX.get(); }
- CSSPrimitiveValue* radiusY() const { return m_radiusY.get(); }
-
- void setTop(PassRefPtr<CSSPrimitiveValue> top) { m_top = top; }
- void setRight(PassRefPtr<CSSPrimitiveValue> right) { m_right = right; }
- void setBottom(PassRefPtr<CSSPrimitiveValue> bottom) { m_bottom = bottom; }
- void setLeft(PassRefPtr<CSSPrimitiveValue> left) { m_left = left; }
- void setRadiusX(PassRefPtr<CSSPrimitiveValue> radiusX) { m_radiusX = radiusX; }
- void setRadiusY(PassRefPtr<CSSPrimitiveValue> radiusY) { m_radiusY = radiusY; }
-
- virtual Type type() const override { return CSSBasicShapeInsetRectangleType; }
- virtual String cssText() const override;
- virtual bool equals(const CSSBasicShape&) const override;
-
-private:
- CSSBasicShapeInsetRectangle() { }
-
- RefPtr<CSSPrimitiveValue> m_right;
- RefPtr<CSSPrimitiveValue> m_top;
- RefPtr<CSSPrimitiveValue> m_bottom;
- RefPtr<CSSPrimitiveValue> m_left;
- RefPtr<CSSPrimitiveValue> m_radiusX;
- RefPtr<CSSPrimitiveValue> m_radiusY;
-};
-
-
</del><span class="cx"> class CSSBasicShapeInset : public CSSBasicShape {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<CSSBasicShapeInset> create() { return adoptRef(new CSSBasicShapeInset); }
</span><span class="lines">@@ -199,57 +128,6 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> m_radius;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class CSSDeprecatedBasicShapeCircle : public CSSBasicShape {
-public:
- static PassRefPtr<CSSDeprecatedBasicShapeCircle> create() { return adoptRef(new CSSDeprecatedBasicShapeCircle); }
-
- CSSPrimitiveValue* centerX() const { return m_centerX.get(); }
- CSSPrimitiveValue* centerY() const { return m_centerY.get(); }
- CSSPrimitiveValue* radius() const { return m_radius.get(); }
-
- void setCenterX(PassRefPtr<CSSPrimitiveValue> centerX) { m_centerX = centerX; }
- void setCenterY(PassRefPtr<CSSPrimitiveValue> centerY) { m_centerY = centerY; }
- void setRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_radius = radius; }
-
- virtual Type type() const override { return CSSDeprecatedBasicShapeCircleType; }
- virtual String cssText() const override;
- virtual bool equals(const CSSBasicShape&) const override;
-
-private:
- CSSDeprecatedBasicShapeCircle() { }
-
- RefPtr<CSSPrimitiveValue> m_centerY;
- RefPtr<CSSPrimitiveValue> m_centerX;
- RefPtr<CSSPrimitiveValue> m_radius;
-};
-
-class CSSDeprecatedBasicShapeEllipse : public CSSBasicShape {
-public:
- static PassRefPtr<CSSDeprecatedBasicShapeEllipse> create() { return adoptRef(new CSSDeprecatedBasicShapeEllipse); }
-
- CSSPrimitiveValue* centerX() const { return m_centerX.get(); }
- CSSPrimitiveValue* centerY() const { return m_centerY.get(); }
- CSSPrimitiveValue* radiusX() const { return m_radiusX.get(); }
- CSSPrimitiveValue* radiusY() const { return m_radiusY.get(); }
-
- void setCenterX(PassRefPtr<CSSPrimitiveValue> centerX) { m_centerX = centerX; }
- void setCenterY(PassRefPtr<CSSPrimitiveValue> centerY) { m_centerY = centerY; }
- void setRadiusX(PassRefPtr<CSSPrimitiveValue> radiusX) { m_radiusX = radiusX; }
- void setRadiusY(PassRefPtr<CSSPrimitiveValue> radiusY) { m_radiusY = radiusY; }
-
- virtual Type type() const override { return CSSDeprecatedBasicShapeEllipseType; }
- virtual String cssText() const override;
- virtual bool equals(const CSSBasicShape&) const override;
-
-private:
- CSSDeprecatedBasicShapeEllipse() { }
-
- RefPtr<CSSPrimitiveValue> m_centerX;
- RefPtr<CSSPrimitiveValue> m_centerY;
- RefPtr<CSSPrimitiveValue> m_radiusX;
- RefPtr<CSSPrimitiveValue> m_radiusY;
-};
-
</del><span class="cx"> class CSSBasicShapeEllipse : public CSSBasicShape {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<CSSBasicShapeEllipse> create() { return adoptRef(new CSSBasicShapeEllipse); }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -5468,118 +5468,6 @@
</span><span class="cx"> return shape;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<CSSBasicShape> CSSParser::parseBasicShapeRectangle(CSSParserValueList* args)
-{
- ASSERT(args);
-
- // rect(x, y, width, height, [[rx], ry])
- if (args->size() != 7 && args->size() != 9 && args->size() != 11)
- return 0;
-
- RefPtr<CSSBasicShapeRectangle> shape = CSSBasicShapeRectangle::create();
-
- unsigned argumentNumber = 0;
- CSSParserValue* argument = args->current();
- while (argument) {
- Units unitFlags = FLength | FPercent;
- if (argumentNumber > 1) {
- // Arguments width, height, rx, and ry cannot be negative.
- unitFlags = unitFlags | FNonNeg;
- }
- if (!validUnit(argument, unitFlags))
- return 0;
-
- RefPtr<CSSPrimitiveValue> length = createPrimitiveNumericValue(argument);
- ASSERT(argumentNumber < 6);
- switch (argumentNumber) {
- case 0:
- shape->setX(length);
- break;
- case 1:
- shape->setY(length);
- break;
- case 2:
- shape->setWidth(length);
- break;
- case 3:
- shape->setHeight(length);
- break;
- case 4:
- shape->setRadiusX(length);
- break;
- case 5:
- shape->setRadiusY(length);
- break;
- }
- argument = args->next();
- if (argument) {
- if (!isComma(argument))
- return 0;
-
- argument = args->next();
- }
- argumentNumber++;
- }
-
- if (argumentNumber < 4)
- return 0;
- return shape;
-}
-
-PassRefPtr<CSSBasicShape> CSSParser::parseBasicShapeInsetRectangle(CSSParserValueList* args)
-{
- ASSERT(args);
-
- // inset-rectangle(top, right, bottom, left, [[rx], ry])
- if (args->size() != 7 && args->size() != 9 && args->size() != 11)
- return 0;
-
- RefPtr<CSSBasicShapeInsetRectangle> shape = CSSBasicShapeInsetRectangle::create();
-
- unsigned argumentNumber = 0;
- CSSParserValue* argument = args->current();
- while (argument) {
- Units unitFlags = FLength | FPercent | FNonNeg;
- if (!validUnit(argument, unitFlags))
- return 0;
-
- RefPtr<CSSPrimitiveValue> length = createPrimitiveNumericValue(argument);
- ASSERT(argumentNumber < 6);
- switch (argumentNumber) {
- case 0:
- shape->setTop(length);
- break;
- case 1:
- shape->setRight(length);
- break;
- case 2:
- shape->setBottom(length);
- break;
- case 3:
- shape->setLeft(length);
- break;
- case 4:
- shape->setRadiusX(length);
- break;
- case 5:
- shape->setRadiusY(length);
- break;
- }
- argument = args->next();
- if (argument) {
- if (!isComma(argument))
- return 0;
-
- argument = args->next();
- }
- argumentNumber++;
- }
-
- if (argumentNumber < 4)
- return 0;
- return shape;
-}
-
</del><span class="cx"> PassRefPtr<CSSPrimitiveValue> CSSParser::parseShapeRadius(CSSParserValue* value)
</span><span class="cx"> {
</span><span class="cx"> if (value->id == CSSValueClosestSide || value->id == CSSValueFarthestSide)
</span><span class="lines">@@ -5636,56 +5524,6 @@
</span><span class="cx"> return shape;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<CSSBasicShape> CSSParser::parseDeprecatedBasicShapeCircle(CSSParserValueList* args)
-{
- ASSERT(args);
-
- // circle(centerX, centerY, radius)
- if (args->size() != 5)
- return 0;
-
- RefPtr<CSSDeprecatedBasicShapeCircle> shape = CSSDeprecatedBasicShapeCircle::create();
-
- unsigned argumentNumber = 0;
- CSSParserValue* argument = args->current();
- while (argument) {
- Units unitFlags = FLength | FPercent;
- if (argumentNumber == 2) {
- // Argument radius cannot be negative.
- unitFlags = unitFlags | FNonNeg;
- }
-
- if (!validUnit(argument, unitFlags))
- return 0;
-
- RefPtr<CSSPrimitiveValue> length = createPrimitiveNumericValue(argument);
- ASSERT(argumentNumber < 3);
- switch (argumentNumber) {
- case 0:
- shape->setCenterX(length);
- break;
- case 1:
- shape->setCenterY(length);
- break;
- case 2:
- shape->setRadius(length);
- break;
- }
-
- argument = args->next();
- if (argument) {
- if (!isComma(argument))
- return 0;
- argument = args->next();
- }
- argumentNumber++;
- }
-
- if (argumentNumber < 3)
- return 0;
- return shape;
-}
-
</del><span class="cx"> PassRefPtr<CSSBasicShape> CSSParser::parseBasicShapeEllipse(CSSParserValueList* args)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(args);
</span><span class="lines">@@ -5735,57 +5573,6 @@
</span><span class="cx"> return shape;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<CSSBasicShape> CSSParser::parseDeprecatedBasicShapeEllipse(CSSParserValueList* args)
-{
- ASSERT(args);
-
- // ellipse(centerX, centerY, radiusX, radiusY)
- if (args->size() != 7)
- return 0;
-
- RefPtr<CSSDeprecatedBasicShapeEllipse> shape = CSSDeprecatedBasicShapeEllipse::create();
- unsigned argumentNumber = 0;
- CSSParserValue* argument = args->current();
- while (argument) {
- Units unitFlags = FLength | FPercent;
- if (argumentNumber > 1) {
- // Arguments radiusX and radiusY cannot be negative.
- unitFlags = unitFlags | FNonNeg;
- }
- if (!validUnit(argument, unitFlags))
- return 0;
-
- RefPtr<CSSPrimitiveValue> length = createPrimitiveNumericValue(argument);
- ASSERT(argumentNumber < 4);
- switch (argumentNumber) {
- case 0:
- shape->setCenterX(length);
- break;
- case 1:
- shape->setCenterY(length);
- break;
- case 2:
- shape->setRadiusX(length);
- break;
- case 3:
- shape->setRadiusY(length);
- break;
- }
-
- argument = args->next();
- if (argument) {
- if (!isComma(argument))
- return 0;
- argument = args->next();
- }
- argumentNumber++;
- }
-
- if (argumentNumber < 4)
- return 0;
- return shape;
-}
-
</del><span class="cx"> PassRefPtr<CSSBasicShape> CSSParser::parseBasicShapePolygon(CSSParserValueList* args)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(args);
</span><span class="lines">@@ -5938,20 +5725,6 @@
</span><span class="cx"> return parseBasicShapeAndOrBox(CSSPropertyWebkitClipPath);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME This function is temporary to allow for an orderly transition between
-// the new CSS Shapes circle and ellipse syntax. It will be removed when the
-// old syntax is removed.
-static bool isDeprecatedBasicShape(CSSParserValueList* args)
-{
- for (unsigned i = args->currentIndex(); i < args->size(); ++i) {
- CSSParserValue* value = args->valueAt(i);
- if (isComma(value))
- return true;
- }
-
- return false;
-}
-
</del><span class="cx"> PassRefPtr<CSSPrimitiveValue> CSSParser::parseBasicShape()
</span><span class="cx"> {
</span><span class="cx"> CSSParserValue* value = m_valueList->current();
</span><span class="lines">@@ -5962,22 +5735,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSBasicShape> shape;
</span><del>- if (equalIgnoringCase(value->function->name, "rectangle("))
- shape = parseBasicShapeRectangle(args);
- else if (equalIgnoringCase(value->function->name, "circle("))
- if (isDeprecatedBasicShape(args))
- shape = parseDeprecatedBasicShapeCircle(args);
- else
- shape = parseBasicShapeCircle(args);
</del><ins>+ if (equalIgnoringCase(value->function->name, "circle("))
+ shape = parseBasicShapeCircle(args);
</ins><span class="cx"> else if (equalIgnoringCase(value->function->name, "ellipse("))
</span><del>- if (isDeprecatedBasicShape(args))
- shape = parseDeprecatedBasicShapeEllipse(args);
- else
- shape = parseBasicShapeEllipse(args);
</del><ins>+ shape = parseBasicShapeEllipse(args);
</ins><span class="cx"> else if (equalIgnoringCase(value->function->name, "polygon("))
</span><span class="cx"> shape = parseBasicShapePolygon(args);
</span><del>- else if (equalIgnoringCase(value->function->name, "inset-rectangle("))
- shape = parseBasicShapeInsetRectangle(args);
</del><span class="cx"> else if (equalIgnoringCase(value->function->name, "inset("))
</span><span class="cx"> shape = parseBasicShapeInset(args);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -52,12 +52,6 @@
</span><span class="cx"> return adoptPtr(new BoxShape(bounds));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassOwnPtr<Shape> createRectangleShape(const FloatRect& bounds, const FloatSize& radii)
-{
- ASSERT(bounds.width() >= 0 && bounds.height() >= 0 && radii.width() >= 0 && radii.height() >= 0);
- return adoptPtr(new RectangleShape(bounds, radii));
-}
-
</del><span class="cx"> static PassOwnPtr<Shape> createCircleShape(const FloatPoint& center, float radius)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(radius >= 0);
</span><span class="lines">@@ -122,34 +116,6 @@
</span><span class="cx">
</span><span class="cx"> switch (basicShape->type()) {
</span><span class="cx">
</span><del>- case BasicShape::BasicShapeRectangleType: {
- const BasicShapeRectangle& rectangle = *static_cast<const BasicShapeRectangle*>(basicShape);
- FloatRect bounds(
- floatValueForLength(rectangle.x(), boxWidth),
- floatValueForLength(rectangle.y(), boxHeight),
- floatValueForLength(rectangle.width(), boxWidth),
- floatValueForLength(rectangle.height(), boxHeight));
- FloatSize cornerRadii(
- floatValueForLength(rectangle.cornerRadiusX(), boxWidth),
- floatValueForLength(rectangle.cornerRadiusY(), boxHeight));
- ensureRadiiDoNotOverlap(bounds, cornerRadii);
- FloatRect logicalBounds = physicalRectToLogical(bounds, logicalBoxSize.height(), writingMode);
-
- shape = createRectangleShape(logicalBounds, physicalSizeToLogical(cornerRadii, writingMode));
- break;
- }
-
- case BasicShape::DeprecatedBasicShapeCircleType: {
- const DeprecatedBasicShapeCircle* circle = static_cast<const DeprecatedBasicShapeCircle*>(basicShape);
- float centerX = floatValueForLength(circle->centerX(), boxWidth);
- float centerY = floatValueForLength(circle->centerY(), boxHeight);
- float radius = floatValueForLength(circle->radius(), sqrtf((boxWidth * boxWidth + boxHeight * boxHeight) / 2));
- FloatPoint logicalCenter = physicalPointToLogical(FloatPoint(centerX, centerY), logicalBoxSize.height(), writingMode);
-
- shape = createCircleShape(logicalCenter, radius);
- break;
- }
-
</del><span class="cx"> case BasicShape::BasicShapeCircleType: {
</span><span class="cx"> const BasicShapeCircle* circle = static_cast<const BasicShapeCircle*>(basicShape);
</span><span class="cx"> float centerX = floatValueForCenterCoordinate(circle->centerX(), boxWidth);
</span><span class="lines">@@ -161,19 +127,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case BasicShape::DeprecatedBasicShapeEllipseType: {
- const DeprecatedBasicShapeEllipse* ellipse = static_cast<const DeprecatedBasicShapeEllipse*>(basicShape);
- float centerX = floatValueForLength(ellipse->centerX(), boxWidth);
- float centerY = floatValueForLength(ellipse->centerY(), boxHeight);
- float radiusX = floatValueForLength(ellipse->radiusX(), boxWidth);
- float radiusY = floatValueForLength(ellipse->radiusY(), boxHeight);
- FloatPoint logicalCenter = physicalPointToLogical(FloatPoint(centerX, centerY), logicalBoxSize.height(), writingMode);
- FloatSize logicalRadii = physicalSizeToLogical(FloatSize(radiusX, radiusY), writingMode);
-
- shape = createEllipseShape(logicalCenter, logicalRadii);
- break;
- }
-
</del><span class="cx"> case BasicShape::BasicShapeEllipseType: {
</span><span class="cx"> const BasicShapeEllipse* ellipse = static_cast<const BasicShapeEllipse*>(basicShape);
</span><span class="cx"> float centerX = floatValueForCenterCoordinate(ellipse->centerX(), boxWidth);
</span><span class="lines">@@ -203,25 +156,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case BasicShape::BasicShapeInsetRectangleType: {
- const BasicShapeInsetRectangle& rectangle = *static_cast<const BasicShapeInsetRectangle*>(basicShape);
- float left = floatValueForLength(rectangle.left(), boxWidth);
- float top = floatValueForLength(rectangle.top(), boxHeight);
- FloatRect bounds(
- left,
- top,
- std::max<float>(boxWidth - left - floatValueForLength(rectangle.right(), boxWidth), 0),
- std::max<float>(boxHeight - top - floatValueForLength(rectangle.bottom(), boxHeight), 0));
- FloatSize cornerRadii(
- floatValueForLength(rectangle.cornerRadiusX(), boxWidth),
- floatValueForLength(rectangle.cornerRadiusY(), boxHeight));
- ensureRadiiDoNotOverlap(bounds, cornerRadii);
- FloatRect logicalBounds = physicalRectToLogical(bounds, logicalBoxSize.height(), writingMode);
-
- shape = createRectangleShape(logicalBounds, physicalSizeToLogical(cornerRadii, writingMode));
- break;
- }
-
</del><span class="cx"> case BasicShape::BasicShapeInsetType: {
</span><span class="cx"> const BasicShapeInset& inset = *static_cast<const BasicShapeInset*>(basicShape);
</span><span class="cx"> float left = floatValueForLength(inset.left(), boxWidth);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> switch (shapeValue->type()) {
</span><span class="cx"> case ShapeValue::Shape:
</span><del>- return shapeValue->shape() && shapeValue->shape()->type() != BasicShape::BasicShapeInsetRectangleType && shapeValue->shape()->type() != BasicShape::BasicShapeInsetType;
</del><ins>+ return shapeValue->shape() && shapeValue->shape()->type() != BasicShape::BasicShapeInsetType;
</ins><span class="cx"> case ShapeValue::Image:
</span><span class="cx"> return shapeValue->isImageValid() && checkShapeImageOrigin(renderer.document(), *(shapeValue->image()->cachedImage()));
</span><span class="cx"> case ShapeValue::Box:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BasicShapes.cpp (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -92,65 +92,6 @@
</span><span class="cx"> && thisEllipse->radiusY().canBlend(otherEllipse->radiusY()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BasicShapeRectangle::path(Path& path, const FloatRect& boundingBox)
-{
- ASSERT(path.isEmpty());
- path.addRoundedRect(
- FloatRect(
- floatValueForLength(m_x, boundingBox.width()) + boundingBox.x(),
- floatValueForLength(m_y, boundingBox.height()) + boundingBox.y(),
- floatValueForLength(m_width, boundingBox.width()),
- floatValueForLength(m_height, boundingBox.height())
- ),
- FloatSize(
- floatValueForLength(m_cornerRadiusX, boundingBox.width()),
- floatValueForLength(m_cornerRadiusY, boundingBox.height())
- )
- );
-}
-
-PassRefPtr<BasicShape> BasicShapeRectangle::blend(const BasicShape* other, double progress) const
-{
- ASSERT(type() == other->type());
-
- const BasicShapeRectangle* o = static_cast<const BasicShapeRectangle*>(other);
- RefPtr<BasicShapeRectangle> result = BasicShapeRectangle::create();
- result->setX(m_x.blend(o->x(), progress));
- result->setY(m_y.blend(o->y(), progress));
- result->setWidth(m_width.blend(o->width(), progress));
- result->setHeight(m_height.blend(o->height(), progress));
- result->setCornerRadiusX(m_cornerRadiusX.blend(o->cornerRadiusX(), progress));
- result->setCornerRadiusY(m_cornerRadiusY.blend(o->cornerRadiusY(), progress));
- return result.release();
-}
-
-void DeprecatedBasicShapeCircle::path(Path& path, const FloatRect& boundingBox)
-{
- ASSERT(path.isEmpty());
- float diagonal = sqrtf((boundingBox.width() * boundingBox.width() + boundingBox.height() * boundingBox.height()) / 2);
- float centerX = floatValueForLength(m_centerX, boundingBox.width());
- float centerY = floatValueForLength(m_centerY, boundingBox.height());
- float radius = floatValueForLength(m_radius, diagonal);
- path.addEllipse(FloatRect(
- centerX - radius + boundingBox.x(),
- centerY - radius + boundingBox.y(),
- radius * 2,
- radius * 2
- ));
-}
-
-PassRefPtr<BasicShape> DeprecatedBasicShapeCircle::blend(const BasicShape* other, double progress) const
-{
- ASSERT(type() == other->type());
-
- const DeprecatedBasicShapeCircle* o = static_cast<const DeprecatedBasicShapeCircle*>(other);
- RefPtr<DeprecatedBasicShapeCircle> result = DeprecatedBasicShapeCircle::create();
- result->setCenterX(m_centerX.blend(o->centerX(), progress));
- result->setCenterY(m_centerY.blend(o->centerY(), progress));
- result->setRadius(m_radius.blend(o->radius(), progress));
- return result.release();
-}
-
</del><span class="cx"> float BasicShapeCircle::floatValueForRadiusInBox(float boxWidth, float boxHeight) const
</span><span class="cx"> {
</span><span class="cx"> if (m_radius.type() == BasicShapeRadius::Value)
</span><span class="lines">@@ -193,34 +134,6 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DeprecatedBasicShapeEllipse::path(Path& path, const FloatRect& boundingBox)
-{
- ASSERT(path.isEmpty());
- float centerX = floatValueForLength(m_centerX, boundingBox.width());
- float centerY = floatValueForLength(m_centerY, boundingBox.height());
- float radiusX = floatValueForLength(m_radiusX, boundingBox.width());
- float radiusY = floatValueForLength(m_radiusY, boundingBox.height());
- path.addEllipse(FloatRect(
- centerX - radiusX + boundingBox.x(),
- centerY - radiusY + boundingBox.y(),
- radiusX * 2,
- radiusY * 2
- ));
-}
-
-PassRefPtr<BasicShape> DeprecatedBasicShapeEllipse::blend(const BasicShape* other, double progress) const
-{
- ASSERT(type() == other->type());
-
- const DeprecatedBasicShapeEllipse* o = static_cast<const DeprecatedBasicShapeEllipse*>(other);
- RefPtr<DeprecatedBasicShapeEllipse> result = DeprecatedBasicShapeEllipse::create();
- result->setCenterX(m_centerX.blend(o->centerX(), progress));
- result->setCenterY(m_centerY.blend(o->centerY(), progress));
- result->setRadiusX(m_radiusX.blend(o->radiusX(), progress));
- result->setRadiusY(m_radiusY.blend(o->radiusY(), progress));
- return result.release();
-}
-
</del><span class="cx"> float BasicShapeEllipse::floatValueForRadiusInBox(const BasicShapeRadius& radius, float center, float boxWidthOrHeight) const
</span><span class="cx"> {
</span><span class="cx"> if (radius.type() == BasicShapeRadius::Value)
</span><span class="lines">@@ -311,40 +224,6 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BasicShapeInsetRectangle::path(Path& path, const FloatRect& boundingBox)
-{
- ASSERT(path.isEmpty());
- float left = floatValueForLength(m_left, boundingBox.width());
- float top = floatValueForLength(m_top, boundingBox.height());
- path.addRoundedRect(
- FloatRect(
- left + boundingBox.x(),
- top + boundingBox.y(),
- std::max<float>(boundingBox.width() - left - floatValueForLength(m_right, boundingBox.width()), 0),
- std::max<float>(boundingBox.height() - top - floatValueForLength(m_bottom, boundingBox.height()), 0)
- ),
- FloatSize(
- floatValueForLength(m_cornerRadiusX, boundingBox.width()),
- floatValueForLength(m_cornerRadiusY, boundingBox.height())
- )
- );
-}
-
-PassRefPtr<BasicShape> BasicShapeInsetRectangle::blend(const BasicShape* other, double progress) const
-{
- ASSERT(type() == other->type());
-
- const BasicShapeInsetRectangle* o = static_cast<const BasicShapeInsetRectangle*>(other);
- RefPtr<BasicShapeInsetRectangle> result = BasicShapeInsetRectangle::create();
- result->setTop(m_top.blend(o->top(), progress));
- result->setRight(m_right.blend(o->right(), progress));
- result->setBottom(m_bottom.blend(o->bottom(), progress));
- result->setLeft(m_left.blend(o->left(), progress));
- result->setCornerRadiusX(m_cornerRadiusX.blend(o->cornerRadiusX(), progress));
- result->setCornerRadiusY(m_cornerRadiusY.blend(o->cornerRadiusY(), progress));
- return result.release();
-}
-
</del><span class="cx"> static FloatSize floatSizeForLengthSize(const LengthSize& lengthSize, const FloatRect& boundingBox)
</span><span class="cx"> {
</span><span class="cx"> return FloatSize(floatValueForLength(lengthSize.width(), boundingBox.width()),
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BasicShapes.h (165471 => 165472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.h 2014-03-12 15:41:13 UTC (rev 165471)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.h 2014-03-12 15:41:55 UTC (rev 165472)
</span><span class="lines">@@ -49,11 +49,7 @@
</span><span class="cx"> virtual ~BasicShape() { }
</span><span class="cx">
</span><span class="cx"> enum Type {
</span><del>- BasicShapeRectangleType,
- DeprecatedBasicShapeCircleType,
- DeprecatedBasicShapeEllipseType,
</del><span class="cx"> BasicShapePolygonType,
</span><del>- BasicShapeInsetRectangleType,
</del><span class="cx"> BasicShapeCircleType,
</span><span class="cx"> BasicShapeEllipseType,
</span><span class="cx"> BasicShapeInsetType
</span><span class="lines">@@ -80,47 +76,6 @@
</span><span class="cx"> LayoutBox m_layoutBox;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class BasicShapeRectangle : public BasicShape {
-public:
- static PassRefPtr<BasicShapeRectangle> create() { return adoptRef(new BasicShapeRectangle); }
-
- const Length& x() const { return m_x; }
- const Length& y() const { return m_y; }
- const Length& width() const { return m_width; }
- const Length& height() const { return m_height; }
- const Length& cornerRadiusX() const { return m_cornerRadiusX; }
- const Length& cornerRadiusY() const { return m_cornerRadiusY; }
-
- void setX(Length x) { m_x = std::move(x); }
- void setY(Length y) { m_y = std::move(y); }
- void setWidth(Length width) { m_width = std::move(width); }
- void setHeight(Length height) { m_height = std::move(height); }
- void setCornerRadiusX(Length radiusX)
- {
- ASSERT(!radiusX.isUndefined());
- m_cornerRadiusX = std::move(radiusX);
- }
- void setCornerRadiusY(Length radiusY)
- {
- ASSERT(!radiusY.isUndefined());
- m_cornerRadiusY = std::move(radiusY);
- }
-
- virtual void path(Path&, const FloatRect&) override;
- virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
-
- virtual Type type() const override { return BasicShapeRectangleType; }
-private:
- BasicShapeRectangle() { }
-
- Length m_y;
- Length m_x;
- Length m_width;
- Length m_height;
- Length m_cornerRadiusX;
- Length m_cornerRadiusY;
-};
-
</del><span class="cx"> class BasicShapeCenterCoordinate {
</span><span class="cx"> public:
</span><span class="cx"> enum Direction {
</span><span class="lines">@@ -226,30 +181,6 @@
</span><span class="cx"> BasicShapeRadius m_radius;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class DeprecatedBasicShapeCircle : public BasicShape {
-public:
- static PassRefPtr<DeprecatedBasicShapeCircle> create() { return adoptRef(new DeprecatedBasicShapeCircle); }
-
- const Length& centerX() const { return m_centerX; }
- const Length& centerY() const { return m_centerY; }
- const Length& radius() const { return m_radius; }
-
- void setCenterX(Length centerX) { m_centerX = std::move(centerX); }
- void setCenterY(Length centerY) { m_centerY = std::move(centerY); }
- void setRadius(Length radius) { m_radius = std::move(radius); }
-
- virtual void path(Path&, const FloatRect&) override;
- virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
-
- virtual Type type() const override { return DeprecatedBasicShapeCircleType; }
-private:
- DeprecatedBasicShapeCircle() { }
-
- Length m_centerX;
- Length m_centerY;
- Length m_radius;
-};
-
</del><span class="cx"> class BasicShapeEllipse : public BasicShape {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<BasicShapeEllipse> create() { return adoptRef(new BasicShapeEllipse); }
</span><span class="lines">@@ -278,33 +209,6 @@
</span><span class="cx"> BasicShapeRadius m_radiusY;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class DeprecatedBasicShapeEllipse : public BasicShape {
-public:
- static PassRefPtr<DeprecatedBasicShapeEllipse> create() { return adoptRef(new DeprecatedBasicShapeEllipse); }
-
- const Length& centerX() const { return m_centerX; }
- const Length& centerY() const { return m_centerY; }
- const Length& radiusX() const { return m_radiusX; }
- const Length& radiusY() const { return m_radiusY; }
-
- void setCenterX(Length centerX) { m_centerX = std::move(centerX); }
- void setCenterY(Length centerY) { m_centerY = std::move(centerY); }
- void setRadiusX(Length radiusX) { m_radiusX = std::move(radiusX); }
- void setRadiusY(Length radiusY) { m_radiusY = std::move(radiusY); }
-
- virtual void path(Path&, const FloatRect&) override;
- virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
-
- virtual Type type() const override { return DeprecatedBasicShapeEllipseType; }
-private:
- DeprecatedBasicShapeEllipse() { }
-
- Length m_centerX;
- Length m_centerY;
- Length m_radiusX;
- Length m_radiusY;
-};
-
</del><span class="cx"> class BasicShapePolygon : public BasicShape {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<BasicShapePolygon> create() { return adoptRef(new BasicShapePolygon); }
</span><span class="lines">@@ -331,47 +235,6 @@
</span><span class="cx"> Vector<Length> m_values;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class BasicShapeInsetRectangle : public BasicShape {
-public:
- static PassRefPtr<BasicShapeInsetRectangle> create() { return adoptRef(new BasicShapeInsetRectangle); }
-
- const Length& top() const { return m_top; }
- const Length& right() const { return m_right; }
- const Length& bottom() const { return m_bottom; }
- const Length& left() const { return m_left; }
- const Length& cornerRadiusX() const { return m_cornerRadiusX; }
- const Length& cornerRadiusY() const { return m_cornerRadiusY; }
-
- void setTop(Length top) { m_top = std::move(top); }
- void setRight(Length right) { m_right = std::move(right); }
- void setBottom(Length bottom) { m_bottom = std::move(bottom); }
- void setLeft(Length left) { m_left = std::move(left); }
- void setCornerRadiusX(Length radiusX)
- {
- ASSERT(!radiusX.isUndefined());
- m_cornerRadiusX = std::move(radiusX);
- }
- void setCornerRadiusY(Length radiusY)
- {
- ASSERT(!radiusY.isUndefined());
- m_cornerRadiusY = std::move(radiusY);
- }
-
- virtual void path(Path&, const FloatRect&) override;
- virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
-
- virtual Type type() const override { return BasicShapeInsetRectangleType; }
-private:
- BasicShapeInsetRectangle() { }
-
- Length m_right;
- Length m_top;
- Length m_bottom;
- Length m_left;
- Length m_cornerRadiusX;
- Length m_cornerRadiusY;
-};
-
</del><span class="cx"> class BasicShapeInset : public BasicShape {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<BasicShapeInset> create() { return adoptRef(new BasicShapeInset); }
</span></span></pre>
</div>
</div>
</body>
</html>