<!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>[166301] 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/166301">166301</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-26 11:20:15 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Remove shape-inside support
https://bugs.webkit.org/show_bug.cgi?id=130698
Reviewed by David Hyatt.
.:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
CSS Shapes Level 1 (CR) only contains shape-outside. We are focusing our efforts on finalizing
the implementation of shape-outside, it's worth to remove shape-inside code at this point for now.
A list of reasons for the removal:
- Shape-inside is only part of Shapes Level 2, which needs to be improved on some topics.
- Shape-inside is lack of new shapes support (e.g. inset).
- Deprecated shapes (<a href="http://trac.webkit.org/projects/webkit/changeset/165472">r165472</a>) are removed from the code (e.g. rectangle), which affects shape-inside.
- The current shape-inside code spreads across the layout code.
- The current shape-inside implementation is experimental in some areas,
and the partially implemented code can have security implications.
- Removal of shape-inside opens possibilities for code complexity and performance
optimizations for shape-outside. (e.g. simpler geometry code)
No new tests are needed.
* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.list.am:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isSimpleLengthPropertyID):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseShapeProperty):
* css/CSSPropertyNames.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::loadPendingImages):
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* rendering/LayoutState.cpp:
(WebCore::LayoutState::LayoutState):
* rendering/LayoutState.h:
(WebCore::LayoutState::LayoutState):
(WebCore::LayoutState::shapeInsideInfo): Deleted.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::styleDidChange):
(WebCore::RenderBlock::imageChanged):
(WebCore::RenderBlock::preparePaginationBeforeBlockLayout):
(WebCore::RenderBlock::relayoutShapeDescendantIfMoved): Deleted.
(WebCore::RenderBlock::logicalOffsetFromShapeAncestorContainer): Deleted.
(WebCore::RenderBlock::updateShapeInsideInfoAfterStyleChange): Deleted.
(WebCore::RenderBlock::ensureShapeInsideInfo): Deleted.
(WebCore::RenderBlock::shapeInsideInfo): Deleted.
(WebCore::RenderBlock::setShapeInsideInfo): Deleted.
(WebCore::RenderBlock::markShapeInsideDescendantsForLayout): Deleted.
(WebCore::RenderBlock::layoutShapeInsideInfo): Deleted.
(WebCore::shapeInfoRequiresRelayout): Deleted.
(WebCore::RenderBlock::computeShapeSize): Deleted.
(WebCore::RenderBlock::updateShapesBeforeBlockLayout): Deleted.
(WebCore::RenderBlock::updateShapesAfterBlockLayout): Deleted.
(WebCore::RenderBlock::prepareShapesAndPaginationBeforeBlockLayout): Deleted.
* rendering/RenderBlock.h:
(WebCore::RenderBlock::allowsShapeInsideInfoSharing): Deleted.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutBlock):
(WebCore::RenderBlockFlow::layoutBlockChild):
(WebCore::RenderBlockFlow::computeLogicalLocationForFloat):
* rendering/RenderBlockFlow.h:
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForLine):
(WebCore::RenderBlockFlow::layoutRunsAndFloatsInRange):
(WebCore::constructBidiRunsForLine): Deleted.
(WebCore::pushShapeContentOverflowBelowTheContentBox): Deleted.
(WebCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLine): Deleted.
(WebCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLineInFlowThread): Deleted.
(WebCore::adjustLogicalLineTop): Deleted.
(WebCore::RenderBlockFlow::adjustLogicalLineTopAndLogicalHeightIfNeeded): Deleted.
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::~RenderElement):
(WebCore::RenderElement::initializeStyle):
(WebCore::RenderElement::setStyle):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutBlock):
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::layoutBlock):
* rendering/RenderNamedFlowFragment.cpp:
(WebCore::RenderNamedFlowFragment::createStyle):
* rendering/RenderView.h:
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor):
* rendering/line/BreakingContextInlineHeaders.h:
(WebCore::BreakingContext::handleText):
(WebCore::BreakingContext::handleEndOfLine):
(WebCore::updateSegmentsForShapes): Deleted.
* rendering/line/LineBreaker.cpp:
(WebCore::LineBreaker::nextLineBreak):
* rendering/line/LineWidth.cpp:
(WebCore::LineWidth::LineWidth):
(WebCore::LineWidth::updateAvailableWidth):
(WebCore::LineWidth::wrapNextToShapeOutside):
(WebCore::LineWidth::fitBelowFloats):
(WebCore::LineWidth::updateLineSegment): Deleted.
(WebCore::LineWidth::updateCurrentShapeSegment): Deleted.
* rendering/line/LineWidth.h:
* rendering/shapes/ShapeInsideInfo.cpp: Removed.
* rendering/shapes/ShapeInsideInfo.h: Removed.
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
Tools:
* Scripts/webkitperl/FeatureList.pm:
LayoutTests:
* fast/regions/shape-inside/shape-inside-on-additional-regions-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-additional-regions.html: Removed.
* fast/regions/shape-inside/shape-inside-on-first-region-block-content-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-first-region-block-content.html: Removed.
* fast/regions/shape-inside/shape-inside-on-first-region-inline-content-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html: Removed.
* fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions.html: Removed.
* fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-polygon-with-adjustment-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-polygon-with-adjustment.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-polygon-with-adjustment-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-polygon-with-adjustment.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content.html: Removed.
* fast/regions/shape-inside/shape-inside-on-regions.html: Removed.
* fast/regions/shape-inside/shape-inside-on-second-region-block-content-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-second-region-block-content.html: Removed.
* fast/regions/shape-inside/shape-inside-on-second-region-inline-content-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html: Removed.
* fast/regions/shape-inside/shape-inside-recursive-layout-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-recursive-layout.html: Removed.
* fast/regions/shape-inside/shape-inside-with-region-borders-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-with-region-borders.html: Removed.
* fast/regions/shape-inside/shape-inside-with-region-padding-expected.html: Removed.
* fast/regions/shape-inside/shape-inside-with-region-padding.html: Removed.
* 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: Removed.
* fast/shapes/parsing/parsing-shape-inside.html: Removed.
* fast/shapes/parsing/parsing-shape-lengths-expected.txt:
* fast/shapes/parsing/parsing-shape-lengths.html:
* fast/shapes/parsing/parsing-shape-padding-expected.txt: Removed.
* fast/shapes/parsing/parsing-shape-padding.html: Removed.
* fast/shapes/parsing/parsing-test-utils.js:
* fast/shapes/resources/multi-segment-polygon.js: Removed.
* fast/shapes/resources/simple-polygon.js: Removed.
* fast/shapes/resources/simple-rectangle.js: Removed.
* fast/shapes/resources/svg-shape-001.svg: Removed.
* fast/shapes/shape-inside/floats/shape-inside-floats-simple-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-floats-simple.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-left-triangle-block-content-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-left-triangle-block-content.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-left-triangle-inline-content-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-left-triangle-inline-content.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-block-content-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-block-content.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-inline-content-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-inline-content.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-block-content-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-block-content.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-inline-content-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-inline-content.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-vertical-lr-inline-content-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-vertical-lr-inline-content.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-right-triangle-block-content-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-right-triangle-block-content.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-right-triangle-inline-content-expected.html: Removed.
* fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-right-triangle-inline-content.html: Removed.
* fast/shapes/shape-inside/shape-inside-animation-expected.txt: Removed.
* fast/shapes/shape-inside/shape-inside-animation.html: Removed.
* fast/shapes/shape-inside/shape-inside-bottom-edge-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-bottom-edge.html: Removed.
* fast/shapes/shape-inside/shape-inside-box-sizing-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-box-sizing.html: Removed.
* fast/shapes/shape-inside/shape-inside-calc-crash-expected.txt: Removed.
* fast/shapes/shape-inside/shape-inside-calc-crash.html: Removed.
* fast/shapes/shape-inside/shape-inside-circle-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-circle-padding-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-circle-padding.html: Removed.
* fast/shapes/shape-inside/shape-inside-circle.html: Removed.
* fast/shapes/shape-inside/shape-inside-coincident-vertices-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-coincident-vertices.html: Removed.
* fast/shapes/shape-inside/shape-inside-collinear-vertices-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-collinear-vertices.html: Removed.
* fast/shapes/shape-inside/shape-inside-complex-polygon-001-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-complex-polygon-001.html: Removed.
* fast/shapes/shape-inside/shape-inside-complex-polygon-002-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-complex-polygon-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-complex-polygon-003-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-complex-polygon-003.html: Removed.
* fast/shapes/shape-inside/shape-inside-complex-polygon-004-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-complex-polygon-004.html: Removed.
* fast/shapes/shape-inside/shape-inside-content-box-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-content-box.html: Removed.
* fast/shapes/shape-inside/shape-inside-counterclockwise-polygon-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-counterclockwise-polygon.html: Removed.
* fast/shapes/shape-inside/shape-inside-dynamic-nested-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-dynamic-nested.html: Removed.
* fast/shapes/shape-inside/shape-inside-dynamic-shape-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-dynamic-shape.html: Removed.
* fast/shapes/shape-inside/shape-inside-dynamic-text-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-dynamic-text.html: Removed.
* fast/shapes/shape-inside/shape-inside-ellipse-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-ellipse-padding-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-ellipse-padding.html: Removed.
* fast/shapes/shape-inside/shape-inside-ellipse.html: Removed.
* fast/shapes/shape-inside/shape-inside-empty-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-empty-polygon-crash-expected.txt: Removed.
* fast/shapes/shape-inside/shape-inside-empty-polygon-crash.html: Removed.
* fast/shapes/shape-inside/shape-inside-empty-segments-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-empty-segments.html: Removed.
* fast/shapes/shape-inside/shape-inside-empty.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-001-horizontal-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-001-horizontal.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-001-vertical-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-001-vertical.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-002-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-003-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-003.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-004-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-004.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-crash-expected.txt: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-crash.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-reflex-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-first-fit-reflex.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-001-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-001.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-002-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-003-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-003.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-004-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-004.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-005-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-005.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-set-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-image-set.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-blocks-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-blocks.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-segments-001-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-segments-001.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-segments-002-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-segments-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-segments-003-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-segments-003.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-segments-004-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-multiple-segments-004.html: Removed.
* fast/shapes/shape-inside/shape-inside-offset-block-children-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-offset-block-children.html: Removed.
* fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html: Removed.
* fast/shapes/shape-inside/shape-inside-outside-shape-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-outside-shape.html: Removed.
* fast/shapes/shape-inside/shape-inside-overflow-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content.html: Removed.
* fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions.html: Removed.
* fast/shapes/shape-inside/shape-inside-overflow.html: Removed.
* fast/shapes/shape-inside/shape-inside-partial-fill-001-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-partial-fill-001.html: Removed.
* fast/shapes/shape-inside/shape-inside-partial-fill-002-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-partial-fill-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-percentage-auto-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-percentage-auto.html: Removed.
* fast/shapes/shape-inside/shape-inside-percentage-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-percentage.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-layout-expected.txt: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-layout.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-padding-001-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-padding-001.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-padding-002-expected.txt: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-padding-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-padding-003-expected.txt: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-padding-003.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-rectangle-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-rectangle.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-rounded-first-fit-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-rounded-first-fit.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-zoom-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-polygon-zoom.html: Removed.
* fast/shapes/shape-inside/shape-inside-rectilinear-polygon-001-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rectilinear-polygon-001.html: Removed.
* fast/shapes/shape-inside/shape-inside-rectilinear-polygon-002-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rectilinear-polygon-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-rectilinear-polygon-003-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rectilinear-polygon-003.html: Removed.
* fast/shapes/shape-inside/shape-inside-rectilinear-polygon-004-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-rectilinear-polygon-004.html: Removed.
* fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-recursive-layout.html: Removed.
* fast/shapes/shape-inside/shape-inside-regular-polygon16-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-regular-polygon16.html: Removed.
* fast/shapes/shape-inside/shape-inside-regular-polygon8-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-regular-polygon8.html: Removed.
* fast/shapes/shape-inside/shape-inside-shape-logical-top-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-shape-logical-top.html: Removed.
* fast/shapes/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout.html: Removed.
* fast/shapes/shape-inside/shape-inside-simple-polygon-001-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-simple-polygon-001.html: Removed.
* fast/shapes/shape-inside/shape-inside-simple-polygon-002-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-simple-polygon-002.html: Removed.
* fast/shapes/shape-inside/shape-inside-simple-polygon-003-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-simple-polygon-003.html: Removed.
* fast/shapes/shape-inside/shape-inside-simple-polygon-004-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-simple-polygon-004.html: Removed.
* fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html: Removed.
* fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-subsequent-blocks.html: Removed.
* fast/shapes/shape-inside/shape-inside-subtract-intervals-crash-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-subtract-intervals-crash.html: Removed.
* fast/shapes/shape-inside/shape-inside-text-align-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-text-align.html: Removed.
* fast/shapes/shape-inside/shape-inside-text-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-text.html: Removed.
* fast/shapes/shape-inside/shape-inside-vertical-text-expected.html: Removed.
* fast/shapes/shape-inside/shape-inside-vertical-text.html: Removed.
* platform/gtk/TestExpectations:
* platform/win/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#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="#trunkLayoutTestsfastshapesparsingparsingtestutilsjs">trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStatecpp">trunk/Source/WebCore/rendering/LayoutState.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStateh">trunk/Source/WebCore/rendering/LayoutState.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh">trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineBreakercpp">trunk/Source/WebCore/rendering/line/LineBreaker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthcpp">trunk/Source/WebCore/rendering/line/LineWidth.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthh">trunk/Source/WebCore/rendering/line/LineWidth.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/regions/shape-inside/</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="#trunkLayoutTestsfastshapesparsingparsingshapepaddingexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-padding-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapepaddinghtml">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-padding.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesresourcesmultisegmentpolygonjs">trunk/LayoutTests/fast/shapes/resources/multi-segment-polygon.js</a></li>
<li><a href="#trunkLayoutTestsfastshapesresourcessimplepolygonjs">trunk/LayoutTests/fast/shapes/resources/simple-polygon.js</a></li>
<li><a href="#trunkLayoutTestsfastshapesresourcessimplerectanglejs">trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js</a></li>
<li><a href="#trunkLayoutTestsfastshapesresourcessvgshape001svg">trunk/LayoutTests/fast/shapes/resources/svg-shape-001.svg</a></li>
<li>trunk/LayoutTests/fast/shapes/shape-inside/</li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/ChangeLog 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-26 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove shape-inside support
+ https://bugs.webkit.org/show_bug.cgi?id=130698
+
+ Reviewed by David Hyatt.
+
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
</ins><span class="cx"> 2014-03-25 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove the autotools build
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/ChangeLog 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,3 +1,246 @@
</span><ins>+2014-03-26 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove shape-inside support
+ https://bugs.webkit.org/show_bug.cgi?id=130698
+
+ Reviewed by David Hyatt.
+
+ * fast/regions/shape-inside/shape-inside-on-additional-regions-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-additional-regions.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-first-region-block-content-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-first-region-block-content.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-first-region-inline-content-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-multiple-autoheight-regions.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-bottom-positioned-multiple-shapes.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-polygon-with-adjustment-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-block-content-polygon-with-adjustment.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-bottom-positioned-multiple-shapes.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-polygon-with-adjustment-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content-polygon-with-adjustment.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions-inline-content.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-regions.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-second-region-block-content-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-second-region-block-content.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-second-region-inline-content-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html: Removed.
+ * fast/regions/shape-inside/shape-inside-recursive-layout-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-recursive-layout.html: Removed.
+ * fast/regions/shape-inside/shape-inside-with-region-borders-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-with-region-borders.html: Removed.
+ * fast/regions/shape-inside/shape-inside-with-region-padding-expected.html: Removed.
+ * fast/regions/shape-inside/shape-inside-with-region-padding.html: Removed.
+ * 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: Removed.
+ * fast/shapes/parsing/parsing-shape-inside.html: Removed.
+ * fast/shapes/parsing/parsing-shape-lengths-expected.txt:
+ * fast/shapes/parsing/parsing-shape-lengths.html:
+ * fast/shapes/parsing/parsing-shape-padding-expected.txt: Removed.
+ * fast/shapes/parsing/parsing-shape-padding.html: Removed.
+ * fast/shapes/parsing/parsing-test-utils.js:
+ * fast/shapes/resources/multi-segment-polygon.js: Removed.
+ * fast/shapes/resources/simple-polygon.js: Removed.
+ * fast/shapes/resources/simple-rectangle.js: Removed.
+ * fast/shapes/resources/svg-shape-001.svg: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-floats-simple-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-floats-simple.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-left-triangle-block-content-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-left-triangle-block-content.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-left-triangle-inline-content-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-left-triangle-inline-content.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-block-content-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-block-content.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-inline-content-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle-inline-content.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-lower-right-triangle.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-block-content-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-block-content.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-inline-content-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-inline-content.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-vertical-lr-inline-content-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-left-triangle-vertical-lr-inline-content.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-right-triangle-block-content-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-right-triangle-block-content.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-right-triangle-inline-content-expected.html: Removed.
+ * fast/shapes/shape-inside/floats/shape-inside-left-float-in-upper-right-triangle-inline-content.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-animation-expected.txt: Removed.
+ * fast/shapes/shape-inside/shape-inside-animation.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-bottom-edge-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-bottom-edge.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-box-sizing-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-box-sizing.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-calc-crash-expected.txt: Removed.
+ * fast/shapes/shape-inside/shape-inside-calc-crash.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-circle-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-circle-padding-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-circle-padding.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-circle.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-coincident-vertices-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-coincident-vertices.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-collinear-vertices-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-collinear-vertices.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-complex-polygon-001-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-complex-polygon-001.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-complex-polygon-002-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-complex-polygon-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-complex-polygon-003-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-complex-polygon-003.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-complex-polygon-004-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-complex-polygon-004.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-content-box-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-content-box.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-counterclockwise-polygon-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-counterclockwise-polygon.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-dynamic-nested-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-dynamic-nested.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-dynamic-shape-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-dynamic-shape.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-dynamic-text-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-dynamic-text.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-ellipse-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-ellipse-padding-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-ellipse-padding.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-ellipse.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-empty-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-empty-polygon-crash-expected.txt: Removed.
+ * fast/shapes/shape-inside/shape-inside-empty-polygon-crash.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-empty-segments-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-empty-segments.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-empty.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-001-horizontal-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-001-horizontal.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-001-vertical-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-001-vertical.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-002-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-003-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-003.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-004-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-004.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-crash-expected.txt: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-crash.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-reflex-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-first-fit-reflex.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-001-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-001.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-002-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-003-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-003.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-004-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-004.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-005-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-005.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-set-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-image-set.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks-vertical.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-segments-001-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-segments-001.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-segments-002-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-segments-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-segments-003-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-segments-003.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-segments-004-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-multiple-segments-004.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-offset-block-children-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-offset-block-children.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-outside-shape-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-outside-shape.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-overflow-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-block-content.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-overflow-fixed-dimensions.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-overflow.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-partial-fill-001-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-partial-fill-001.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-partial-fill-002-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-partial-fill-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-percentage-auto-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-percentage-auto.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-percentage-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-percentage.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-layout-expected.txt: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-layout.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-padding-001-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-padding-001.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-padding-002-expected.txt: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-padding-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-padding-003-expected.txt: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-padding-003.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-rectangle-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-rectangle.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-rounded-first-fit-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-rounded-first-fit.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-zoom-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-polygon-zoom.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rectilinear-polygon-001-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rectilinear-polygon-001.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rectilinear-polygon-002-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rectilinear-polygon-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rectilinear-polygon-003-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rectilinear-polygon-003.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rectilinear-polygon-004-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-rectilinear-polygon-004.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-recursive-layout.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-regular-polygon16-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-regular-polygon16.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-regular-polygon8-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-regular-polygon8.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-shape-logical-top-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-shape-logical-top.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-simple-polygon-001-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-simple-polygon-001.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-simple-polygon-002-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-simple-polygon-002.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-simple-polygon-003-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-simple-polygon-003.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-simple-polygon-004-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-simple-polygon-004.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-subsequent-blocks.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-subtract-intervals-crash-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-subtract-intervals-crash.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-text-align-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-text-align.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-text-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-text.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-vertical-text-expected.html: Removed.
+ * fast/shapes/shape-inside/shape-inside-vertical-text.html: Removed.
+ * platform/gtk/TestExpectations:
+ * platform/win/TestExpectations:
+
</ins><span class="cx"> 2014-03-26 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] getComputedStyle() must return the specified value for positioning properties
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapescssshapesdisabledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -5,12 +5,8 @@
</span><span class="cx">
</span><span class="cx"> PASS testInlineStyle("-webkit-shape-margin", "10px") is null
</span><span class="cx"> PASS testComputedStyle("-webkit-shape-margin", "10px") is "0px"
</span><del>-PASS testInlineStyle("-webkit-shape-padding", "10px") is null
-PASS testComputedStyle("-webkit-shape-padding", "10px") is "0px"
</del><span class="cx"> PASS testInlineStyle("-webkit-shape-outside", "circle(10px at 10px 10px)") is null
</span><span class="cx"> PASS testComputedStyle("-webkit-shape-outside", "circle(10px at 10px 10px)") is "none"
</span><del>-PASS testInlineStyle("-webkit-shape-inside", "circle(10px at 10px 10px)") is null
-PASS testComputedStyle("-webkit-shape-inside", "circle(10px at 10px 10px)") is "none"
</del><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 (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-disabled.html 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/css-shapes-disabled.html 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -30,10 +30,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> testStyle("-webkit-shape-margin", "10px", "0px");
</span><del>-testStyle("-webkit-shape-padding", "10px", "0px");
-
</del><span class="cx"> testStyle("-webkit-shape-outside", "circle(10px at 10px 10px)", "none");
</span><del>-testStyle("-webkit-shape-inside", "circle(10px at 10px 10px)", "none");
</del><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 (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-enabled-expected.txt 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/css-shapes-enabled-expected.txt 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -5,12 +5,8 @@
</span><span class="cx">
</span><span class="cx"> PASS testInlineStyle("-webkit-shape-margin", "10px") is "10px"
</span><span class="cx"> PASS testComputedStyle("-webkit-shape-margin", "10px") is "10px"
</span><del>-PASS testInlineStyle("-webkit-shape-padding", "10px") is "10px"
-PASS testComputedStyle("-webkit-shape-padding", "10px") is "10px"
</del><span class="cx"> PASS testInlineStyle("-webkit-shape-outside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
</span><span class="cx"> PASS testComputedStyle("-webkit-shape-outside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
</span><del>-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)"
</del><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 (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-enabled.html 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/css-shapes-enabled.html 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -27,10 +27,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> testStyle("-webkit-shape-margin", "10px", "10px");
</span><del>-testStyle("-webkit-shape-padding", "10px", "10px");
-
</del><span class="cx"> testStyle("-webkit-shape-outside", "circle(10px at 10px 10px)", "circle(10px at 10px 10px)");
</span><del>-testStyle("-webkit-shape-inside", "circle(10px at 10px 10px)", "circle(10px at 10px 10px)");
</del><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="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,276 +0,0 @@
</span><del>-Testing parsing of the -webkit-shape-inside property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS getCSSText("-webkit-shape-inside", "none") is "none"
-PASS getComputedStyleValue("-webkit-shape-inside", "none") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px)") is "inset(10px 10px 10px 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px)") is "inset(10px 10px 10px 10px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px 9px)") is "inset(10px 9px 10px 9px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 9px)") is "inset(10px 9px 10px 9px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px 9px 8px)") is "inset(10px 9px 8px 9px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 9px 8px)") is "inset(10px 9px 8px 9px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px 20px 30px 40px)") is "inset(10px 20px 30px 40px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 20px 30px 40px)") is "inset(10px 20px 30px 40px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px 7px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px 7px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px 7px 6px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 7px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px 7px 6px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 7px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px 7px 6px 5px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 5px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px 7px 6px 5px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 5px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px 5px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 6px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px 5px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 6px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px 5px 4px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 4px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px 5px 4px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 4px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 6px 6px 6px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 6px 6px 6px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 6px 5px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 6px 5px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px 4px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 4px 5px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px 4px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 4px 5px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px 4px 3px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 4px 3px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px 4px 3px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 4px 3px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 5px 5px 5px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 5px 5px 5px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 5px 4px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 5px 4px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 3px 4px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 3px 4px)"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 3px 2px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)") is "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 3px 2px)"
-PASS getCSSText("-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)"
-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)"
-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)"
-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)"
-PASS getCSSText("-webkit-shape-inside", "circle()") is "circle(at 50% 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle()") is "circle(closest-side at 50% 50%)"
-PASS getCSSText("-webkit-shape-inside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
-PASS getCSSText("-webkit-shape-inside", "circle(closest-side)") is "circle(closest-side at 50% 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(closest-side)") is "circle(closest-side at 50% 50%)"
-PASS getCSSText("-webkit-shape-inside", "circle(10px)") is "circle(10px at 50% 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px)") is "circle(10px at 50% 50%)"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px)") is "circle(10px at 10px 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px)") is "circle(10px at 10px 50%)"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
-PASS getCSSText("-webkit-shape-inside", "circle(at 10px)") is "circle(at 10px 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px)") is "circle(closest-side at 10px 50%)"
-PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px)") is "circle(at 10px 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px)") is "circle(closest-side at 10px 10px)"
-PASS getCSSText("-webkit-shape-inside", "circle(at top left)") is "circle(at 0% 0%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at top left)") is "circle(closest-side at 0% 0%)"
-PASS getCSSText("-webkit-shape-inside", "circle(at right bottom)") is "circle(at 100% 100%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at right bottom)") is "circle(closest-side at 100% 100%)"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at left top 10px)") is "circle(10px at 0% 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at left top 10px)") is "circle(10px at 0% 10px)"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at top 10px left 10px)") is "circle(10px at 10px 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at top 10px left 10px)") is "circle(10px at 10px 10px)"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at right 10% bottom 10%)") is "circle(10px at 90% 90%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at right 10% bottom 10%)") is "circle(10px at 90% 90%)"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at right 0px bottom 0px)") is "circle(10px at 100% 100%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at right 0px bottom 0px)") is "circle(10px at 100% 100%)"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
-PASS getCSSText("-webkit-shape-inside", "ellipse()") is "ellipse(at 50% 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is "ellipse(closest-side closest-side at 50% 50%)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px)") is "ellipse(10px at 50% 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px)") is "ellipse(10px closest-side at 50% 50%)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px)") is "ellipse(10px 20px at 50% 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px)") is "ellipse(10px 20px at 50% 50%)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px at 10px)") is "ellipse(10px at 10px 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px at 10px)") is "ellipse(10px closest-side at 10px 50%)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px at 10px)") is "ellipse(10px 20px at 10px 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px at 10px)") is "ellipse(10px 20px at 10px 50%)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px at 10px 10px)") is "ellipse(10px at 10px 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px at 10px 10px)") is "ellipse(10px closest-side at 10px 10px)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(at 10px)") is "ellipse(at 10px 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(at 10px)") is "ellipse(closest-side closest-side at 10px 50%)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(at 10px 10px)") is "ellipse(at 10px 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(at 10px 10px)") is "ellipse(closest-side closest-side at 10px 10px)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(at top left)") is "ellipse(at 0% 0%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(at top left)") is "ellipse(closest-side closest-side at 0% 0%)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(at right bottom)") is "ellipse(at 100% 100%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(at right bottom)") is "ellipse(closest-side closest-side at 100% 100%)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px at left top 10px)") is "ellipse(10px at 0% 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px at left top 10px)") is "ellipse(10px closest-side at 0% 10px)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px at top 10px left 10px)") is "ellipse(10px at 10px 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px at top 10px left 10px)") is "ellipse(10px closest-side at 10px 10px)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px at right 10px bottom 10px)") is "ellipse(10px at right 10px bottom 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px at right 10px bottom 10px)") is "ellipse(10px closest-side at right 10px bottom 10px)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px at left top 10px)") is "ellipse(10px 20px at 0% 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px at left top 10px)") is "ellipse(10px 20px at 0% 10px)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px at top 10px left 10px)") is "ellipse(10px 20px at 10px 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px at top 10px left 10px)") is "ellipse(10px 20px at 10px 10px)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px at right 10px bottom 10px)") is "ellipse(10px 20px at right 10px bottom 10px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px at right 10px bottom 10px)") is "ellipse(10px 20px at right 10px bottom 10px)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 10px at right 10% bottom 10%)") is "ellipse(10px 10px at 90% 90%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 10px at right 10% bottom 10%)") is "ellipse(10px 10px at 90% 90%)"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 10px at right 0px bottom 0px)") is "ellipse(10px 10px at 100% 100%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 10px at right 0px bottom 0px)") is "ellipse(10px 10px at 100% 100%)"
-PASS getCSSText("-webkit-shape-inside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
-PASS getCSSText("-webkit-shape-inside", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)") is "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)") is "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
-PASS getCSSText("-webkit-shape-inside", "content-box") is "content-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "content-box") is "content-box"
-PASS getCSSText("-webkit-shape-inside", "padding-box") is "padding-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "padding-box") is "padding-box"
-PASS getCSSText("-webkit-shape-inside", "border-box") is "border-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "border-box") is "border-box"
-PASS getCSSText("-webkit-shape-inside", "margin-box") is "margin-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "margin-box") is "margin-box"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(0px 0px, 10px 10px, 10px 0px) content-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(0px 0px, 10px 10px, 10px 0px) content-box"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(0px 0px, 10px 10px, 10px 0px) border-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(0px 0px, 10px 10px, 10px 0px) border-box"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"
-PASS getCSSText("-webkit-shape-inside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "content-box polygon(0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) content-box"
-PASS getCSSText("-webkit-shape-inside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "padding-box polygon(0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"
-PASS getCSSText("-webkit-shape-inside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "border-box polygon(0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) border-box"
-PASS getCSSText("-webkit-shape-inside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "margin-box polygon(0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"
-PASS getCSSText("-webkit-shape-inside", "outside-shape") is "outside-shape"
-PASS getComputedStyleValue("-webkit-shape-inside", "outside-shape") is "outside-shape"
-PASS removeBaseURL(getCSSText("-webkit-shape-inside", "url('image')")) is "url(image)"
-PASS removeBaseURL(getComputedStyleValue("-webkit-shape-inside", "url('image')")) is "url(image)"
-PASS getCSSText("-webkit-shape-inside", "calc()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is "none"
-PASS getCSSText("-webkit-shape-inside", "auto") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "auto") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset()") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px, 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px, 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px 20px, 30px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 20px, 30px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px, 20px 30px 40px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px, 20px 30px 40px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px 20px 30px 40px 50px 60px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 20px 30px 40px 50px 60px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(round)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(round)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(round 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(round 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 10px /)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 10px /)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round 20px 30px 40px 50px 60px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 20px 30px 40px 50px 60px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round /)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round /)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(10px round / 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round / 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(/)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(/)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(/ 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(/ 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "inset(round /)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(round /)") is "none"
-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 at 10px 10px 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at center center 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at center center 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at 10% left)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10% left)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px at center)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(at center center 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px closest-side)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px closest-side)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(10px at)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at)") is "none"
-PASS getCSSText("-webkit-shape-inside", "circle(at)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at)") 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 at 10px 10px 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px at 10px 10px 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px at 10px 10px at center)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px at 10px 10px at center)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px at center center 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px at center center 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 10px at 10% left)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 10px at 10% left)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px 30px at center center 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px at center center 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(at 10px 10px 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(at 10px 10px 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(at 10px 10px at center)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(at 10px 10px at center)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(at center center 10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(at center center 10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px at)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px at)") is "none"
-PASS getCSSText("-webkit-shape-inside", "ellipse(at)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(at)") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon()") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon()") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero)") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon(evenodd)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd)") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon(10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero,10px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero,10px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon(evenodd,12px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd,12px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is "none"
-PASS getCSSText("-webkit-shape-inside", "content-box content-box") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "content-box content-box") is "none"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "none"
-PASS getCSSText("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is "none"
-PASS getCSSText("-webkit-shape-inside", "none content-box") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "none content-box") is "none"
-PASS getCSSText("-webkit-shape-inside", "url('shape.svg') content-box") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is "none"
-PASS getCSSText("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
-PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "none"
-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)"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "", "inherit") is "parent: none, child: none"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "none", "inherit") is "parent: none, child: none"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsidehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="parsing-test-utils.js"></script>
-<script>
-description('Testing parsing of the -webkit-shape-inside property.');
-
-// The test functions and globals used here are defined parsing-test-utils.js.
-
-validShapeValues.concat("outside-shape").forEach(function(elt, i, a) {
- var value = (elt instanceof Array) ? elt[0] : elt;
- var expectedValue = (elt instanceof Array) ? elt[1] : elt;
- var computedValue = (elt instanceof Array && elt.length > 2) ? elt[2] : expectedValue;
- testShapeSpecifiedProperty("-webkit-shape-inside", value, expectedValue);
- testShapeComputedProperty("-webkit-shape-inside", value, computedValue);
-});
-
-testLocalURLShapeProperty("-webkit-shape-inside", "url(\'image\')", "url(image)");
-
-invalidShapeValues.forEach(function(value, i, a) {
- testShapePropertyParsingFailure("-webkit-shape-inside", value, "none")
-});
-
-applyToEachArglist(
- testNotInheritedShapeProperty,
- [// [property, parentValue, childValue, expectedValue]
- ["-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)"],
- ["-webkit-shape-inside", "", "inherit", "parent: none, child: none"],
- ["-webkit-shape-inside", "none", "inherit", "parent: none, child: none"]]
-);
-</script>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapelengthsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -3,52 +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 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)"
-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)"
-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)"
-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)"
-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)"
-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)"
-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%)"
-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%)"
-PASS getStyleValue("-webkit-shape-inside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
-PASS getStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(10% 20%, 30% 40%, 40% 50%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "circle(150% at 50% 100%)") is "circle(150% at 50% 100%)"
-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%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(10% 20%, 30% 40%, 40% 50%)"
-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"
-PASS getStyleValue("-webkit-shape-inside", "inset(1cm 1mm 1in 1px round 1pt -1pc)") is null
-PASS getComputedStyleValue("-webkit-shape-inside", "inset(1cm 1mm 1in 1px round 1pt -1pc)") 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"
-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"
</del><ins>+PASS getStyleValue("-webkit-shape-outside", "circle(0 at 0 0)") is "circle(0px at 0% 0%)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1px at +1px -1px)") is "circle(1px at 1px -1px)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1.5px at -1.5px +1.5px)") is "circle(1.5px at -1.5px 1.5px)"
+PASS getStyleValue("-webkit-shape-outside", "circle(.5px at -.5px +.5px)") is "circle(0.5px at -0.5px 0.5px)"
+PASS getStyleValue("-webkit-shape-outside", "inset(1cm 1mm 1in 1px round 1pt 1pc)") is "inset(1cm 1mm 1in 1px round 1pt 1pc 1pt 1pc / 1pt 1pc 1pt 1pc)"
+PASS getStyleValue("-webkit-shape-outside", "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)"
+PASS getStyleValue("-webkit-shape-outside", "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)"
+PASS getStyleValue("-webkit-shape-outside", "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)"
+PASS getStyleValue("-webkit-shape-outside", "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)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1em at -1em +1em)") is "circle(1em at -1em 1em)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1.5em at -1.5em +1.5em)") is "circle(1.5em at -1.5em 1.5em)"
+PASS getStyleValue("-webkit-shape-outside", "circle(.5em at -.5em +.5em)") is "circle(0.5em at -0.5em 0.5em)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1ex at 1ex 1ex)") is "circle(1ex at 1ex 1ex)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1rem at 1rem 1rem)") is "circle(1rem at 1rem 1rem)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(1.5em at .5em 1em)") is "circle(12px at 4px 8px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(1.5rem at .5rem 1rem)") is "circle(24px at 8px 16px)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1vw at 1vw 1vw)") is "circle(1vw at 1vw 1vw)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1vh at 1vh 1vh)") is "circle(1vh at 1vh 1vh)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1vmin at 1vmin 1vmin)") is "circle(1vmin at 1vmin 1vmin)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(1.5vw at .5vw 1vw)") is "circle(1.5vw at 0.5vw 1vw)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(1.5vh at .5vh 1vh)") is "circle(1.5vh at 0.5vh 1vh)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(1.5vmin at .5vmin 1vmin)") is "circle(1.5vmin at 0.5vmin 1vmin)"
+PASS getStyleValue("-webkit-shape-outside", "circle(100% at 100% 100%)") is "circle(100% at 100% 100%)"
+PASS getStyleValue("-webkit-shape-outside", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)"
+PASS getStyleValue("-webkit-shape-outside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
+PASS getStyleValue("-webkit-shape-outside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(10% 20%, 30% 40%, 40% 50%)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(150% at 50% 100%)") is "circle(150% at 50% 100%)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)"
+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
+PASS getComputedStyleValue("-webkit-shape-outside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(10% 20%, 30% 40%, 40% 50%)"
+PASS getStyleValue("-webkit-shape-outside", "circle(1 at 1px 1px)") is null
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(1 at 1px 1px)") is "none"
+PASS getStyleValue("-webkit-shape-outside", "circle(px at 1px 1px)") is null
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(px at 1px 1px)") is "none"
+PASS getStyleValue("-webkit-shape-outside", "circle(1p at 1px 1px)") is null
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(1p at 1px 1px)") is "none"
+PASS getStyleValue("-webkit-shape-outside", "circle(calc( at 1px 1px))") is null
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(calc( at 1px 1px))") is "none"
+PASS getStyleValue("-webkit-shape-outside", "circle(-1.5px at -1.5px +1.5px)") is null
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(-1.5px at -1.5px +1.5px)") is "none"
+PASS getStyleValue("-webkit-shape-outside", "inset(1cm 1mm 1in 1px round 1pt -1pc)") is null
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(1cm 1mm 1in 1px round 1pt -1pc)") is "none"
+PASS getStyleValue("-webkit-shape-outside", "ellipse(-1em 1em at 1em 1em)") is null
+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(-1em 1em at 1em 1em)") is "none"
+PASS getStyleValue("-webkit-shape-outside", "ellipse(1em -1em at 1em 1em)") is null
+PASS getComputedStyleValue("-webkit-shape-outside", "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 (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -22,12 +22,12 @@
</span><span class="cx">
</span><span class="cx"> function testStyleValue(value, expected) {
</span><span class="cx"> if (expected === null)
</span><del>- shouldBeNull('getStyleValue("-webkit-shape-inside", "' + value + '")');
</del><ins>+ shouldBeNull('getStyleValue("-webkit-shape-outside", "' + value + '")');
</ins><span class="cx"> else
</span><del>- shouldBeEqualToString('getStyleValue("-webkit-shape-inside", "' + value + '")', expected);
</del><ins>+ shouldBeEqualToString('getStyleValue("-webkit-shape-outside", "' + value + '")', expected);
</ins><span class="cx"> }
</span><span class="cx"> function testComputedStyleValue(value, expected) {
</span><del>- testShapeComputedProperty("-webkit-shape-inside", value, expected);
</del><ins>+ testShapeComputedProperty("-webkit-shape-outside", value, expected);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function testInvalidValue(property, value) {
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapepaddingexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-padding-expected.txt (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-padding-expected.txt 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-padding-expected.txt 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-Test parsing of the CSS shape-padding property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS getCSSText("-webkit-shape-padding", "1.5ex") is "1.5ex"
-PASS getCSSText("-webkit-shape-padding", "2em") is "2em"
-PASS getCSSText("-webkit-shape-padding", "2.5in") is "2.5in"
-PASS getCSSText("-webkit-shape-padding", "3cm") is "3cm"
-PASS getCSSText("-webkit-shape-padding", "3.5mm") is "3.5mm"
-PASS getCSSText("-webkit-shape-padding", "4pt") is "4pt"
-PASS getCSSText("-webkit-shape-padding", "4.5pc") is "4.5pc"
-PASS getCSSText("-webkit-shape-padding", "5px") is "5px"
-PASS getCSSText("-webkit-shape-padding", "0") is "0px"
-PASS getCSSText("-webkit-shape-padding", "-5px") is ""
-PASS getCSSText("-webkit-shape-padding", "none") is ""
-PASS getCSSText("-webkit-shape-padding", "120%") is ""
-PASS getCSSText("-webkit-shape-padding", "'string'") is ""
-PASS getComputedStyleValue("-webkit-shape-padding", "0") is "0px"
-PASS getComputedStyleValue("-webkit-shape-padding", "1px") is "1px"
-PASS getComputedStyleValue("-webkit-shape-padding", "-5em") is "0px"
-PASS getComputedStyleValue("-webkit-shape-padding", "identifier") is "0px"
-PASS getComputedStyleValue("-webkit-shape-padding", "'string'") is "0px"
-PASS getChildComputedStyle("-webkit-shape-padding", "0", "0") is "0px"
-PASS getChildComputedStyle("-webkit-shape-padding", "0", "1px") is "1px"
-PASS getChildComputedStyle("-webkit-shape-padding", "1px", "-1em") is "0px"
-PASS getChildComputedStyle("-webkit-shape-padding", "2px", "1px") is "1px"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapepaddinghtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-padding.html (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-padding.html 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-padding.html 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="parsing-test-utils.js"></script>
-<script>
-description('Test parsing of the CSS shape-padding property.');
-
-// The test functions and globals used here are defined parsing-test-utils.js.
-
-validShapeLengths.forEach(function(value, i, a) {
- testShapeSpecifiedProperty("-webkit-shape-padding", value, value);
-});
-
-testShapeSpecifiedProperty("-webkit-shape-padding", "0", "0px");
-
-invalidShapeLengths.forEach(function(value, i, a) {
- testShapeSpecifiedProperty("-webkit-shape-padding", value, "");
-});
-
-applyToEachArglist(
- testShapeComputedProperty,
- [// [property, value, expectedValue]
- ["-webkit-shape-padding", "0", "0px"],
- ["-webkit-shape-padding", "1px", "1px"],
- ["-webkit-shape-padding", "-5em", "0px"],
- ["-webkit-shape-padding", "identifier", "0px"],
- ["-webkit-shape-padding", "\'string\'", "0px"]]
-);
-
-applyToEachArglist(
- testNotInheritedShapeChildProperty,
- [// [property, parentValue, childValue, expectedChildValue]
- ["-webkit-shape-padding", "0", "0", "0px"],
- ["-webkit-shape-padding", "0", "1px", "1px"],
- ["-webkit-shape-padding", "1px", "-1em", "0px"],
- ["-webkit-shape-padding", "2px", "1px", "1px"]]
-);
-</script>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingtestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Valid values for both shape-inside and shape-outside. Two values are specified when the shape property value
</del><ins>+// Valid values for shape-outside. Two values are specified when the shape property value
</ins><span class="cx"> // differs from the specified value. Three values are specified when the computed shape property value differs
</span><span class="cx"> // from the specified value.
</span><span class="cx"> // eg: "specified value/CSS Text value/computed style value"
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> ["margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "margin-box polygon(0px 0px, 10px 10px, 10px 0px)", "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"]
</span><span class="cx"> ];
</span><span class="cx">
</span><del>-// Invalid values for both shape-inside and shape-outside. When an invalid shape value is specified, the
</del><ins>+// Invalid values for shape-outside. When an invalid shape value is specified, the
</ins><span class="cx"> // shape property's computed value is the same as its default.
</span><span class="cx"> var invalidShapeValues = [
</span><span class="cx"> "calc()",
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesresourcesmultisegmentpolygonjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/resources/multi-segment-polygon.js (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/resources/multi-segment-polygon.js 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/resources/multi-segment-polygon.js 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-function generatePolygon(width, height, fontSize, points, content, elementId) {
- var div = createOrInsert(elementId);
- var polygon = points.map(function(elem, index, array) {
- return elem.toString() + 'px' + (index < array.length - 1 && index % 2 == 1 ? ',' : '');
- }).join(' ');
- polygon = 'polygon(' + polygon + ')';
- div.style.setProperty('-webkit-shape-inside', polygon);
- div.style.setProperty('width', width + 'px');
- div.style.setProperty('height', height + 'px');
- div.style.setProperty('font', fontSize + 'px/1 Ahem, sans-serif');
- div.style.setProperty('color', 'green');
- div.style.setProperty('word-wrap', 'break-word');
- div.innerHTML = content;
-}
-
-function simulateWithText(width, height, fontSize, content, elementId) {
- var div = createOrInsert(elementId);
- div.style.setProperty('width', width + 'px');
- div.style.setProperty('height', height + 'px');
- div.style.setProperty('font', fontSize + 'px/1 Ahem, sans-serif');
- div.style.setProperty('color', 'green');
- if (content instanceof Array) {
- div.style.setProperty('white-space', 'pre');
- content = content.join('\n');
- }
- div.innerHTML = content;
-}
-
-function createOrInsert(elementId) {
- if (elementId)
- return document.getElementById(elementId);
-
- var div = document.createElement('div');
- if (document.body.childNodes.length)
- document.body.insertBefore(div, document.body.childNodes[0]);
- else
- document.body.appendChild(div);
- return div;
-}
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesresourcessimplepolygonjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/resources/simple-polygon.js (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/resources/simple-polygon.js 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/resources/simple-polygon.js 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,248 +0,0 @@
</span><del>-// The functions in this file are intended to be used to test non-complex polygons
-// where horizontal lines that overlap the polygon only cross the polygon twice.
-
-function createPolygon(vertices) {
- var xCoordinates = vertices.map( function(p) { return p.x; } );
- var yCoordinates = vertices.map( function(p) { return p.y; } );
- return {
- vertices: vertices,
- minX: Math.min.apply(null, xCoordinates),
- maxX: Math.max.apply(null, xCoordinates),
- minY: Math.min.apply(null, yCoordinates),
- maxY: Math.max.apply(null, yCoordinates)
- };
-}
-
-function createRegularPolygonVertices(size, nSides)
-{
- var radius = size / (2 * Math.cos(Math.PI / nSides));
- var inset = size / 2 + 20;
- var vertices = [];
-
- for (var i = 0; i < nSides/2; i++) {
- var a = (1 + 2*i) * (Math.PI / nSides);
- vertices[i] = {x: Math.floor(radius * Math.cos(a)), y: Math.floor(radius * Math.sin(a))};
- vertices[nSides - i - 1] = {x: vertices[i].x, y: -vertices[i].y} // Y axis symmetry
- }
-
- for (var i = 0; i < nSides; i++) {
- vertices[i].x += inset;
- vertices[i].y += inset;
- }
-
- return vertices;
-}
-
-// Return two X intercepts of the horizontal line at y. We're assuming that the polygon
-// has 0 or 2 intercepts for all y. Of course this isn't true for polygons in general,
-// just the ones used by the test cases supported by this file.
-
-function polygonXIntercepts(polygon, y) {
- var vertices = polygon.vertices;
- var foundXIntercept = false;
- var interceptsMinX, interceptsMaxX;
-
- for(var i = 0; i < vertices.length; i++) {
- var v1 = vertices[i];
- var v2 = vertices[(i + 1) % vertices.length];
-
- if (Math.max(v1.y, v2.y) < y || Math.min(v1.y, v2.y) > y)
- continue;
-
- if (v1.y == y && v2.y == y) { // horizontal edge
- if (y != polygon.maxY)
- continue;
-
- if (!foundXIntercept) {
- interceptsMinX = Math.min(v1.x, v2.x);
- interceptsMaxX = Math.max(v1.x, v2.x);
- foundXIntercept = true;
- }
- else {
- interceptsMinX = Math.min(v1.x, v2.x, interceptsMinX);
- interceptsMaxX = Math.max(v1.x, v2.x, interceptsMaxX);
- }
- }
- else {
- var interceptX;
-
- if (v1.y == y)
- interceptX = v1.x;
- else if (v2.y == y)
- interceptX = v2.x;
- else
- interceptX = ((y - v1.y) * (v2.x - v1.x) / (v2.y - v1.y)) + v1.x;
-
- if (!foundXIntercept) {
- interceptsMinX = interceptsMaxX = interceptX;
- foundXIntercept = true;
- }
- else {
- interceptsMinX = Math.min(interceptX, interceptsMinX);
- interceptsMaxX = Math.max(interceptX, interceptsMaxX);
- }
- }
- }
-
- if (!foundXIntercept)
- return [];
-
- return [SubPixelLayout.snapToLayoutUnit(interceptsMinX), SubPixelLayout.snapToLayoutUnit(interceptsMaxX)];
-}
-
-function polygonLineIntercepts(polygon, y, lineHeight) {
- var i1 = polygonXIntercepts(polygon, y);
- var i2 = polygonXIntercepts(polygon, y + lineHeight);
-
- if (i1.length < 2)
- return i2;
- if (i2.length < 2)
- return i1;
-
- return [Math.max(i1[0], i2[0]), Math.min(i1[1], i2[1])];
-}
-
-// Generate an "X X ..." string that contains enough characters to fill the polygon. Each
-// character occupies a lineHeight size square cell, the top of first line of characters is aligned
-// with the the polygon's bounds minimum Y value, and each line of characters fills the interior
-// of the polygon.
-
-function generatePolygonContentString(polygon, lineHeight) {
- var result = "";
-
- for (var y = polygon.minY; y < polygon.maxY; y += lineHeight) {
- var xIntercepts = polygonLineIntercepts(polygon, y, lineHeight);
- var lengthInCells = Math.floor(xIntercepts[1] / lineHeight) - Math.ceil(xIntercepts[0] / lineHeight);
- for (var i = 0; i < lengthInCells / 2; i++)
- result += "X "; // all lines end in a space, to enable line breaking
- }
-
- return result;
-}
-
-function generatePolygonShapeInsideElement(elementId, stylesheet, polygon, lineHeight) {
- var verticesString = polygon.vertices.map( function(p) { return p.x + "px " + p.y + "px"; } ).join(", ");
- stylesheet.insertRule("#" + elementId + " { "
- + "-webkit-shape-inside: polygon(" + verticesString + "); "
- + "width: " + polygon.maxX + "px; "
- + "height: " + polygon.maxY + "px; "
- + "font: " + lineHeight + "px/1 Ahem, sans-serif; }");
- stylesheet.insertRule("#" + elementId + " p { -webkit-margin-before: 0; word-wrap: break-word; letter-spacing: 0;}");
-
- var text = document.createTextNode(generatePolygonContentString(polygon, lineHeight));
- var p = document.createElement("p");
- p.appendChild(text);
-
- var element = document.getElementById(elementId);
- element.appendChild(p);
-}
-
-function generatePolygonSVGElements(elementId, stylesheet, polygon, lineHeight) {
- var svgNS = "http://www.w3.org/2000/svg";
-
- var svgPolygon = document.createElementNS(svgNS, "polygon");
- svgPolygon.setAttribute("points", polygon.vertices.map( function(p) { return p.x + "," + p.y; } ).join(" "));
- svgPolygon.setAttribute("fill", "#636363");
-
- var svgElement = document.getElementById(elementId);
- svgElement.style.width = polygon.maxX + "px";
- svgElement.style.height = polygon.maxY + "px";
- svgElement.appendChild(svgPolygon);
-}
-
-function simulatePolygonShape(elementId, stylesheet, polygon, lineHeight) {
- var width = Math.ceil(polygon.maxX);
- var height = Math.ceil(polygon.maxY);
- stylesheet.insertRule("#" + elementId + " { width: " + width + "px; height: " + height + "px; font: " + lineHeight + "px/1 Ahem, sans-serif;}");
- stylesheet.insertRule("#" + elementId + " .float { height: " + lineHeight + "px; }");
- stylesheet.insertRule("#" + elementId + " .left { float: left; clear: left; }");
- stylesheet.insertRule("#" + elementId + " .right { float: right; clear: right; }");
- stylesheet.insertRule("#" + elementId + " p { -webkit-margin-before: 0; word-wrap: break-word; letter-spacing: 0; }");
-
- var element = document.getElementById(elementId);
-
- var paddingTop = document.createElement("div");
- paddingTop.setAttribute("class", "float left");
- paddingTop.style.width = width + "px";
- paddingTop.style.height = polygon.minY + "px";
- element.appendChild(paddingTop);
-
- for (var y = polygon.minY; y < polygon.maxY; y += lineHeight) {
- var xIntercepts = polygonLineIntercepts(polygon, y, lineHeight);
- var left = xIntercepts[0];
- var right = xIntercepts[1];
-
- var paddingLeft = document.createElement("div");
- paddingLeft.setAttribute("class", "float left");
- paddingLeft.style.width = left + "px";
- element.appendChild(paddingLeft);
-
- var paddingRight = document.createElement("div");
- paddingRight.setAttribute("class", "float right");
- paddingRight.style.width = width - right + "px";
- element.appendChild(paddingRight);
- }
-}
-
-function generateSimulatedPolygonShapeInsideElement(elementId, stylesheet, polygon, lineHeight) {
- var width = Math.ceil(polygon.maxX);
- var height = Math.ceil(polygon.maxY);
-
- stylesheet.insertRule("#" + elementId + " { width: " + width + "px; height: " + height + "px; font: " + lineHeight + "px/1 Ahem, sans-serif;}");
- stylesheet.insertRule("#" + elementId + " .float { height: " + lineHeight + "px; }");
- stylesheet.insertRule("#" + elementId + " .left { float: left; clear: left; }");
- stylesheet.insertRule("#" + elementId + " .right { float: right; clear: right; }");
- stylesheet.insertRule("#" + elementId + " p { -webkit-margin-before: 0; word-wrap: break-word; letter-spacing: 0; }");
-
- var element = document.getElementById(elementId);
-
- var paddingTop = document.createElement("div");
- paddingTop.setAttribute("class", "float left");
- paddingTop.style.width = width + "px";
- paddingTop.style.height = polygon.minY + "px";
- element.appendChild(paddingTop);
-
- for (var y = polygon.minY; y < polygon.maxY; y += lineHeight) {
- var xIntercepts = polygonLineIntercepts(polygon, y, lineHeight);
- var left = xIntercepts[0];
- var right = xIntercepts[1];
-
- var paddingLeft = document.createElement("div");
- paddingLeft.setAttribute("class", "float left");
- paddingLeft.style.width = left + "px";
- element.appendChild(paddingLeft);
-
- var paddingRight = document.createElement("div");
- paddingRight.setAttribute("class", "float right");
- paddingRight.style.width = width - right + "px";
- element.appendChild(paddingRight);
- }
-
- var text = document.createTextNode(generatePolygonContentString(polygon, lineHeight));
- var p = document.createElement("p");
- p.appendChild(text);
-
- var element = document.getElementById(elementId);
- element.appendChild(p);
-}
-
-function positionInformativeText(elementId, stylesheet, polygon, lineHeight)
-{
- stylesheet.insertRule("#" + elementId + " { position: absolute; top: " + (polygon.maxY + lineHeight) + "px;}");
-}
-
-function createPolygonShapeInsideTestCase() {
- var stylesheet = document.getElementById("stylesheet").sheet;
- var polygon = createPolygon(vertices);
- generatePolygonShapeInsideElement("polygon-shape-inside", stylesheet, polygon, lineHeight);
- generatePolygonSVGElements("polygon-svg-shape", stylesheet, polygon, lineHeight);
- positionInformativeText("informative-text", stylesheet, polygon, lineHeight)
-}
-
-function createPolygonShapeInsideTestCaseExpected() {
- var stylesheet = document.getElementById("stylesheet").sheet;
- var polygon = createPolygon(vertices);
- generateSimulatedPolygonShapeInsideElement("polygon-shape-inside", stylesheet, polygon, lineHeight);
- generatePolygonSVGElements("polygon-svg-shape", stylesheet, polygon, lineHeight);
- positionInformativeText("informative-text", stylesheet, polygon, lineHeight)
-}
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesresourcessimplerectanglejs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-function drawTextRectangle(elementId, stylesheetId, bounds, shapeBounds, units, content) {
- var elem;
- if (elementId)
- elem = document.getElementById(elementId);
- else {
- elem = document.createElement('div');
- elem.setAttribute('id', elementId);
- document.appendChild(elem);
- }
-
- var stylesheet = document.getElementById(stylesheetId).sheet;
- var rules = [];
- for (var i in bounds)
- rules.push(i + ':' + bounds[i] + units);
- 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 + ')');
- rules.push('position: relative');
- rules.push('overflow-wrap: break-word');
- stylesheet.insertRule('#' + elementId + '{' + rules.join(';') + '}');
-
- rules = [];
- rules.push('left: ' + (shapeBounds.x - 1) + units, 'top: ' + (shapeBounds.y - 1) + units, 'width: ' + shapeBounds.width + units, 'height: ' + shapeBounds.height + units);
- rules.push('position: absolute', 'display: block', 'content: \' \'');
- rules.push('border: 1px solid blue');
- stylesheet.insertRule('#' + elementId + ':before{' + rules.join(';') + '}');
- if (content)
- elem.innerHTML = content;
-}
-
-function drawExpectedRectangle(elementId, stylesheetId, bounds, shapeBounds, units, content) {
- var elem;
- if (elementId)
- elem = document.getElementById(elementId);
- else {
- elem = document.createElement('div');
- elem.setAttribute('id', elementId);
- document.appendChild(elem);
- }
-
- var stylesheet = document.getElementById(stylesheetId).sheet;
- var rules = [];
- rules.push('width: ' + shapeBounds.width + units, 'height: ' + shapeBounds.height + units);
- rules.push('padding-left: ' + shapeBounds.x + units, 'padding-right: ' + (bounds.width - shapeBounds.width - shapeBounds.x) + units);
- rules.push('padding-top: ' + shapeBounds.y + units, 'padding-bottom: ' + (bounds.height - shapeBounds.height - shapeBounds.y) + units);
- rules.push('position: relative');
- rules.push('overflow-wrap: break-word');
- stylesheet.insertRule('#' + elementId + '{' + rules.join(';') + '}');
-
- rules = [];
- rules.push('left: ' + (shapeBounds.x - 1) + units, 'top: ' + (shapeBounds.y - 1) + units, 'width: ' + shapeBounds.width + units, 'height: ' + shapeBounds.height + units);
- rules.push('position: absolute', 'display: block', 'content: \' \'');
- rules.push('border: 1px solid blue');
- stylesheet.insertRule('#' + elementId + ':before{' + rules.join(';') + '}');
- if (content)
- elem.innerHTML = content;
-}
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesresourcessvgshape001svg"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/resources/svg-shape-001.svg (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/resources/svg-shape-001.svg 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/fast/shapes/resources/svg-shape-001.svg 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-<svg fill="blue" width="400px" height="400px" xmlns="http://www.w3.org/2000/svg">
- <!--
- This file defines a shape that's a small symmetrical stack of 3 rectilinear polygons.
- The shape looks like the following text, where each X represents a 50x50 block of blue pixels:
-
- XXXXX
-
- XXX
- X
- XXX
-
- XXXXX
- -->
- <rect x="0" y="0" width="250" height="50"/>
- <rect x="50" y="100" width="150" height="50"/>
- <rect x="100" y="150" width="50" height="50"/>
- <rect x="50" y="200" width="150" height="50"/>
- <rect x="0" y="300" width="250" height="50"/>
-</svg>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1416,7 +1416,6 @@
</span><span class="cx"> webkit.org/b/118665 fast/regions/overflow-nested-regions.html [ ImageOnlyFailure Pass ]
</span><span class="cx"> webkit.org/b/118665 fast/regions/overflow-not-moving-below-floats-in-variable-width-regions.html [ ImageOnlyFailure Pass ]
</span><span class="cx"> webkit.org/b/118665 fast/regions/overflow-region-transform.html [ ImageOnlyFailure Pass ]
</span><del>-webkit.org/b/118665 fast/regions/shape-inside/shape-inside-on-multiple-regions-with-negative-shape-top.html [ ImageOnlyFailure Pass ]
</del><span class="cx"> webkit.org/b/118665 fast/regions/top-overflow-out-of-second-region.html [ ImageOnlyFailure Pass Missing ]
</span><span class="cx"> webkit.org/b/118665 fast/regions/webkit-flow-float-unable-to-push.html [ ImageOnlyFailure Pass ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/LayoutTests/platform/win/TestExpectations 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -2425,8 +2425,6 @@
</span><span class="cx"> webkit.org/b/128855 fast/regions/content-flowed-into-regions-dynamically-removed.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/128855 fast/regions/flows-dependency-dynamic-remove.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/128855 fast/regions/hit-test-float.html [ Pass Timeout ]
</span><del>-webkit.org/b/128855 fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html [ Pass Failure ]
-fast/regions/shape-inside/shape-inside-on-additional-regions.html [ Pass Failure ]
</del><span class="cx"> webkit.org/b/128855 fast/regions/hover-and-js-in-visual-overflow.html [ Pass Timeout ImageOnlyFailure Failure ]
</span><span class="cx"> webkit.org/b/128855 fast/regions/hover-single-flow-from-other.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/128855 fast/regions/overflow-scrollable-3.html [ Pass Timeout ]
</span><span class="lines">@@ -2564,8 +2562,6 @@
</span><span class="cx"> fast/replaced/image-map-2.html [ Pass Timeout ]
</span><span class="cx"> fast/ruby/rubyDOM-insert-rt-block-1.html [ Pass Timeout ]
</span><span class="cx"> fast/scrolling/scrollable-area-overflow-auto-visibility-override.html [ Pass Failure ]
</span><del>-fast/shapes/shape-inside/shape-inside-offset-block-children.html [ Pass ImageOnlyFailure ]
-fast/shapes/shape-inside/shape-inside-collinear-vertices.html [ Pass ImageOnlyFailure ]
</del><span class="cx"> fast/shapes/shape-outside-floats/shape-outside-floats-inset-rounded-top-right.html [ Pass Timeout ]
</span><span class="cx"> fast/shapes/shape-outside-floats/shape-outside-image-fit-002.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> fast/shapes/parsing/parsing-shape-outside.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-26 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove shape-inside support
+ https://bugs.webkit.org/show_bug.cgi?id=130698
+
+ Reviewed by David Hyatt.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-03-26 Dániel Bátyai <dbatyai.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Rename hasFastArrayStorage to be more appropriate
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><del>-ENABLE_CSS_SHAPE_INSIDE = ENABLE_CSS_SHAPE_INSIDE;
</del><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="lines">@@ -225,4 +224,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -2223,7 +2223,6 @@
</span><span class="cx"> rendering/shapes/RectangleShape.cpp
</span><span class="cx"> rendering/shapes/Shape.cpp
</span><span class="cx"> rendering/shapes/ShapeInfo.cpp
</span><del>- rendering/shapes/ShapeInsideInfo.cpp
</del><span class="cx"> rendering/shapes/ShapeOutsideInfo.cpp
</span><span class="cx">
</span><span class="cx"> rendering/style/BasicShapes.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/ChangeLog 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,3 +1,120 @@
</span><ins>+2014-03-26 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove shape-inside support
+ https://bugs.webkit.org/show_bug.cgi?id=130698
+
+ Reviewed by David Hyatt.
+
+ CSS Shapes Level 1 (CR) only contains shape-outside. We are focusing our efforts on finalizing
+ the implementation of shape-outside, it's worth to remove shape-inside code at this point for now.
+
+ A list of reasons for the removal:
+ - Shape-inside is only part of Shapes Level 2, which needs to be improved on some topics.
+ - Shape-inside is lack of new shapes support (e.g. inset).
+ - Deprecated shapes (r165472) are removed from the code (e.g. rectangle), which affects shape-inside.
+ - The current shape-inside code spreads across the layout code.
+ - The current shape-inside implementation is experimental in some areas,
+ and the partially implemented code can have security implications.
+ - Removal of shape-inside opens possibilities for code complexity and performance
+ optimizations for shape-outside. (e.g. simpler geometry code)
+
+ No new tests are needed.
+
+ * CMakeLists.txt:
+ * Configurations/FeatureDefines.xcconfig:
+ * GNUmakefile.list.am:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::isSimpleLengthPropertyID):
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseShapeProperty):
+ * css/CSSPropertyNames.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ (WebCore::StyleResolver::loadPendingImages):
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * rendering/LayoutState.cpp:
+ (WebCore::LayoutState::LayoutState):
+ * rendering/LayoutState.h:
+ (WebCore::LayoutState::LayoutState):
+ (WebCore::LayoutState::shapeInsideInfo): Deleted.
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::styleDidChange):
+ (WebCore::RenderBlock::imageChanged):
+ (WebCore::RenderBlock::preparePaginationBeforeBlockLayout):
+ (WebCore::RenderBlock::relayoutShapeDescendantIfMoved): Deleted.
+ (WebCore::RenderBlock::logicalOffsetFromShapeAncestorContainer): Deleted.
+ (WebCore::RenderBlock::updateShapeInsideInfoAfterStyleChange): Deleted.
+ (WebCore::RenderBlock::ensureShapeInsideInfo): Deleted.
+ (WebCore::RenderBlock::shapeInsideInfo): Deleted.
+ (WebCore::RenderBlock::setShapeInsideInfo): Deleted.
+ (WebCore::RenderBlock::markShapeInsideDescendantsForLayout): Deleted.
+ (WebCore::RenderBlock::layoutShapeInsideInfo): Deleted.
+ (WebCore::shapeInfoRequiresRelayout): Deleted.
+ (WebCore::RenderBlock::computeShapeSize): Deleted.
+ (WebCore::RenderBlock::updateShapesBeforeBlockLayout): Deleted.
+ (WebCore::RenderBlock::updateShapesAfterBlockLayout): Deleted.
+ (WebCore::RenderBlock::prepareShapesAndPaginationBeforeBlockLayout): Deleted.
+ * rendering/RenderBlock.h:
+ (WebCore::RenderBlock::allowsShapeInsideInfoSharing): Deleted.
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::layoutBlock):
+ (WebCore::RenderBlockFlow::layoutBlockChild):
+ (WebCore::RenderBlockFlow::computeLogicalLocationForFloat):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::computeInlineDirectionPositionsForLine):
+ (WebCore::RenderBlockFlow::layoutRunsAndFloatsInRange):
+ (WebCore::constructBidiRunsForLine): Deleted.
+ (WebCore::pushShapeContentOverflowBelowTheContentBox): Deleted.
+ (WebCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLine): Deleted.
+ (WebCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLineInFlowThread): Deleted.
+ (WebCore::adjustLogicalLineTop): Deleted.
+ (WebCore::RenderBlockFlow::adjustLogicalLineTopAndLogicalHeightIfNeeded): Deleted.
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::~RenderElement):
+ (WebCore::RenderElement::initializeStyle):
+ (WebCore::RenderElement::setStyle):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::layoutBlock):
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::layoutBlock):
+ * rendering/RenderNamedFlowFragment.cpp:
+ (WebCore::RenderNamedFlowFragment::createStyle):
+ * rendering/RenderView.h:
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseFor):
+ * rendering/line/BreakingContextInlineHeaders.h:
+ (WebCore::BreakingContext::handleText):
+ (WebCore::BreakingContext::handleEndOfLine):
+ (WebCore::updateSegmentsForShapes): Deleted.
+ * rendering/line/LineBreaker.cpp:
+ (WebCore::LineBreaker::nextLineBreak):
+ * rendering/line/LineWidth.cpp:
+ (WebCore::LineWidth::LineWidth):
+ (WebCore::LineWidth::updateAvailableWidth):
+ (WebCore::LineWidth::wrapNextToShapeOutside):
+ (WebCore::LineWidth::fitBelowFloats):
+ (WebCore::LineWidth::updateLineSegment): Deleted.
+ (WebCore::LineWidth::updateCurrentShapeSegment): Deleted.
+ * rendering/line/LineWidth.h:
+ * rendering/shapes/ShapeInsideInfo.cpp: Removed.
+ * rendering/shapes/ShapeInsideInfo.h: Removed.
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class="cx"> 2014-03-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid duplicate size checks when creating empty image
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><del>-ENABLE_CSS_SHAPE_INSIDE = ENABLE_CSS_SHAPE_INSIDE;
</del><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="lines">@@ -225,4 +224,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -11271,7 +11271,6 @@
</span><span class="cx"> <ClCompile Include="..\rendering\shapes\RectangleShape.cpp" />
</span><span class="cx"> <ClCompile Include="..\rendering\shapes\Shape.cpp" />
</span><span class="cx"> <ClCompile Include="..\rendering\shapes\ShapeInfo.cpp" />
</span><del>- <ClCompile Include="..\rendering\shapes\ShapeInsideInfo.cpp" />
</del><span class="cx"> <ClCompile Include="..\rendering\shapes\ShapeOutsideInfo.cpp" />
</span><span class="cx"> <ClCompile Include="..\rendering\svg\SVGPathData.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -20031,7 +20030,6 @@
</span><span class="cx"> <ClInclude Include="..\rendering\shapes\RectangleShape.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\shapes\Shape.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\shapes\ShapeInfo.h" />
</span><del>- <ClInclude Include="..\rendering\shapes\ShapeInsideInfo.h" />
</del><span class="cx"> <ClInclude Include="..\rendering\shapes\ShapeInterval.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\shapes\ShapeOutsideInfo.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\svg\RenderSVGBlock.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -6380,11 +6380,9 @@
</span><span class="cx"> FD359190138DB22000E1EBEC /* AudioParamTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = FD35918E138DB22000E1EBEC /* AudioParamTimeline.h */; };
</span><span class="cx"> FD45A94F175D3F3E00C21EC8 /* Shape.h in Headers */ = {isa = PBXBuildFile; fileRef = FD08A87F175D3926002CD360 /* Shape.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FD45A950175D3F3E00C21EC8 /* ShapeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = FD08A881175D3926002CD360 /* ShapeInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- FD45A951175D3F3E00C21EC8 /* ShapeInsideInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = FD08A883175D3926002CD360 /* ShapeInsideInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> FD45A952175D3F3E00C21EC8 /* ShapeOutsideInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = FD08A887175D3926002CD360 /* ShapeOutsideInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FD45A953175D3FB800C21EC8 /* Shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD08A87E175D3926002CD360 /* Shape.cpp */; };
</span><span class="cx"> FD45A954175D3FB800C21EC8 /* ShapeInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD08A880175D3926002CD360 /* ShapeInfo.cpp */; };
</span><del>- FD45A955175D3FB800C21EC8 /* ShapeInsideInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD08A882175D3926002CD360 /* ShapeInsideInfo.cpp */; };
</del><span class="cx"> FD45A956175D3FB800C21EC8 /* ShapeOutsideInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD08A886175D3926002CD360 /* ShapeOutsideInfo.cpp */; };
</span><span class="cx"> FD45A957175D414C00C21EC8 /* PolygonShape.h in Headers */ = {isa = PBXBuildFile; fileRef = FD08A87B175D3926002CD360 /* PolygonShape.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FD45A958175D414C00C21EC8 /* RectangleShape.h in Headers */ = {isa = PBXBuildFile; fileRef = FD08A87D175D3926002CD360 /* RectangleShape.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -13687,8 +13685,6 @@
</span><span class="cx"> FD08A87F175D3926002CD360 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shape.h; sourceTree = "<group>"; };
</span><span class="cx"> FD08A880175D3926002CD360 /* ShapeInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeInfo.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FD08A881175D3926002CD360 /* ShapeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeInfo.h; sourceTree = "<group>"; };
</span><del>- FD08A882175D3926002CD360 /* ShapeInsideInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeInsideInfo.cpp; sourceTree = "<group>"; };
- FD08A883175D3926002CD360 /* ShapeInsideInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeInsideInfo.h; sourceTree = "<group>"; };
</del><span class="cx"> FD08A885175D3926002CD360 /* ShapeInterval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeInterval.h; sourceTree = "<group>"; };
</span><span class="cx"> FD08A886175D3926002CD360 /* ShapeOutsideInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeOutsideInfo.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FD08A887175D3926002CD360 /* ShapeOutsideInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeOutsideInfo.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -22517,8 +22513,6 @@
</span><span class="cx"> FD08A87F175D3926002CD360 /* Shape.h */,
</span><span class="cx"> FD08A880175D3926002CD360 /* ShapeInfo.cpp */,
</span><span class="cx"> FD08A881175D3926002CD360 /* ShapeInfo.h */,
</span><del>- FD08A882175D3926002CD360 /* ShapeInsideInfo.cpp */,
- FD08A883175D3926002CD360 /* ShapeInsideInfo.h */,
</del><span class="cx"> FD08A885175D3926002CD360 /* ShapeInterval.h */,
</span><span class="cx"> FD08A886175D3926002CD360 /* ShapeOutsideInfo.cpp */,
</span><span class="cx"> FD08A887175D3926002CD360 /* ShapeOutsideInfo.h */,
</span><span class="lines">@@ -25463,7 +25457,6 @@
</span><span class="cx"> A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,
</span><span class="cx"> FD45A94F175D3F3E00C21EC8 /* Shape.h in Headers */,
</span><span class="cx"> FD45A950175D3F3E00C21EC8 /* ShapeInfo.h in Headers */,
</span><del>- FD45A951175D3F3E00C21EC8 /* ShapeInsideInfo.h in Headers */,
</del><span class="cx"> FD45A95B175D41EE00C21EC8 /* ShapeInterval.h in Headers */,
</span><span class="cx"> FD45A952175D3F3E00C21EC8 /* ShapeOutsideInfo.h in Headers */,
</span><span class="cx"> FD1AF1501656F15100C6D4F7 /* ShapeValue.h in Headers */,
</span><span class="lines">@@ -28827,7 +28820,6 @@
</span><span class="cx"> A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */,
</span><span class="cx"> FD45A953175D3FB800C21EC8 /* Shape.cpp in Sources */,
</span><span class="cx"> FD45A954175D3FB800C21EC8 /* ShapeInfo.cpp in Sources */,
</span><del>- FD45A955175D3FB800C21EC8 /* ShapeInsideInfo.cpp in Sources */,
</del><span class="cx"> FD45A956175D3FB800C21EC8 /* ShapeOutsideInfo.cpp in Sources */,
</span><span class="cx"> 1A4A954D0B4EDCCB002D8C3C /* SharedBuffer.cpp in Sources */,
</span><span class="cx"> 512DD8E30D91E2B4000F89EE /* SharedBufferCF.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -346,9 +346,6 @@
</span><span class="cx"> // we should move it outside the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
</span><span class="cx"> CSSPropertyWebkitCompositionFillColor,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- CSSPropertyWebkitShapeInside,
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> CSSPropertyWebkitShapeOutside,
</span><span class="cx"> #endif
</span><span class="lines">@@ -394,10 +391,7 @@
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> CSSPropertyWebkitShapeMargin,
</span><span class="cx"> CSSPropertyWebkitShapeImageThreshold,
</span><del>-#if ENABLE(CSS_SHAPE_INSIDE)
- CSSPropertyWebkitShapePadding,
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> CSSPropertyBufferedRendering,
</span><span class="cx"> CSSPropertyClipPath,
</span><span class="cx"> CSSPropertyClipRule,
</span><span class="lines">@@ -2822,12 +2816,6 @@
</span><span class="cx"> return cssValuePool().createValue(style->shapeMargin());
</span><span class="cx"> case CSSPropertyWebkitShapeImageThreshold:
</span><span class="cx"> return cssValuePool().createValue(style->shapeImageThreshold(), CSSPrimitiveValue::CSS_NUMBER);
</span><del>-#if ENABLE(CSS_SHAPE_INSIDE)
- case CSSPropertyWebkitShapePadding:
- return cssValuePool().createValue(style->shapePadding());
- case CSSPropertyWebkitShapeInside:
- return shapePropertyValue(style.get(), style->shapeInside());
-#endif
</del><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> return shapePropertyValue(style.get(), style->shapeOutside());
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -562,9 +562,6 @@
</span><span class="cx"> case CSSPropertyWebkitPaddingStart:
</span><span class="cx"> acceptsNegativeNumbers = false;
</span><span class="cx"> return true;
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- case CSSPropertyWebkitShapePadding:
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><span class="cx"> acceptsNegativeNumbers = false;
</span><span class="lines">@@ -2913,17 +2910,11 @@
</span><span class="cx"> case CSSPropertyWebkitClipPath:
</span><span class="cx"> parsedValue = parseClipPath();
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- case CSSPropertyWebkitShapeInside:
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> parsedValue = parseShapeProperty(propId);
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><del>-#if ENABLE(CSS_SHAPE_INSIDE)
- case CSSPropertyWebkitShapePadding:
-#endif
</del><span class="cx"> validPrimitive = (RuntimeEnabledFeatures::sharedFeatures().cssShapesEnabled() && !id && validUnit(value, FLength | FNonNeg));
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyWebkitShapeImageThreshold:
</span><span class="lines">@@ -5706,12 +5697,7 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> keywordValue;
</span><span class="cx"> RefPtr<CSSPrimitiveValue> shapeValue;
</span><span class="cx">
</span><del>- if (valueId == CSSValueNone
-#if ENABLE(CSS_SHAPE_INSIDE)
- || (valueId == CSSValueOutsideShape
- && propId == CSSPropertyWebkitShapeInside)
-#endif
- ) {
</del><ins>+ if (valueId == CSSValueNone) {
</ins><span class="cx"> keywordValue = parseValidPrimitive(valueId, value);
</span><span class="cx"> m_valueList->next();
</span><span class="cx"> return keywordValue.release();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -435,10 +435,6 @@
</span><span class="cx"> -webkit-region-break-before
</span><span class="cx"> -webkit-region-break-inside
</span><span class="cx"> #endif
</span><del>-#if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES && defined(ENABLE_CSS_SHAPE_INSIDE) && ENABLE_CSS_SHAPE_INSIDE
--webkit-shape-inside
--webkit-shape-padding
-#endif
</del><span class="cx"> #if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES
</span><span class="cx"> -webkit-shape-outside
</span><span class="cx"> -webkit-shape-margin
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -2614,10 +2614,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitWrapFlow, ApplyPropertyDefault<WrapFlow, &RenderStyle::wrapFlow, WrapFlow, &RenderStyle::setWrapFlow, WrapFlow, &RenderStyle::initialWrapFlow>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler());
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- setPropertyHandler(CSSPropertyWebkitShapeInside, ApplyPropertyShape<&RenderStyle::shapeInside, &RenderStyle::setShapeInside, &RenderStyle::initialShapeInside>::createHandler());
- setPropertyHandler(CSSPropertyWebkitShapePadding, ApplyPropertyLength<&RenderStyle::shapePadding, &RenderStyle::setShapePadding, &RenderStyle::initialShapePadding>::createHandler());
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyDefault<float, &RenderStyle::shapeImageThreshold, float, &RenderStyle::setShapeImageThreshold, float, &RenderStyle::initialShapeImageThreshold>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -2997,10 +2997,6 @@
</span><span class="cx"> case CSSPropertyWebkitUserModify:
</span><span class="cx"> case CSSPropertyWebkitUserSelect:
</span><span class="cx"> case CSSPropertyWebkitClipPath:
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- case CSSPropertyWebkitShapeInside:
- case CSSPropertyWebkitShapePadding:
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><span class="cx"> case CSSPropertyWebkitShapeImageThreshold:
</span><span class="lines">@@ -3602,11 +3598,6 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- case CSSPropertyWebkitShapeInside:
- loadPendingShapeImage(m_state.style()->shapeInside());
- break;
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> loadPendingShapeImage(m_state.style()->shapeOutside());
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1227,9 +1227,6 @@
</span><span class="cx">
</span><span class="cx"> new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath),
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- new PropertyWrapperShape(CSSPropertyWebkitShapeInside, &RenderStyle::shapeInside, &RenderStyle::setShapeInside),
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> new PropertyWrapperShape(CSSPropertyWebkitShapeOutside, &RenderStyle::shapeOutside, &RenderStyle::setShapeOutside),
</span><span class="cx"> new LengthPropertyWrapper<Length>(CSSPropertyWebkitShapeMargin, &RenderStyle::shapeMargin, &RenderStyle::setShapeMargin),
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/LayoutState.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx"> : m_columnInfo(columnInfo)
</span><span class="cx"> , m_lineGrid(0)
</span><span class="cx"> , m_next(std::move(next))
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- , m_shapeInsideInfo(nullptr)
-#endif
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_renderer(renderer)
</span><span class="cx"> #endif
</span><span class="lines">@@ -109,15 +106,6 @@
</span><span class="cx"> if (!m_columnInfo)
</span><span class="cx"> m_columnInfo = m_next->m_columnInfo;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- if (renderer->isRenderBlock()) {
- const RenderBlock* renderBlock = toRenderBlock(renderer);
- m_shapeInsideInfo = renderBlock->shapeInsideInfo();
- if (!m_shapeInsideInfo && m_next->m_shapeInsideInfo && renderBlock->allowsShapeInsideInfoSharing())
- m_shapeInsideInfo = m_next->m_shapeInsideInfo;
- }
-#endif
-
</del><span class="cx"> m_layoutDelta = m_next->m_layoutDelta;
</span><span class="cx"> #if !ASSERT_DISABLED && ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><span class="cx"> m_layoutDeltaXSaturated = m_next->m_layoutDeltaXSaturated;
</span><span class="lines">@@ -146,9 +134,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_columnInfo(0)
</span><span class="cx"> , m_lineGrid(0)
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- , m_shapeInsideInfo(nullptr)
-#endif
</del><span class="cx"> , m_pageLogicalHeight(0)
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_renderer(&root)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.h (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.h 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/LayoutState.h 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -55,9 +55,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_columnInfo(nullptr)
</span><span class="cx"> , m_lineGrid(nullptr)
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- , m_shapeInsideInfo(nullptr)
-#endif
</del><span class="cx"> , m_pageLogicalHeight(0)
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_renderer(nullptr)
</span><span class="lines">@@ -91,10 +88,6 @@
</span><span class="cx"> void setLineGridPaginationOrigin(const LayoutSize& origin) { m_lineGridPaginationOrigin = origin; }
</span><span class="cx">
</span><span class="cx"> bool needsBlockDirectionLocationSetBeforeLayout() const { return m_lineGrid || (m_isPaginated && m_pageLogicalHeight); }
</span><del>-
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- ShapeInsideInfo* shapeInsideInfo() const { return m_shapeInsideInfo; }
-#endif
</del><span class="cx"> private:
</span><span class="cx"> void propagateLineGridInfo(RenderBox*);
</span><span class="cx"> void establishLineGrid(RenderBlockFlow*);
</span><span class="lines">@@ -115,9 +108,6 @@
</span><span class="cx"> // The current line grid that we're snapping to and the offset of the start of the grid.
</span><span class="cx"> RenderBlockFlow* m_lineGrid;
</span><span class="cx"> std::unique_ptr<LayoutState> m_next;
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- ShapeInsideInfo* m_shapeInsideInfo;
-#endif
</del><span class="cx">
</span><span class="cx"> // FIXME: Distinguish between the layout clip rect and the paint clip rect which may be larger,
</span><span class="cx"> // e.g., because of composited scrolling.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -69,9 +69,6 @@
</span><span class="cx"> #include <wtf/StackStats.h>
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-#include "ShapeInsideInfo.h"
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> #include "ShapeOutsideInfo.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -119,10 +116,6 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit m_paginationStrut;
</span><span class="cx"> LayoutUnit m_pageLogicalOffset;
</span><del>-
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- std::unique_ptr<ShapeInsideInfo> m_shapeInsideInfo;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashMap<const RenderBlock*, std::unique_ptr<RenderBlockRareData>> RenderBlockRareDataMap;
</span><span class="lines">@@ -307,10 +300,6 @@
</span><span class="cx"> RenderBox::styleDidChange(diff, oldStyle);
</span><span class="cx">
</span><span class="cx"> RenderStyle& newStyle = style();
</span><del>-
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- updateShapeInsideInfoAfterStyleChange(newStyle.resolvedShapeInside(), oldStyle ? oldStyle->resolvedShapeInside() : 0);
-#endif
</del><span class="cx">
</span><span class="cx"> if (!isAnonymousBlock()) {
</span><span class="cx"> // Ensure that all of our continuation blocks pick up the new style.
</span><span class="lines">@@ -1316,202 +1305,13 @@
</span><span class="cx">
</span><span class="cx"> if (!parent() || !everHadLayout())
</span><span class="cx"> return;
</span><del>-
-#if ENABLE(CSS_SHAPE_INSIDE)
- ShapeValue* shapeValue = style().shapeInside();
- if (shapeValue && shapeValue->image() && shapeValue->image()->data() == image) {
- ShapeInsideInfo& shapeInsideInfo = ensureShapeInsideInfo();
- shapeInsideInfo.markShapeAsDirty();
- markShapeInsideDescendantsForLayout();
- }
-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-void RenderBlock::relayoutShapeDescendantIfMoved(RenderBlock* child, LayoutSize offset)
</del><ins>+void RenderBlock::preparePaginationBeforeBlockLayout(bool& relayoutChildren)
</ins><span class="cx"> {
</span><del>- LayoutUnit left = isHorizontalWritingMode() ? offset.width() : offset.height();
- if (!left || !child || child->shapeInsideInfo() || !layoutShapeInsideInfo())
- return;
- // Propagate layout markers only up to the child, as we are still in the middle
- // of a layout pass
- child->setNormalChildNeedsLayoutBit(true);
- child->markShapeInsideDescendantsForLayout();
- child->layoutIfNeeded();
-}
-
-LayoutSize RenderBlock::logicalOffsetFromShapeAncestorContainer(const RenderBlock* container) const
-{
- const RenderBlock* currentBlock = this;
- LayoutRect blockRect(currentBlock->borderBoxRect());
- while (currentBlock && !currentBlock->isRenderFlowThread() && currentBlock != container) {
- RenderBlock* containerBlock = currentBlock->containingBlock();
- ASSERT(containerBlock);
- if (!containerBlock)
- return LayoutSize();
-
- if (containerBlock->style().writingMode() != currentBlock->style().writingMode()) {
- // We have to put the block rect in container coordinates
- // and we have to take into account both the container and current block flipping modes
- // Bug 118073: Flipping inline and block directions at the same time will not work,
- // as one of the flipped dimensions will not yet have been set to its final size
- if (containerBlock->style().isFlippedBlocksWritingMode()) {
- if (containerBlock->isHorizontalWritingMode())
- blockRect.setY(currentBlock->height() - blockRect.maxY());
- else
- blockRect.setX(currentBlock->width() - blockRect.maxX());
- }
- currentBlock->flipForWritingMode(blockRect);
- }
-
- blockRect.moveBy(currentBlock->location());
- currentBlock = containerBlock;
- }
-
- LayoutSize result = isHorizontalWritingMode() ? LayoutSize(blockRect.x(), blockRect.y()) : LayoutSize(blockRect.y(), blockRect.x());
- return result;
-}
-
-void RenderBlock::updateShapeInsideInfoAfterStyleChange(const ShapeValue* shapeInside, const ShapeValue* oldShapeInside)
-{
- // FIXME: A future optimization would do a deep comparison for equality.
- if (shapeInside == oldShapeInside)
- return;
-
- if (shapeInside) {
- ShapeInsideInfo& shapeInsideInfo = ensureShapeInsideInfo();
- shapeInsideInfo.markShapeAsDirty();
- } else
- setShapeInsideInfo(nullptr);
- markShapeInsideDescendantsForLayout();
-}
-
-ShapeInsideInfo& RenderBlock::ensureShapeInsideInfo()
-{
- RenderBlockRareData& rareData = ensureRareData(this);
- if (!rareData.m_shapeInsideInfo)
- setShapeInsideInfo(std::make_unique<ShapeInsideInfo>(*this));
- return *rareData.m_shapeInsideInfo;
-}
-
-ShapeInsideInfo* RenderBlock::shapeInsideInfo() const
-{
- RenderBlockRareData* rareData = getRareData(this);
- if (!rareData || !rareData->m_shapeInsideInfo)
- return nullptr;
- return ShapeInsideInfo::isEnabledFor(*this) ? rareData->m_shapeInsideInfo.get() : nullptr;
-}
-
-void RenderBlock::setShapeInsideInfo(std::unique_ptr<ShapeInsideInfo> value)
-{
- ensureRareData(this).m_shapeInsideInfo = std::move(value);
-}
-
-void RenderBlock::markShapeInsideDescendantsForLayout()
-{
- if (!everHadLayout())
- return;
- if (childrenInline()) {
- setNeedsLayout();
- invalidateLineLayoutPath();
- return;
- }
-
- for (auto& childBlock : childrenOfType<RenderBlock>(*this))
- childBlock.markShapeInsideDescendantsForLayout();
-}
-
-ShapeInsideInfo* RenderBlock::layoutShapeInsideInfo() const
-{
- // This may be called outside layout when switching from SimpleLineLayout to line boxes. This case never has shape info.
- if (!view().layoutState())
- return nullptr;
-
- ShapeInsideInfo* shapeInsideInfo = view().layoutState()->shapeInsideInfo();
-
- if (!shapeInsideInfo && flowThreadContainingBlock() && allowsShapeInsideInfoSharing()) {
- LayoutUnit lineHeight = this->lineHeight(false, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
- // regionAtBlockOffset returns regions like an array first={0,N-1}, second={N,M-1}, ...
- LayoutUnit offset = logicalHeight() + lineHeight - LayoutUnit::fromPixel(1);
- RenderRegion* region = regionAtBlockOffset(offset);
- if (region && region->logicalHeight())
- shapeInsideInfo = region->shapeInsideInfo();
- }
-
- return shapeInsideInfo;
-}
-
-static inline bool shapeInfoRequiresRelayout(const RenderBlock* block)
-{
- ShapeInsideInfo* info = block->shapeInsideInfo();
- if (info)
- info->setNeedsLayout(info->isShapeDirty());
- else
- info = block->layoutShapeInsideInfo();
- return info && info->needsLayout();
-}
-
-void RenderBlock::computeShapeSize()
-{
- ShapeInsideInfo* shapeInsideInfo = this->shapeInsideInfo();
- if (!shapeInsideInfo)
- return;
-
- if (isRenderNamedFlowFragment()) {
- ShapeInsideInfo* parentShapeInsideInfo = toRenderBlock(parent())->shapeInsideInfo();
- ASSERT(parentShapeInsideInfo);
- shapeInsideInfo->setReferenceBoxLogicalSize(parentShapeInsideInfo->referenceBoxLogicalSize());
- } else {
- bool percentageLogicalHeightResolvable = percentageLogicalHeightIsResolvableFromBlock(this, false);
- shapeInsideInfo->setReferenceBoxLogicalSize(LayoutSize(logicalWidth(), percentageLogicalHeightResolvable ? logicalHeight() : LayoutUnit()));
- }
-}
-#endif
-
-bool RenderBlock::updateShapesBeforeBlockLayout()
-{
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- if (!flowThreadContainingBlock() && !shapeInsideInfo())
- return shapeInfoRequiresRelayout(this);
-
- LayoutUnit oldHeight = logicalHeight();
- LayoutUnit oldTop = logicalTop();
-
- // Compute the maximum logical height content may cause this block to expand to
- // FIXME: These should eventually use the const computeLogicalHeight rather than updateLogicalHeight
- setLogicalHeight(RenderFlowThread::maxLogicalHeight());
- updateLogicalHeight();
-
- computeShapeSize();
-
- setLogicalHeight(oldHeight);
- setLogicalTop(oldTop);
-
- return shapeInfoRequiresRelayout(this);
-#else
- return false;
-#endif
-}
-
-void RenderBlock::updateShapesAfterBlockLayout(bool heightChanged)
-{
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- // A previous sibling has changed dimension, so we need to relayout the shape with the content
- ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo();
- if (heightChanged && shapeInsideInfo)
- shapeInsideInfo->markShapeAsDirty();
-#else
- UNUSED_PARAM(heightChanged);
-#endif
-}
-
-void RenderBlock::prepareShapesAndPaginationBeforeBlockLayout(bool& relayoutChildren)
-{
</del><span class="cx"> // Regions changing widths can force us to relayout our children.
</span><span class="cx"> RenderFlowThread* flowThread = flowThreadContainingBlock();
</span><del>- if (updateShapesBeforeBlockLayout())
- relayoutChildren = true;
</del><span class="cx"> if (flowThread)
</span><span class="cx"> flowThread->logicalWidthChangedInRegionsForBlock(this, relayoutChildren);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -37,10 +37,6 @@
</span><span class="cx"> class LogicalSelectionOffsetCaches;
</span><span class="cx"> class RenderInline;
</span><span class="cx"> class RenderText;
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-class ShapeInsideInfo;
-class ShapeValue;
-#endif
</del><span class="cx">
</span><span class="cx"> struct BidiRun;
</span><span class="cx"> struct PaintInfo;
</span><span class="lines">@@ -351,17 +347,6 @@
</span><span class="cx"> virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- ShapeInsideInfo& ensureShapeInsideInfo();
- ShapeInsideInfo* shapeInsideInfo() const;
- void setShapeInsideInfo(std::unique_ptr<ShapeInsideInfo>);
-
- void markShapeInsideDescendantsForLayout();
- ShapeInsideInfo* layoutShapeInsideInfo() const;
- bool allowsShapeInsideInfoSharing() const { return !isInline() && !isFloating(); }
- LayoutSize logicalOffsetFromShapeAncestorContainer(const RenderBlock* container) const;
-#endif
-
</del><span class="cx"> virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;
</span><span class="cx">
</span><span class="cx"> virtual bool canHaveChildren() const override { return true; }
</span><span class="lines">@@ -444,8 +429,6 @@
</span><span class="cx"> virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
</span><span class="cx"> virtual void addFocusRingRectsForInlineChildren(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer);
</span><span class="cx">
</span><del>- bool updateShapesBeforeBlockLayout();
- void updateShapesAfterBlockLayout(bool heightChanged = false);
</del><span class="cx"> void computeRegionRangeForBoxChild(const RenderBox&) const;
</span><span class="cx">
</span><span class="cx"> void estimateRegionRangeForBoxChild(const RenderBox&) const;
</span><span class="lines">@@ -453,7 +436,7 @@
</span><span class="cx">
</span><span class="cx"> void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox&);
</span><span class="cx">
</span><del>- void prepareShapesAndPaginationBeforeBlockLayout(bool&);
</del><ins>+ void preparePaginationBeforeBlockLayout(bool&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
</span><span class="lines">@@ -463,12 +446,6 @@
</span><span class="cx"> LayoutUnit adjustLogicalRightOffsetForLine(LayoutUnit offsetFromFloats, bool applyTextIndent) const;
</span><span class="cx"> LayoutUnit adjustLogicalLeftOffsetForLine(LayoutUnit offsetFromFloats, bool applyTextIndent) const;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- void computeShapeSize();
- void updateShapeInsideInfoAfterStyleChange(const ShapeValue*, const ShapeValue* oldShape);
- void relayoutShapeDescendantIfMoved(RenderBlock* child, LayoutSize offset);
-#endif
-
</del><span class="cx"> virtual const char* renderName() const override;
</span><span class="cx">
</span><span class="cx"> virtual bool isInlineBlockOrInlineTable() const override final { return isInline() && isReplaced(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -44,10 +44,6 @@
</span><span class="cx"> #include "VerticalPositionCache.h"
</span><span class="cx"> #include "VisiblePosition.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-#include "ShapeInsideInfo.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> bool RenderBlock::s_canPropagateFloatIntoSibling = false;
</span><span class="lines">@@ -363,7 +359,7 @@
</span><span class="cx"> const RenderStyle& styleToUse = style();
</span><span class="cx"> LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasColumns() || hasTransform() || hasReflection() || styleToUse.isFlippedBlocksWritingMode(), pageLogicalHeight, pageLogicalHeightChanged, columnInfo());
</span><span class="cx">
</span><del>- prepareShapesAndPaginationBeforeBlockLayout(relayoutChildren);
</del><ins>+ preparePaginationBeforeBlockLayout(relayoutChildren);
</ins><span class="cx"> if (!relayoutChildren)
</span><span class="cx"> relayoutChildren = namedFlowFragmentNeedsUpdate();
</span><span class="cx">
</span><span class="lines">@@ -435,8 +431,6 @@
</span><span class="cx">
</span><span class="cx"> layoutPositionedObjects(relayoutChildren || isRoot());
</span><span class="cx">
</span><del>- updateShapesAfterBlockLayout(heightChanged);
-
</del><span class="cx"> // Add overflow from children (unless we're multi-column, since in that case all our child overflow is clipped anyway).
</span><span class="cx"> computeOverflow(oldClientAfterEdge);
</span><span class="cx">
</span><span class="lines">@@ -681,11 +675,6 @@
</span><span class="cx"> // Now place the child in the correct left position
</span><span class="cx"> determineLogicalLeftPositionForChild(child, ApplyLayoutDelta);
</span><span class="cx">
</span><del>- LayoutSize childOffset = child.location() - oldRect.location();
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- relayoutShapeDescendantIfMoved(child.isRenderBlock() ? toRenderBlock(&child) : nullptr, childOffset);
-#endif
-
</del><span class="cx"> // Update our height now that the child has been placed in the correct position.
</span><span class="cx"> setLogicalHeight(logicalHeight() + logicalHeightForChild(child));
</span><span class="cx"> if (mustSeparateMarginAfterForChild(child)) {
</span><span class="lines">@@ -697,6 +686,7 @@
</span><span class="cx"> if (childBlockFlow && childBlockFlow->containsFloats())
</span><span class="cx"> maxFloatLogicalBottom = std::max(maxFloatLogicalBottom, addOverhangingFloats(*childBlockFlow, !childNeededLayout));
</span><span class="cx">
</span><ins>+ LayoutSize childOffset = child.location() - oldRect.location();
</ins><span class="cx"> if (childOffset.width() || childOffset.height()) {
</span><span class="cx"> view().addLayoutDelta(childOffset);
</span><span class="cx">
</span><span class="lines">@@ -2154,32 +2144,8 @@
</span><span class="cx"> {
</span><span class="cx"> RenderBox& childBox = floatingObject->renderer();
</span><span class="cx"> LayoutUnit logicalLeftOffset = logicalLeftOffsetForContent(logicalTopOffset); // Constant part of left offset.
</span><del>- LayoutUnit logicalRightOffset; // Constant part of right offset.
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- // FIXME Bug 102948: This only works for shape outside directly set on this block.
- ShapeInsideInfo* shapeInsideInfo = this->layoutShapeInsideInfo();
- // FIXME: Implement behavior for right floats.
- if (shapeInsideInfo) {
- LayoutSize floatLogicalSize = logicalSizeForFloat(floatingObject);
- // floatingObject's logicalSize doesn't contain the actual height at this point, so we need to calculate it
- floatLogicalSize.setHeight(logicalHeightForChild(childBox) + marginBeforeForChild(childBox) + marginAfterForChild(childBox));
</del><ins>+ LayoutUnit logicalRightOffset = logicalRightOffsetForContent(logicalTopOffset); // Constant part of right offset.
</ins><span class="cx">
</span><del>- // FIXME: If the float doesn't fit in the shape we should push it under the content box
- logicalTopOffset = shapeInsideInfo->computeFirstFitPositionForFloat(floatLogicalSize);
- if (logicalHeight() > logicalTopOffset)
- logicalTopOffset = logicalHeight();
-
- SegmentList segments = shapeInsideInfo->computeSegmentsForLine(logicalTopOffset, floatLogicalSize.height());
- // FIXME Bug 102949: Add support for shapes with multiple segments.
- if (segments.size() == 1) {
- // The segment offsets are relative to the content box.
- logicalRightOffset = logicalLeftOffset + segments[0].logicalRight;
- logicalLeftOffset += segments[0].logicalLeft;
- }
- } else
-#endif
- logicalRightOffset = logicalRightOffsetForContent(logicalTopOffset);
-
</del><span class="cx"> LayoutUnit floatLogicalWidth = std::min(logicalWidthForFloat(floatingObject), logicalRightOffset - logicalLeftOffset); // The width we look for.
</span><span class="cx">
</span><span class="cx"> LayoutUnit floatLogicalLeft;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -539,11 +539,6 @@
</span><span class="cx"> void layoutRunsAndFloats(LineLayoutState&, bool hasInlineChild);
</span><span class="cx"> const InlineIterator& restartLayoutRunsAndFloatsInRange(LayoutUnit oldLogicalHeight, LayoutUnit newLogicalHeight, FloatingObject* lastFloatFromPreviousLine, InlineBidiResolver&, const InlineIterator&);
</span><span class="cx"> void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&, const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiStatus, unsigned consecutiveHyphenatedLines);
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- void updateShapeAndSegmentsForCurrentLine(ShapeInsideInfo*&, const LayoutSize&, LineLayoutState&);
- void updateShapeAndSegmentsForCurrentLineInFlowThread(ShapeInsideInfo*&, LineLayoutState&);
- bool adjustLogicalLineTopAndLogicalHeightIfNeeded(ShapeInsideInfo*, LayoutUnit, LineLayoutState&, InlineBidiResolver&, FloatingObject*, InlineIterator&, WordMeasurements&);
-#endif
</del><span class="cx"> void linkToEndLineIfNeeded(LineLayoutState&);
</span><span class="cx"> static void repaintDirtyFloats(Vector<FloatWithRect>& floats);
</span><span class="cx"> void checkFloatsInCleanLine(RootInlineBox*, Vector<FloatWithRect>&, size_t& floatIndex, bool& encounteredNewFloat, bool& dirtiedByFloat);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -646,37 +646,6 @@
</span><span class="cx"> float availableLogicalWidth;
</span><span class="cx"> updateLogicalInlinePositions(*this, lineLogicalLeft, lineLogicalRight, availableLogicalWidth, isFirstLine, shouldIndentText, 0);
</span><span class="cx"> bool needsWordSpacing;
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo();
- if (shapeInsideInfo && shapeInsideInfo->hasSegments()) {
- BidiRun* segmentStart = firstRun;
- const SegmentList& segments = shapeInsideInfo->segments();
- float logicalLeft = std::max<float>(roundToInt(segments[0].logicalLeft), lineLogicalLeft);
- float logicalRight = std::min<float>(floorToInt(segments[0].logicalRight), lineLogicalRight);
- float startLogicalLeft = logicalLeft;
- float endLogicalRight = logicalLeft;
- float minLogicalLeft = logicalLeft;
- float maxLogicalRight = logicalLeft;
- lineBox->beginPlacingBoxRangesInInlineDirection(logicalLeft);
- for (size_t i = 0; i < segments.size(); i++) {
- if (i) {
- logicalLeft = std::max<float>(roundToInt(segments[i].logicalLeft), lineLogicalLeft);
- logicalRight = std::min<float>(floorToInt(segments[i].logicalRight), lineLogicalRight);
- }
- availableLogicalWidth = logicalRight - logicalLeft;
- BidiRun* newSegmentStart = computeInlineDirectionPositionsForSegment(lineBox, lineInfo, textAlign, logicalLeft, availableLogicalWidth, segmentStart, trailingSpaceRun, textBoxDataMap, verticalPositionCache, wordMeasurements);
- needsWordSpacing = false;
- endLogicalRight = lineBox->placeBoxRangeInInlineDirection(segmentStart->box(), newSegmentStart ? newSegmentStart->box() : 0, logicalLeft, minLogicalLeft, maxLogicalRight, needsWordSpacing, textBoxDataMap);
- if (!newSegmentStart || !newSegmentStart->next())
- break;
- ASSERT(newSegmentStart->m_startsSegment);
- // Discard the empty segment start marker bidi runs
- segmentStart = newSegmentStart->next();
- }
- lineBox->endPlacingBoxRangesInInlineDirection(startLogicalLeft, endLogicalRight, minLogicalLeft, maxLogicalRight);
- return;
- }
-#endif
</del><span class="cx">
</span><span class="cx"> if (firstRun && firstRun->renderer().isReplaced()) {
</span><span class="cx"> RenderBox& renderBox = toRenderBox(firstRun->renderer());
</span><span class="lines">@@ -948,42 +917,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void constructBidiRunsForLine(const RenderBlockFlow* block, InlineBidiResolver& topResolver, BidiRunList<BidiRun>& bidiRuns, const InlineIterator& endOfLine, VisualDirectionOverride override, bool previousLineBrokeCleanly)
-{
-#if !ENABLE(CSS_SHAPES) || !ENABLE(CSS_SHAPE_INSIDE)
- UNUSED_PARAM(block);
- constructBidiRunsForSegment(topResolver, bidiRuns, endOfLine, override, previousLineBrokeCleanly);
-#else
- ShapeInsideInfo* shapeInsideInfo = block->layoutShapeInsideInfo();
- if (!shapeInsideInfo || !shapeInsideInfo->hasSegments()) {
- constructBidiRunsForSegment(topResolver, bidiRuns, endOfLine, override, previousLineBrokeCleanly);
- return;
- }
-
- const SegmentRangeList& segmentRanges = shapeInsideInfo->segmentRanges();
- ASSERT(segmentRanges.size());
-
- for (size_t i = 0; i < segmentRanges.size(); i++) {
- LineSegmentIterator iterator = segmentRanges[i].start;
- InlineIterator segmentStart(iterator.root, iterator.object, iterator.offset);
- iterator = segmentRanges[i].end;
- InlineIterator segmentEnd(iterator.root, iterator.object, iterator.offset);
- if (i) {
- ASSERT(segmentStart.renderer());
- BidiRun* segmentMarker = createRun(segmentStart.offset(), segmentStart.offset(), segmentStart.renderer(), topResolver);
- segmentMarker->m_startsSegment = true;
- bidiRuns.addRun(segmentMarker);
- // Do not collapse midpoints between segments
- topResolver.midpointState().setBetweenMidpoints(false);
- }
- if (segmentStart == segmentEnd)
- continue;
- topResolver.setPosition(segmentStart, numberOfIsolateAncestors(segmentStart));
- constructBidiRunsForSegment(topResolver, bidiRuns, segmentEnd, override, previousLineBrokeCleanly);
- }
-#endif
-}
-
</del><span class="cx"> // This function constructs line boxes for all of the text runs in the resolver and computes their position.
</span><span class="cx"> RootInlineBox* RenderBlockFlow::createLineBoxesFromBidiRuns(unsigned bidiLevel, BidiRunList<BidiRun>& bidiRuns, const InlineIterator& end, LineInfo& lineInfo, VerticalPositionCache& verticalPositionCache, BidiRun* trailingSpaceRun, WordMeasurements& wordMeasurements)
</span><span class="cx"> {
</span><span class="lines">@@ -1122,170 +1055,6 @@
</span><span class="cx"> return oldEnd;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-static inline void pushShapeContentOverflowBelowTheContentBox(RenderBlockFlow* block, ShapeInsideInfo* shapeInsideInfo, LayoutUnit lineTop, LayoutUnit lineHeight)
-{
- ASSERT(shapeInsideInfo);
-
- LayoutUnit logicalLineBottom = lineTop + lineHeight;
- LayoutUnit shapeLogicalBottom = shapeInsideInfo->shapeLogicalBottom();
- LayoutUnit shapeContainingBlockLogicalHeight = shapeInsideInfo->shapeContainingBlockLogicalHeight();
-
- bool isOverflowPositionedAlready = (shapeContainingBlockLogicalHeight - shapeInsideInfo->owner().borderAndPaddingAfter() + lineHeight) <= lineTop;
-
- // If the last line overlaps with the shape, we don't need the segments anymore
- if (lineTop < shapeLogicalBottom && shapeLogicalBottom < logicalLineBottom)
- shapeInsideInfo->clearSegments();
-
- if (logicalLineBottom <= shapeLogicalBottom || !shapeContainingBlockLogicalHeight || isOverflowPositionedAlready)
- return;
-
- LayoutUnit newLogicalHeight = block->logicalHeight() + (shapeContainingBlockLogicalHeight - (lineTop + shapeInsideInfo->owner().borderAndPaddingAfter()));
- block->setLogicalHeight(newLogicalHeight);
-}
-
-void RenderBlockFlow::updateShapeAndSegmentsForCurrentLine(ShapeInsideInfo*& shapeInsideInfo, const LayoutSize& logicalOffsetFromShapeContainer, LineLayoutState& layoutState)
-{
- if (layoutState.flowThread())
- return updateShapeAndSegmentsForCurrentLineInFlowThread(shapeInsideInfo, layoutState);
-
- if (!shapeInsideInfo)
- return;
-
- LayoutUnit lineTop = logicalHeight() + logicalOffsetFromShapeContainer.height();
- LayoutUnit lineLeft = logicalOffsetFromShapeContainer.width();
- LayoutUnit lineHeight = this->lineHeight(layoutState.lineInfo().isFirstLine(), isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
-
- // FIXME: Bug 95361: It is possible for a line to grow beyond lineHeight, in which case these segments may be incorrect.
- shapeInsideInfo->updateSegmentsForLine(LayoutSize(lineLeft, lineTop), lineHeight);
-
- pushShapeContentOverflowBelowTheContentBox(this, shapeInsideInfo, lineTop, lineHeight);
-}
-
-void RenderBlockFlow::updateShapeAndSegmentsForCurrentLineInFlowThread(ShapeInsideInfo*& shapeInsideInfo, LineLayoutState& layoutState)
-{
- ASSERT(layoutState.flowThread());
-
- RenderRegion* currentRegion = regionAtBlockOffset(logicalHeight());
- if (!currentRegion || !currentRegion->logicalHeight())
- return;
-
- shapeInsideInfo = currentRegion->shapeInsideInfo();
-
- RenderRegion* nextRegion = 0;
- if (!currentRegion->isLastRegion()) {
- RenderRegionList regionList = layoutState.flowThread()->renderRegionList();
- auto it = regionList.find(currentRegion);
- nextRegion = *(++it);
- }
-
- // We only want to deal regions with shapes, so we check if the next region has a shape
- if (!shapeInsideInfo && nextRegion && !nextRegion->shapeInsideInfo())
- return;
-
- LayoutUnit lineHeight = this->lineHeight(layoutState.lineInfo().isFirstLine(), isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
- LayoutUnit logicalLineTopInFlowThread = logicalHeight() + offsetFromLogicalTopOfFirstPage();
- LayoutUnit logicalLineBottomInFlowThread = logicalLineTopInFlowThread + lineHeight;
- LayoutUnit logicalRegionTopInFlowThread = currentRegion->logicalTopForFlowThreadContent();
- LayoutUnit logicalRegionBottomInFlowThread = logicalRegionTopInFlowThread + currentRegion->logicalHeight() - currentRegion->borderAndPaddingBefore() - currentRegion->borderAndPaddingAfter();
-
- LayoutUnit shapeBottomInFlowThread = LayoutUnit::max();
- if (shapeInsideInfo)
- shapeBottomInFlowThread = shapeInsideInfo->shapeLogicalBottom() + currentRegion->logicalTopForFlowThreadContent();
-
- bool lineOverLapsWithShapeBottom = shapeBottomInFlowThread < logicalLineBottomInFlowThread;
- bool lineTopAdjustedIntoNextRegion = layoutState.adjustedLogicalLineTop() >= currentRegion->logicalHeight();
- bool lineOverLapsWithRegionBottom = logicalLineBottomInFlowThread > logicalRegionBottomInFlowThread || lineTopAdjustedIntoNextRegion;
- bool overFlowsToNextRegion = nextRegion && (lineOverLapsWithShapeBottom || lineOverLapsWithRegionBottom);
-
- // If the line is between two shapes/regions we position the line to the top of the next shape/region
- if (overFlowsToNextRegion) {
- ASSERT(currentRegion != nextRegion);
- LayoutUnit deltaToNextRegion = logicalRegionBottomInFlowThread - logicalLineTopInFlowThread;
- setLogicalHeight(logicalHeight() + deltaToNextRegion);
-
- currentRegion = nextRegion;
- shapeInsideInfo = currentRegion->shapeInsideInfo();
-
- logicalLineTopInFlowThread = logicalHeight() + offsetFromLogicalTopOfFirstPage();
- logicalLineBottomInFlowThread = logicalLineTopInFlowThread + lineHeight;
- logicalRegionTopInFlowThread = currentRegion->logicalTopForFlowThreadContent();
- logicalRegionBottomInFlowThread = logicalRegionTopInFlowThread + currentRegion->logicalHeight() - currentRegion->borderAndPaddingBefore() - currentRegion->borderAndPaddingAfter();
-
- if (lineTopAdjustedIntoNextRegion)
- layoutState.setAdjustedLogicalLineTop(0);
- }
-
- if (!shapeInsideInfo)
- return;
-
- bool isFirstLineInRegion = logicalLineBottomInFlowThread <= (logicalRegionTopInFlowThread + lineHeight);
- bool isFirstLineAdjusted = (logicalLineTopInFlowThread - logicalRegionTopInFlowThread) < (layoutState.adjustedLogicalLineTop() - currentRegion->borderAndPaddingBefore());
- // We position the first line to the top of the shape in the region or to the previously adjusted position in the shape
- if (isFirstLineInRegion || isFirstLineAdjusted) {
- LayoutUnit shapeTopOffset = layoutState.adjustedLogicalLineTop();
-
- if (!shapeTopOffset && (shapeInsideInfo->shapeLogicalTop() > 0))
- shapeTopOffset = shapeInsideInfo->shapeLogicalTop();
-
- LayoutUnit shapePositionInFlowThread = currentRegion->logicalTopForFlowThreadContent() + shapeTopOffset;
- LayoutUnit shapeTopLineTopDelta = shapePositionInFlowThread - logicalLineTopInFlowThread - currentRegion->borderAndPaddingBefore();
-
- setLogicalHeight(logicalHeight() + shapeTopLineTopDelta);
- logicalLineTopInFlowThread += shapeTopLineTopDelta;
- layoutState.setAdjustedLogicalLineTop(0);
- }
-
- LayoutUnit lineTop = logicalLineTopInFlowThread - currentRegion->logicalTopForFlowThreadContent() + currentRegion->borderAndPaddingBefore();
-
- // FIXME: 118571 - Shape inside on a region does not yet take into account its padding for nested flow blocks
- shapeInsideInfo->updateSegmentsForLine(LayoutSize(0, lineTop), lineHeight);
-
- if (currentRegion->isLastRegion())
- pushShapeContentOverflowBelowTheContentBox(this, shapeInsideInfo, lineTop, lineHeight);
-}
-
-static inline LayoutUnit adjustLogicalLineTop(ShapeInsideInfo* shapeInsideInfo, InlineIterator start, InlineIterator end, const WordMeasurements& wordMeasurements)
-{
- if (!shapeInsideInfo || end != start)
- return 0;
-
- float minWidth = firstPositiveWidth(wordMeasurements);
- ASSERT(minWidth || wordMeasurements.isEmpty());
- if (minWidth > 0 && shapeInsideInfo->adjustLogicalLineTop(minWidth))
- return shapeInsideInfo->logicalLineTop();
-
- return shapeInsideInfo->shapeLogicalBottom();
-}
-
-bool RenderBlockFlow::adjustLogicalLineTopAndLogicalHeightIfNeeded(ShapeInsideInfo* shapeInsideInfo, LayoutUnit absoluteLogicalTop, LineLayoutState& layoutState, InlineBidiResolver& resolver, FloatingObject* lastFloatFromPreviousLine, InlineIterator& end, WordMeasurements& wordMeasurements)
-{
- LayoutUnit adjustedLogicalLineTop = adjustLogicalLineTop(shapeInsideInfo, resolver.position(), end, wordMeasurements);
-
- if (shapeInsideInfo && containsFloats()) {
- lastFloatFromPreviousLine = m_floatingObjects->set().last().get();
- if (!wordMeasurements.size()) {
- LayoutUnit floatLogicalTopOffset = shapeInsideInfo->computeFirstFitPositionForFloat(logicalSizeForFloat(lastFloatFromPreviousLine));
- if (logicalHeight() < floatLogicalTopOffset)
- adjustedLogicalLineTop = floatLogicalTopOffset;
- }
- }
-
- if (!adjustedLogicalLineTop)
- return false;
-
- LayoutUnit newLogicalHeight = adjustedLogicalLineTop - absoluteLogicalTop;
-
- if (layoutState.flowThread()) {
- layoutState.setAdjustedLogicalLineTop(adjustedLogicalLineTop);
- newLogicalHeight = logicalHeight();
- }
-
- end = restartLayoutRunsAndFloatsInRange(logicalHeight(), newLogicalHeight, lastFloatFromPreviousLine, resolver, end);
- return true;
-}
-#endif
-
</del><span class="cx"> void RenderBlockFlow::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, InlineBidiResolver& resolver, const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiStatus, unsigned consecutiveHyphenatedLines)
</span><span class="cx"> {
</span><span class="cx"> const RenderStyle& styleToUse = style();
</span><span class="lines">@@ -1298,26 +1067,6 @@
</span><span class="cx">
</span><span class="cx"> LineBreaker lineBreaker(*this);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- LayoutSize logicalOffsetFromShapeContainer;
- ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo();
- if (shapeInsideInfo) {
- ASSERT(&shapeInsideInfo->owner() == this || allowsShapeInsideInfoSharing());
- if (shapeInsideInfo != this->shapeInsideInfo()) {
- // FIXME Bug 100284: If subsequent LayoutStates are pushed, we will have to add
- // their offsets from the original shape-inside container.
- logicalOffsetFromShapeContainer = logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner());
- }
- // Begin layout at the logical top of our shape inside.
- if (logicalHeight() + logicalOffsetFromShapeContainer.height() < shapeInsideInfo->shapeLogicalTop()) {
- LayoutUnit logicalHeight = shapeInsideInfo->shapeLogicalTop() - logicalOffsetFromShapeContainer.height();
- if (layoutState.flowThread())
- logicalHeight -= shapeInsideInfo->owner().borderAndPaddingBefore();
- setLogicalHeight(logicalHeight);
- }
- }
-#endif
-
</del><span class="cx"> while (!end.atEnd()) {
</span><span class="cx"> // FIXME: Is this check necessary before the first iteration or can it be moved to the end?
</span><span class="cx"> if (checkForEndLineMatch) {
</span><span class="lines">@@ -1337,9 +1086,6 @@
</span><span class="cx"> bool isNewUBAParagraph = layoutState.lineInfo().previousLineBrokeCleanly();
</span><span class="cx"> FloatingObject* lastFloatFromPreviousLine = (containsFloats()) ? m_floatingObjects->set().last().get() : 0;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- updateShapeAndSegmentsForCurrentLine(shapeInsideInfo, logicalOffsetFromShapeContainer, layoutState);
-#endif
</del><span class="cx"> WordMeasurements wordMeasurements;
</span><span class="cx"> end = lineBreaker.nextLineBreak(resolver, layoutState.lineInfo(), renderTextInfo, lastFloatFromPreviousLine, consecutiveHyphenatedLines, wordMeasurements);
</span><span class="cx"> renderTextInfo.m_lineBreakIterator.resetPriorContext();
</span><span class="lines">@@ -1353,10 +1099,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- if (adjustLogicalLineTopAndLogicalHeightIfNeeded(shapeInsideInfo, logicalOffsetFromShapeContainer.height(), layoutState, resolver, lastFloatFromPreviousLine, end, wordMeasurements))
- continue;
-#endif
</del><span class="cx"> ASSERT(end != resolver.position());
</span><span class="cx">
</span><span class="cx"> // This is a short-cut for empty lines.
</span><span class="lines">@@ -1373,7 +1115,7 @@
</span><span class="cx"> }
</span><span class="cx"> // FIXME: This ownership is reversed. We should own the BidiRunList and pass it to createBidiRunsForLine.
</span><span class="cx"> BidiRunList<BidiRun>& bidiRuns = resolver.runs();
</span><del>- constructBidiRunsForLine(this, resolver, bidiRuns, end, override, layoutState.lineInfo().previousLineBrokeCleanly());
</del><ins>+ constructBidiRunsForSegment(resolver, bidiRuns, end, override, layoutState.lineInfo().previousLineBrokeCleanly());
</ins><span class="cx"> ASSERT(resolver.position() == end);
</span><span class="cx">
</span><span class="cx"> BidiRun* trailingSpaceRun = !layoutState.lineInfo().previousLineBrokeCleanly() ? handleTrailingSpaces(bidiRuns, resolver.context()) : 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
</span><span class="cx"> LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
</span><span class="cx">
</span><del>- prepareShapesAndPaginationBeforeBlockLayout(relayoutChildren);
</del><ins>+ preparePaginationBeforeBlockLayout(relayoutChildren);
</ins><span class="cx">
</span><span class="cx"> LayoutSize previousSize = size();
</span><span class="cx">
</span><span class="lines">@@ -323,8 +323,6 @@
</span><span class="cx">
</span><span class="cx"> layoutPositionedObjects(relayoutChildren || isRoot());
</span><span class="cx">
</span><del>- updateShapesAfterBlockLayout();
-
</del><span class="cx"> computeOverflow(oldClientAfterEdge);
</span><span class="cx">
</span><span class="cx"> statePusher.pop();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -112,12 +112,6 @@
</span><span class="cx"> if (StyleImage* maskBoxImage = m_style->maskBoxImage().image())
</span><span class="cx"> maskBoxImage->removeClient(this);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- if (auto shapeValue = m_style->shapeInside()) {
- if (auto shapeImage = shapeValue->image())
- shapeImage->removeClient(this);
- }
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> if (auto shapeValue = m_style->shapeOutside()) {
</span><span class="cx"> if (auto shapeImage = shapeValue->image())
</span><span class="lines">@@ -361,9 +355,6 @@
</span><span class="cx"> updateImage(nullptr, m_style->borderImage().image());
</span><span class="cx"> updateImage(nullptr, m_style->maskBoxImage().image());
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- updateShapeImage(nullptr, m_style->shapeInside());
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> updateShapeImage(nullptr, m_style->shapeOutside());
</span><span class="cx"> #endif
</span><span class="lines">@@ -417,9 +408,6 @@
</span><span class="cx"> updateImage(oldStyle.get().borderImage().image(), m_style->borderImage().image());
</span><span class="cx"> updateImage(oldStyle.get().maskBoxImage().image(), m_style->maskBoxImage().image());
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- updateShapeImage(oldStyle.get().shapeInside(), m_style->shapeInside());
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> updateShapeImage(oldStyle.get().shapeOutside(), m_style->shapeOutside());
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
</span><span class="cx">
</span><del>- prepareShapesAndPaginationBeforeBlockLayout(relayoutChildren);
</del><ins>+ preparePaginationBeforeBlockLayout(relayoutChildren);
</ins><span class="cx">
</span><span class="cx"> m_numberOfInFlowChildrenOnFirstLine = -1;
</span><span class="cx">
</span><span class="lines">@@ -294,8 +294,6 @@
</span><span class="cx">
</span><span class="cx"> layoutPositionedObjects(relayoutChildren || isRoot());
</span><span class="cx">
</span><del>- updateShapesAfterBlockLayout();
-
</del><span class="cx"> repaintChildrenDuringLayoutIfMoved(oldChildRects);
</span><span class="cx"> // FIXME: css3/flexbox/repaint-rtl-column.html seems to repaint more overflow than it needs to.
</span><span class="cx"> computeOverflow(clientLogicalBottomAfterRepositioning());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
</span><span class="cx"> LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
</span><span class="cx">
</span><del>- prepareShapesAndPaginationBeforeBlockLayout(relayoutChildren);
</del><ins>+ preparePaginationBeforeBlockLayout(relayoutChildren);
</ins><span class="cx">
</span><span class="cx"> LayoutSize previousSize = size();
</span><span class="cx">
</span><span class="lines">@@ -203,8 +203,6 @@
</span><span class="cx">
</span><span class="cx"> layoutPositionedObjects(relayoutChildren || isRoot());
</span><span class="cx">
</span><del>- updateShapesAfterBlockLayout();
-
</del><span class="cx"> computeOverflow(oldClientAfterEdge);
</span><span class="cx"> statePusher.pop();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -63,9 +63,6 @@
</span><span class="cx"> style.get().setFlowThread(parentStyle.flowThread());
</span><span class="cx"> style.get().setRegionThread(parentStyle.regionThread());
</span><span class="cx"> style.get().setRegionFragment(parentStyle.regionFragment());
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- style.get().setShapeInside(parentStyle.shapeInside());
-#endif
</del><span class="cx">
</span><span class="cx"> return style;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -252,12 +252,7 @@
</span><span class="cx"> {
</span><span class="cx"> // We push LayoutState even if layoutState is disabled because it stores layoutDelta too.
</span><span class="cx"> if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer.hasColumns() || renderer.flowThreadContainingBlock()
</span><del>- || m_layoutState->lineGrid() || (renderer.style().lineGrid() != RenderStyle::initialLineGrid() && renderer.isRenderBlockFlow())
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- || (renderer.isRenderBlock() && toRenderBlock(renderer).shapeInsideInfo())
- || (m_layoutState->shapeInsideInfo() && renderer.isRenderBlock() && !toRenderBlock(renderer).allowsShapeInsideInfoSharing())
-#endif
- ) {
</del><ins>+ || m_layoutState->lineGrid() || (renderer.style().lineGrid() != RenderStyle::initialLineGrid() && renderer.isRenderBlockFlow())) {
</ins><span class="cx"> pushLayoutStateForCurrentFlowThread(renderer);
</span><span class="cx"> m_layoutState = std::make_unique<LayoutState>(std::move(m_layoutState), &renderer, offset, pageHeight, pageHeightChanged, colInfo);
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -116,14 +116,8 @@
</span><span class="cx"> if (flow.parent()->isTextControl() && toRenderTextControl(*flow.parent()).textFormControlElement().placeholderElement())
</span><span class="cx"> return false;
</span><span class="cx"> // These tests only works during layout. Outside layout this function may give false positives.
</span><del>- if (flow.view().layoutState()) {
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- if (flow.view().layoutState()->shapeInsideInfo())
- return false;
-#endif
- if (flow.view().layoutState()->m_columnInfo)
- return false;
- }
</del><ins>+ if (flow.view().layoutState() && flow.view().layoutState()->m_columnInfo)
+ return false;
</ins><span class="cx"> const RenderStyle& style = flow.style();
</span><span class="cx"> if (style.textDecorationsInEffect() != TextDecorationNone)
</span><span class="cx"> return false;
</span><span class="lines">@@ -158,10 +152,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (style.textShadow())
</span><span class="cx"> return false;
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- if (style.resolvedShapeInside())
- return true;
-#endif
</del><span class="cx"> if (style.textOverflow() || (flow.isAnonymousBlock() && flow.parent()->style().textOverflow()))
</span><span class="cx"> return false;
</span><span class="cx"> if (style.hasPseudoStyle(FIRST_LINE) || style.hasPseudoStyle(FIRST_LETTER))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -40,10 +40,6 @@
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-#include "ShapeInsideInfo.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // We don't let our line box tree for a single line get any deeper than this.
</span><span class="lines">@@ -461,46 +457,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-// FIXME: We can move this function & logic into LineWidth::fitBelowFloats
-inline void updateSegmentsForShapes(RenderBlockFlow& block, const FloatingObject* lastFloatFromPreviousLine, const WordMeasurements& wordMeasurements, LineWidth& width, bool isFirstLine)
-{
- ASSERT(lastFloatFromPreviousLine);
-
- ShapeInsideInfo* shapeInsideInfo = block.layoutShapeInsideInfo();
- if (!lastFloatFromPreviousLine->isPlaced() || !shapeInsideInfo)
- return;
-
- bool isHorizontalWritingMode = block.isHorizontalWritingMode();
- LayoutUnit logicalOffsetFromShapeContainer = block.logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner()).height();
-
- LayoutUnit lineLogicalTop = block.logicalHeight() + logicalOffsetFromShapeContainer;
- LayoutUnit lineLogicalHeight = block.lineHeight(isFirstLine, isHorizontalWritingMode ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
- LayoutUnit lineLogicalBottom = lineLogicalTop + lineLogicalHeight;
-
- LayoutUnit floatLogicalTop = block.logicalTopForFloat(lastFloatFromPreviousLine);
- LayoutUnit floatLogicalBottom = block.logicalBottomForFloat(lastFloatFromPreviousLine);
-
- bool lineOverlapsWithFloat = (floatLogicalTop < lineLogicalBottom) && (lineLogicalTop < floatLogicalBottom);
- if (!lineOverlapsWithFloat)
- return;
-
- float minSegmentWidth = firstPositiveWidth(wordMeasurements);
-
- LayoutUnit floatLogicalWidth = block.logicalWidthForFloat(lastFloatFromPreviousLine);
- LayoutUnit availableLogicalWidth = block.logicalWidth() - block.logicalRightForFloat(lastFloatFromPreviousLine);
- if (availableLogicalWidth < minSegmentWidth)
- block.setLogicalHeight(floatLogicalBottom);
-
- if (block.logicalHeight() < floatLogicalTop) {
- shapeInsideInfo->adjustLogicalLineTop(minSegmentWidth + floatLogicalWidth);
- block.setLogicalHeight(shapeInsideInfo->logicalLineTop() - logicalOffsetFromShapeContainer);
- }
-
- width.updateLineSegment(block.logicalHeight());
-}
-#endif
-
</del><span class="cx"> inline bool iteratorIsBeyondEndOfRenderCombineText(const InlineIterator& iter, RenderCombineText& renderer)
</span><span class="cx"> {
</span><span class="cx"> return iter.renderer() == &renderer && iter.offset() >= renderer.textLength();
</span><span class="lines">@@ -772,10 +728,6 @@
</span><span class="cx"> m_appliedStartWidth = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- if (m_lastFloatFromPreviousLine)
- updateSegmentsForShapes(m_block, m_lastFloatFromPreviousLine, wordMeasurements, m_width, m_lineInfo.isFirstLine());
-#endif
</del><span class="cx"> applyWordSpacing = wordSpacing && m_currentCharacterIsSpace;
</span><span class="cx">
</span><span class="cx"> if (!m_width.committedWidth() && m_autoWrap && !m_width.fitsOnLine())
</span><span class="lines">@@ -1072,35 +1024,27 @@
</span><span class="cx">
</span><span class="cx"> inline InlineIterator BreakingContext::handleEndOfLine()
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- ShapeInsideInfo* shapeInfo = m_block.layoutShapeInsideInfo();
- bool segmentAllowsOverflow = !shapeInfo || !shapeInfo->hasSegments();
-#else
- bool segmentAllowsOverflow = true;
-#endif
- if (segmentAllowsOverflow) {
- if (m_lineBreak == m_resolver.position()) {
- if (!m_lineBreak.renderer() || !m_lineBreak.renderer()->isBR()) {
- // we just add as much as possible
- if (m_blockStyle.whiteSpace() == PRE && !m_current.offset()) {
- m_lineBreak.moveTo(m_lastObject, m_lastObject->isText() ? m_lastObject->length() : 0);
- } else if (m_lineBreak.renderer()) {
- // Don't ever break in the middle of a word if we can help it.
- // There's no room at all. We just have to be on this line,
- // even though we'll spill out.
- m_lineBreak.moveTo(m_current.renderer(), m_current.offset());
- }
</del><ins>+ if (m_lineBreak == m_resolver.position()) {
+ if (!m_lineBreak.renderer() || !m_lineBreak.renderer()->isBR()) {
+ // we just add as much as possible
+ if (m_blockStyle.whiteSpace() == PRE && !m_current.offset()) {
+ m_lineBreak.moveTo(m_lastObject, m_lastObject->isText() ? m_lastObject->length() : 0);
+ } else if (m_lineBreak.renderer()) {
+ // Don't ever break in the middle of a word if we can help it.
+ // There's no room at all. We just have to be on this line,
+ // even though we'll spill out.
+ m_lineBreak.moveTo(m_current.renderer(), m_current.offset());
</ins><span class="cx"> }
</span><del>- // make sure we consume at least one char/object.
- if (m_lineBreak == m_resolver.position())
- m_lineBreak.increment();
- } else if (!m_current.offset() && !m_width.committedWidth() && m_width.uncommittedWidth() && !m_hadUncommittedWidthBeforeCurrent) {
- // Do not push the current object to the next line, when this line has some content, but it is still considered empty.
- // Empty inline elements like <span></span> can produce such lines and now we just ignore these break opportunities
- // at the start of a line, if no width has been committed yet.
- // Behave as if it was actually empty and consume at least one object.
- m_lineBreak.increment();
</del><span class="cx"> }
</span><ins>+ // make sure we consume at least one char/object.
+ if (m_lineBreak == m_resolver.position())
+ m_lineBreak.increment();
+ } else if (!m_current.offset() && !m_width.committedWidth() && m_width.uncommittedWidth() && !m_hadUncommittedWidthBeforeCurrent) {
+ // Do not push the current object to the next line, when this line has some content, but it is still considered empty.
+ // Empty inline elements like <span></span> can produce such lines and now we just ignore these break opportunities
+ // at the start of a line, if no width has been committed yet.
+ // Behave as if it was actually empty and consume at least one object.
+ m_lineBreak.increment();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Sanity check our midpoints.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineBreakercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineBreaker.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineBreaker.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/line/LineBreaker.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">
</span><span class="cx"> #include "BreakingContextInlineHeaders.h"
</span><span class="cx"> #include "RenderCombineText.h"
</span><del>-#include "ShapeInsideInfo.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -80,56 +79,7 @@
</span><span class="cx">
</span><span class="cx"> InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo& lineInfo, RenderTextInfo& renderTextInfo, FloatingObject* lastFloatFromPreviousLine, unsigned consecutiveHyphenatedLines, WordMeasurements& wordMeasurements)
</span><span class="cx"> {
</span><del>-#if !ENABLE(CSS_SHAPES) || !ENABLE(CSS_SHAPE_INSIDE)
</del><span class="cx"> return nextSegmentBreak(resolver, lineInfo, renderTextInfo, lastFloatFromPreviousLine, consecutiveHyphenatedLines, wordMeasurements);
</span><del>-#else
- ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo();
-
- if (!shapeInsideInfo || !shapeInsideInfo->lineOverlapsShapeBounds())
- return nextSegmentBreak(resolver, lineInfo, renderTextInfo, lastFloatFromPreviousLine, consecutiveHyphenatedLines, wordMeasurements);
-
- InlineIterator end = resolver.position();
- InlineIterator oldEnd = end;
-
- if (!shapeInsideInfo->hasSegments()) {
- end = nextSegmentBreak(resolver, lineInfo, renderTextInfo, lastFloatFromPreviousLine, consecutiveHyphenatedLines, wordMeasurements);
- resolver.setPositionIgnoringNestedIsolates(oldEnd);
- return oldEnd;
- }
-
- const SegmentList& segments = shapeInsideInfo->segments();
- SegmentRangeList& segmentRanges = shapeInsideInfo->segmentRanges();
-
- for (unsigned i = 0; i < segments.size() && !end.atEnd(); i++) {
- InlineIterator segmentStart = resolver.position();
- end = nextSegmentBreak(resolver, lineInfo, renderTextInfo, lastFloatFromPreviousLine, consecutiveHyphenatedLines, wordMeasurements);
-
- ASSERT(segmentRanges.size() == i);
- if (resolver.position().atEnd()) {
- segmentRanges.append(LineSegmentRange(segmentStart, end));
- break;
- }
- if (resolver.position() == end) {
- // Nothing fit this segment
- end = segmentStart;
- segmentRanges.append(LineSegmentRange(segmentStart, segmentStart));
- resolver.setPositionIgnoringNestedIsolates(segmentStart);
- } else {
- // Note that resolver.position is already skipping some of the white space at the beginning of the line,
- // so that's why segmentStart might be different than resolver.position().
- LineSegmentRange range(resolver.position(), end);
- segmentRanges.append(range);
- resolver.setPosition(end, numberOfIsolateAncestors(end));
-
- if (lineInfo.previousLineBrokeCleanly()) {
- // If we hit a new line break, just stop adding anything to this line.
- break;
- }
- }
- }
- resolver.setPositionIgnoringNestedIsolates(oldEnd);
- return end;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InlineIterator LineBreaker::nextSegmentBreak(InlineBidiResolver& resolver, LineInfo& lineInfo, RenderTextInfo& renderTextInfo, FloatingObject* lastFloatFromPreviousLine, unsigned consecutiveHyphenatedLines, WordMeasurements& wordMeasurements)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -33,10 +33,6 @@
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "RenderRubyRun.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-#include "ShapeInsideInfo.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> LineWidth::LineWidth(RenderBlockFlow& block, bool isFirstLine, IndentTextOrNot shouldIndentText)
</span><span class="lines">@@ -49,15 +45,9 @@
</span><span class="cx"> , m_left(0)
</span><span class="cx"> , m_right(0)
</span><span class="cx"> , m_availableWidth(0)
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- , m_segment(0)
-#endif
</del><span class="cx"> , m_isFirstLine(isFirstLine)
</span><span class="cx"> , m_shouldIndentText(shouldIndentText)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- updateCurrentShapeSegment();
-#endif
</del><span class="cx"> updateAvailableWidth();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -83,13 +73,6 @@
</span><span class="cx"> m_left = m_block.logicalLeftOffsetForLine(height, shouldIndentText(), logicalHeight);
</span><span class="cx"> m_right = m_block.logicalRightOffsetForLine(height, shouldIndentText(), logicalHeight);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- if (m_segment) {
- m_left = std::max<float>(m_segment->logicalLeft, m_left);
- m_right = std::min<float>(m_segment->logicalRight, m_right);
- }
-#endif
-
</del><span class="cx"> computeAvailableWidthFromLeftAndRight();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -216,22 +199,7 @@
</span><span class="cx"> }
</span><span class="cx"> updateLineDimension(newLineTop, newLineWidth, newLineLeft, newLineRight);
</span><span class="cx"> }
</span><del>-
-#if ENABLE(CSS_SHAPE_INSIDE)
-void LineWidth::updateLineSegment(const LayoutUnit& lineTop)
-{
- ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo();
- if (!shapeInsideInfo)
- return;
-
- LayoutUnit logicalOffsetFromShapeContainer = m_block.logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner()).height();
- LayoutUnit lineHeight = m_block.lineHeight(false, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
- shapeInsideInfo->updateSegmentsForLine(lineTop + logicalOffsetFromShapeContainer, lineHeight);
- updateCurrentShapeSegment();
- updateAvailableWidth();
-}
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void LineWidth::fitBelowFloats(bool isFirstLine)
</span><span class="cx"> {
</span><span class="lines">@@ -262,12 +230,8 @@
</span><span class="cx"> newLineWidth = availableWidthAtOffset(m_block, floatLogicalBottom, shouldIndentText(), newLineLeft, newLineRight);
</span><span class="cx"> lastFloatLogicalBottom = floatLogicalBottom;
</span><span class="cx">
</span><del>- if (newLineWidth >= m_uncommittedWidth) {
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- updateLineSegment(lastFloatLogicalBottom);
-#endif
</del><ins>+ if (newLineWidth >= m_uncommittedWidth)
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> updateLineDimension(lastFloatLogicalBottom, newLineWidth, newLineLeft, newLineRight);
</span><span class="lines">@@ -279,14 +243,6 @@
</span><span class="cx"> m_trailingWhitespaceWidth = collapsedWhitespace + borderPaddingMargin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-void LineWidth::updateCurrentShapeSegment()
-{
- if (ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo())
- m_segment = shapeInsideInfo->currentSegment();
-}
-#endif
-
</del><span class="cx"> void LineWidth::computeAvailableWidthFromLeftAndRight()
</span><span class="cx"> {
</span><span class="cx"> m_availableWidth = std::max<float>(0, m_right - m_left) + m_overhangWidth;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.h (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.h 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/line/LineWidth.h 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -67,9 +67,6 @@
</span><span class="cx"> void fitBelowFloats(bool isFirstLine = false);
</span><span class="cx"> void setTrailingWhitespaceWidth(float collapsedWhitespace, float borderPaddingMargin = 0);
</span><span class="cx"> bool shouldIndentText() const { return m_shouldIndentText == IndentText; }
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- void updateLineSegment(const LayoutUnit&);
-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void computeAvailableWidthFromLeftAndRight();
</span><span class="lines">@@ -77,10 +74,7 @@
</span><span class="cx"> void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, float newLineLeft, float newLineRight);
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> void wrapNextToShapeOutside(bool isFirstLine);
</span><del>-#if ENABLE(CSS_SHAPE_INSIDE)
- void updateCurrentShapeSegment();
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RenderBlockFlow& m_block;
</span><span class="cx"> float m_uncommittedWidth;
</span><span class="lines">@@ -91,9 +85,6 @@
</span><span class="cx"> float m_left;
</span><span class="cx"> float m_right;
</span><span class="cx"> float m_availableWidth;
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- const LineSegment* m_segment;
-#endif
</del><span class="cx"> bool m_isFirstLine;
</span><span class="cx"> IndentTextOrNot m_shouldIndentText;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfocpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,132 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ShapeInsideInfo.h"
-
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-
-#include "InlineIterator.h"
-#include "RenderBlock.h"
-
-namespace WebCore {
-
-LineSegmentRange::LineSegmentRange(const InlineIterator& start, const InlineIterator& end)
- : start(start.root(), start.renderer(), start.offset())
- , end(end.root(), end.renderer(), end.offset())
- {
- }
-
-bool ShapeInsideInfo::isEnabledFor(const RenderBlock& renderer)
-{
- ShapeValue* shapeValue = renderer.style().resolvedShapeInside();
- if (!shapeValue)
- return false;
-
- switch (shapeValue->type()) {
- case ShapeValue::Shape:
- return shapeValue->shape() && shapeValue->shape()->type() != BasicShape::BasicShapeInsetType;
- case ShapeValue::Image:
- return shapeValue->isImageValid() && checkShapeImageOrigin(renderer.document(), *(shapeValue->image()->cachedImage()));
- case ShapeValue::Box:
- return true;
- case ShapeValue::Outside:
- // Outside value must already be resolved
- break;
- }
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool ShapeInsideInfo::updateSegmentsForLine(LayoutSize lineOffset, LayoutUnit lineHeight)
-{
- m_segmentRanges.clear();
- bool result = updateSegmentsForLine(lineOffset.height(), lineHeight);
- for (size_t i = 0; i < m_segments.size(); i++) {
- m_segments[i].logicalLeft -= lineOffset.width();
- m_segments[i].logicalRight -= lineOffset.width();
- }
- return result;
-}
-
-bool ShapeInsideInfo::updateSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight)
-{
- ASSERT(lineHeight >= 0);
- m_referenceBoxLineTop = lineTop - logicalTopOffset();
- m_lineHeight = lineHeight;
- m_segments.clear();
- m_segmentRanges.clear();
-
- if (lineOverlapsShapeBounds())
- m_segments = computeSegmentsForLine(lineTop, lineHeight);
-
- return m_segments.size();
-}
-
-bool ShapeInsideInfo::adjustLogicalLineTop(float minSegmentWidth)
-{
- const Shape& shape = computedShape();
- if (m_lineHeight <= 0 || logicalLineTop() > shapeLogicalBottom())
- return false;
-
- LayoutUnit newLineTop;
- if (shape.firstIncludedIntervalLogicalTop(m_referenceBoxLineTop, FloatSize(minSegmentWidth, m_lineHeight), newLineTop)) {
- if (newLineTop > m_referenceBoxLineTop) {
- m_referenceBoxLineTop = newLineTop;
- return true;
- }
- }
-
- return false;
-}
-
-ShapeValue* ShapeInsideInfo::shapeValue() const
-{
- return m_renderer.style().resolvedShapeInside();
-}
-
-const RenderStyle& ShapeInsideInfo::styleForWritingMode() const
-{
- return m_renderer.style();
-}
-
-LayoutUnit ShapeInsideInfo::computeFirstFitPositionForFloat(const FloatSize floatSize) const
-{
- if (!floatSize.width() || shapeLogicalBottom() < logicalLineTop())
- return 0;
-
- LayoutUnit firstFitPosition = 0;
- if (computedShape().firstIncludedIntervalLogicalTop(m_referenceBoxLineTop, floatSize, firstFitPosition) && (m_referenceBoxLineTop <= firstFitPosition))
- return firstFitPosition;
-
- return 0;
-}
-
-}
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfoh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,135 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ShapeInsideInfo_h
-#define ShapeInsideInfo_h
-
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
-
-#include "ShapeInfo.h"
-#include <wtf/PassOwnPtr.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-class InlineIterator;
-class RenderBlock;
-class RenderElement;
-class RenderObject;
-
-struct LineSegmentIterator {
- RenderElement* root;
- RenderObject* object;
- unsigned offset;
- LineSegmentIterator(RenderElement* root, RenderObject* object, unsigned offset)
- : root(root)
- , object(object)
- , offset(offset)
- {
- }
-};
-
-struct LineSegmentRange {
- LineSegmentIterator start;
- LineSegmentIterator end;
- LineSegmentRange(const InlineIterator& start, const InlineIterator& end);
-};
-
-typedef Vector<LineSegmentRange> SegmentRangeList;
-
-class ShapeInsideInfo final : public ShapeInfo<RenderBlock> {
-public:
- ShapeInsideInfo(const RenderBlock& renderer)
- : ShapeInfo<RenderBlock>(renderer)
- , m_needsLayout(false)
- {
- }
-
- static bool isEnabledFor(const RenderBlock& renderer);
-
- bool updateSegmentsForLine(LayoutSize lineOffset, LayoutUnit lineHeight);
- bool updateSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight);
-
- bool hasSegments() const
- {
- return lineOverlapsShapeBounds() && m_segments.size();
- }
- const SegmentList& segments() const
- {
- ASSERT(hasSegments());
- return m_segments;
- }
- SegmentRangeList& segmentRanges() { return m_segmentRanges; }
- const SegmentRangeList& segmentRanges() const { return m_segmentRanges; }
- const LineSegment* currentSegment() const
- {
- if (!hasSegments())
- return 0;
- ASSERT(m_segmentRanges.size() < m_segments.size());
- return &m_segments[m_segmentRanges.size()];
- }
- void clearSegments() { m_segments.clear(); }
- bool adjustLogicalLineTop(float minSegmentWidth);
- LayoutUnit computeFirstFitPositionForFloat(const FloatSize) const;
-
- void setNeedsLayout(bool value) { m_needsLayout = value; }
- bool needsLayout() { return m_needsLayout; }
-
- virtual bool lineOverlapsShapeBounds() const override
- {
- return computedShape().lineOverlapsShapePaddingBounds(m_referenceBoxLineTop, m_lineHeight);
- }
-
-protected:
- virtual CSSBoxType referenceBox() const override
- {
- if (shapeValue()->cssBox() == BoxMissing)
- return ContentBox;
-
- return shapeValue()->cssBox();
- }
-
- virtual const RenderStyle& styleForWritingMode() const override;
-
-private:
- virtual LayoutRect computedShapeLogicalBoundingBox() const override { return computedShape().shapePaddingLogicalBoundingBox(); }
- virtual ShapeValue* shapeValue() const override;
- virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, SegmentList& segments) const override
- {
- return computedShape().getIncludedIntervals(lineTop, lineHeight, segments);
- }
-
- SegmentRangeList m_segmentRanges;
- bool m_needsLayout:1;
- SegmentList m_segments;
-};
-
-}
-#endif
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -461,11 +461,6 @@
</span><span class="cx"> if (rareNonInheritedData->m_dashboardRegions != other->rareNonInheritedData->m_dashboardRegions)
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><del>-
-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData->m_shapeInside)
- return true;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (rareInheritedData.get() != other->rareInheritedData.get()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1498,24 +1498,6 @@
</span><span class="cx"> SVGLength kerning() const { return svgStyle().kerning(); }
</span><span class="cx"> void setKerning(SVGLength k) { accessSVGStyle().setKerning(k); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- void setShapeInside(PassRefPtr<ShapeValue> value)
- {
- if (rareNonInheritedData->m_shapeInside == value)
- return;
- rareNonInheritedData.access()->m_shapeInside = value;
- }
- ShapeValue* shapeInside() const { return rareNonInheritedData->m_shapeInside.get(); }
- ShapeValue* resolvedShapeInside() const
- {
- ShapeValue* shapeInside = this->shapeInside();
- if (shapeInside && shapeInside->type() == ShapeValue::Outside)
- return shapeOutside();
- return shapeInside;
- }
-
- static ShapeValue* initialShapeInside() { return 0; }
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> void setShapeOutside(PassRefPtr<ShapeValue> value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -55,9 +55,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_mask(FillLayer(MaskFillLayer))
</span><span class="cx"> , m_pageSize()
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- , m_shapeInside(RenderStyle::initialShapeInside())
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> , m_shapeOutside(RenderStyle::initialShapeOutside())
</span><span class="cx"> , m_shapeMargin(RenderStyle::initialShapeMargin())
</span><span class="lines">@@ -131,9 +128,6 @@
</span><span class="cx"> , m_mask(o.m_mask)
</span><span class="cx"> , m_maskBoxImage(o.m_maskBoxImage)
</span><span class="cx"> , m_pageSize(o.m_pageSize)
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- , m_shapeInside(o.m_shapeInside)
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> , m_shapeOutside(o.m_shapeOutside)
</span><span class="cx"> , m_shapeMargin(o.m_shapeMargin)
</span><span class="lines">@@ -225,9 +219,6 @@
</span><span class="cx"> && m_mask == o.m_mask
</span><span class="cx"> && m_maskBoxImage == o.m_maskBoxImage
</span><span class="cx"> && m_pageSize == o.m_pageSize
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- && m_shapeInside == o.m_shapeInside
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> && m_shapeOutside == o.m_shapeOutside
</span><span class="cx"> && m_shapeMargin == o.m_shapeMargin
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -140,9 +140,6 @@
</span><span class="cx">
</span><span class="cx"> LengthSize m_pageSize;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
- RefPtr<ShapeValue> m_shapeInside;
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> RefPtr<ShapeValue> m_shapeOutside;
</span><span class="cx"> Length m_shapeMargin;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-26 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove shape-inside support
+ https://bugs.webkit.org/show_bug.cgi?id=130698
+
+ Reviewed by David Hyatt.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-03-25 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Inspector View Indication Support
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><del>-ENABLE_CSS_SHAPE_INSIDE = ENABLE_CSS_SHAPE_INSIDE;
</del><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="lines">@@ -225,4 +224,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-26 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove shape-inside support
+ https://bugs.webkit.org/show_bug.cgi?id=130698
+
+ Reviewed by David Hyatt.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-03-26 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] Flush all surfaces after painting into all of them, instead of after painting into each one
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><del>-ENABLE_CSS_SHAPE_INSIDE = ENABLE_CSS_SHAPE_INSIDE;
</del><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="lines">@@ -225,4 +224,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPE_INSIDE "Toggle CSS Shapes Inside support" OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_STICKY_POSITION "Toggle CSS sticky position support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED "Toggle support for unprefixed CSS animations and transforms" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Source/cmakeconfig.h.cmake 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_IMAGE_SET
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_REGIONS
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_SHAPES
</span><del>-#cmakedefine01 ENABLE_CSS_SHAPE_INSIDE
</del><span class="cx"> #cmakedefine01 ENABLE_CSS_STICKY_POSITION
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED
</span><span class="cx"> #cmakedefine01 ENABLE_CSS3_CONDITIONAL_RULES
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Tools/ChangeLog 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-26 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove shape-inside support
+ https://bugs.webkit.org/show_bug.cgi?id=130698
+
+ Reviewed by David Hyatt.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
</ins><span class="cx"> 2014-02-27 Gurpreet Kaur <k.gurpreet@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Add myself as a committer.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (166300 => 166301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-03-26 17:02:15 UTC (rev 166300)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-03-26 18:20:15 UTC (rev 166301)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> $cssRegionsSupport,
</span><span class="cx"> $cssShadersSupport,
</span><span class="cx"> $cssShapesSupport,
</span><del>- $cssShapeInsideSupport,
</del><span class="cx"> $cssStickyPositionSupport,
</span><span class="cx"> $cssCompositingSupport,
</span><span class="cx"> $cssAnimationsTransformsUnprefixedSupport,
</span><span class="lines">@@ -191,9 +190,6 @@
</span><span class="cx"> { option => "css-shapes", desc => "Toggle CSS Shapes support",
</span><span class="cx"> define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
</span><span class="cx">
</span><del>- { option => "css-shape-inside", desc => "Toggle CSS Shapes shape-inside support",
- define => "ENABLE_CSS_SHAPE_INSIDE", default => 1, value => \$cssShapeInsideSupport },
-
</del><span class="cx"> { option => "css-filters", desc => "Toggle CSS Filters support",
</span><span class="cx"> define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isIOSWebKit()), value => \$cssFiltersSupport },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>