[CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
authorbetravis@adobe.com <betravis@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Jun 2013 23:05:57 +0000 (23:05 +0000)
committerbetravis@adobe.com <betravis@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Jun 2013 23:05:57 +0000 (23:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=117172

Reviewed by Alexandru Chiculita.

.:

Adding the CSS_SHAPES compile flag.

* Source/autotools/SetupWebKitFeatures.m4:
* Source/autotools/symbols.filter:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:

Source/JavaScriptCore:

Adding the CSS_SHAPES compile flag.

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

This patch adds a new compile and runtime flag for the CSS Shapes feature, which
has split off from the previous CSS Exclusions and Shapes specification. The
specifications are available here:
http://dev.w3.org/csswg/css-exclusions/
http://dev.w3.org/csswg/css-shapes/

The changes introduce a new CSS_SHAPES compile flag, and a new cssShapesEnabled
runtime flag. In general, the code changes are simple renames.

Refactoring, no new tests.

* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setCSSShapesEnabled):
(WebCore::RuntimeEnabledFeatures::cssShapesEnabled):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isSimpleLengthPropertyID):
(WebCore::CSSParser::parseValue):
* css/CSSProperty.cpp:
(WebCore::CSSProperty::isInheritedProperty):
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::loadPendingImages):
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimation::ensurePropertyMap):
* rendering/BidiRun.h:
(WebCore::BidiRun::BidiRun):
* rendering/ExclusionShapeInfo.cpp:
* rendering/ExclusionShapeInfo.h:
* rendering/ExclusionShapeInsideInfo.cpp:
* rendering/ExclusionShapeInsideInfo.h:
* rendering/ExclusionShapeOutsideInfo.cpp:
* rendering/ExclusionShapeOutsideInfo.h:
* rendering/LayoutState.cpp:
(WebCore::LayoutState::LayoutState):
* rendering/LayoutState.h:
(WebCore::LayoutState::LayoutState):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::styleDidChange):
(WebCore::exclusionInfoRequiresRelayout):
(WebCore::RenderBlock::updateRegionsAndExclusionsBeforeChildLayout):
(WebCore::RenderBlock::updateRegionsAndExclusionsAfterChildLayout):
(WebCore::RenderBlock::insertFloatingObject):
(WebCore::RenderBlock::computeLogicalLocationForFloat):
(WebCore::RenderBlock::positionNewFloats):
(WebCore::::collectIfNeeded):
(WebCore::RenderBlock::logicalLeftOffsetForLine):
(WebCore::RenderBlock::logicalRightOffsetForLine):
* rendering/RenderBlock.h:
(WebCore::RenderBlock::xPositionForFloatIncludingMargin):
(WebCore::RenderBlock::yPositionForFloatIncludingMargin):
(WebCore::RenderBlock::FloatIntervalSearchAdapter::FloatIntervalSearchAdapter):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::LineWidth::LineWidth):
(WebCore::LineWidth::updateAvailableWidth):
(WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded):
(WebCore::RenderBlock::constructLine):
(WebCore::computeExpansionForJustifiedText):
(WebCore::RenderBlock::computeInlineDirectionPositionsForLine):
(WebCore::RenderBlock::computeInlineDirectionPositionsForSegment):
(WebCore::constructBidiRunsForLine):
(WebCore::RenderBlock::layoutRunsAndFloatsInRange):
(WebCore::RenderBlock::LineBreaker::nextLineBreak):
(WebCore::RenderBlock::LineBreaker::nextSegmentBreak):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::willBeDestroyed):
(WebCore::RenderBox::styleDidChange):
* rendering/RenderBox.h:
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintOffset):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::shouldBeNormalFlowOnly):
* rendering/RenderObject.h:
(WebCore::RenderObject::hasPaintOffset):
* rendering/RenderView.h:
(WebCore::RenderView::pushLayoutState):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
* rendering/style/RenderStyle.h:
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setCSSShapesEnabled):

Source/WebKit/blackberry:

Adding the CSS_SHAPES compile flag.

* WebCoreSupport/AboutDataEnableFeatures.in:

Source/WebKit/mac:

Adding the CSS_SHAPES compile flag.

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

Adding the CSS_SHAPES compile flag.

* Configurations/FeatureDefines.xcconfig:

Tools:

Adding the CSS_SHAPES compile flag.

* Scripts/webkitperl/FeatureList.pm:
* qmake/mkspecs/features/features.pri:

WebKitLibraries:

Adding the CSS_SHAPES compile flag.

* win/tools32/vsprops/FeatureDefines.vsprops:
* win/tools32/vsprops/FeatureDefinesCairo.vsprops:

LayoutTests:

Adjusting the shape inside tests to use the new setCSSShapesEnabled method, rather
than the older setCSSExclusionsEnabled method.

* fast/exclusions/css-exclusions-disabled.html:
* fast/exclusions/parsing/script-tests/parsing-shape-inside.js:
* fast/exclusions/parsing/script-tests/parsing-shape-lengths.js:
* fast/exclusions/parsing/script-tests/parsing-shape-margin.js:
* fast/exclusions/parsing/script-tests/parsing-shape-outside.js:
* fast/exclusions/parsing/script-tests/parsing-shape-padding.js:
* fast/exclusions/resources/multi-segment-polygon.js:
(generatePolygon):
* fast/exclusions/resources/simple-polygon.js:
* fast/exclusions/resources/simple-rectangle.js:
* fast/exclusions/shape-inside/shape-inside-animation.html:
* fast/exclusions/shape-inside/shape-inside-bottom-edge.html:
* fast/exclusions/shape-inside/shape-inside-box-sizing.html:
* fast/exclusions/shape-inside/shape-inside-circle-padding.html:
* fast/exclusions/shape-inside/shape-inside-circle.html:
* fast/exclusions/shape-inside/shape-inside-coincident-vertices-expected.html:
* fast/exclusions/shape-inside/shape-inside-coincident-vertices.html:
* fast/exclusions/shape-inside/shape-inside-collinear-vertices-expected.html:
* fast/exclusions/shape-inside/shape-inside-collinear-vertices.html:
* fast/exclusions/shape-inside/shape-inside-counterclockwise-polygon-expected.html:
* fast/exclusions/shape-inside/shape-inside-counterclockwise-polygon.html:
* fast/exclusions/shape-inside/shape-inside-dynamic-nested-expected.html:
* fast/exclusions/shape-inside/shape-inside-dynamic-nested.html:
* fast/exclusions/shape-inside/shape-inside-dynamic-shape.html:
* fast/exclusions/shape-inside/shape-inside-dynamic-text.html:
* fast/exclusions/shape-inside/shape-inside-ellipse-padding.html:
* fast/exclusions/shape-inside/shape-inside-ellipse.html:
* fast/exclusions/shape-inside/shape-inside-empty-expected.html:
* fast/exclusions/shape-inside/shape-inside-empty.html:
* fast/exclusions/shape-inside/shape-inside-first-fit-001.html:
* fast/exclusions/shape-inside/shape-inside-first-fit-002.html:
* fast/exclusions/shape-inside/shape-inside-first-fit-003.html:
* fast/exclusions/shape-inside/shape-inside-first-fit-004-expected.html:
* fast/exclusions/shape-inside/shape-inside-first-fit-004.html:
* fast/exclusions/shape-inside/shape-inside-first-fit-reflex.html:
* fast/exclusions/shape-inside/shape-inside-inline-elements.html:
* fast/exclusions/shape-inside/shape-inside-multiple-blocks-vertical.html:
* fast/exclusions/shape-inside/shape-inside-multiple-blocks.html:
* fast/exclusions/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html:
* fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html:
* fast/exclusions/shape-inside/shape-inside-overflow.html:
* fast/exclusions/shape-inside/shape-inside-partial-fill-001.html:
* fast/exclusions/shape-inside/shape-inside-partial-fill-002.html:
* fast/exclusions/shape-inside/shape-inside-percentage-auto.html:
* fast/exclusions/shape-inside/shape-inside-percentage.html:
* fast/exclusions/shape-inside/shape-inside-polygon-layout.html:
* fast/exclusions/shape-inside/shape-inside-polygon-padding-001.html:
* fast/exclusions/shape-inside/shape-inside-polygon-padding-002.html:
* fast/exclusions/shape-inside/shape-inside-polygon-padding-003.html:
* fast/exclusions/shape-inside/shape-inside-polygon-rectangle.html:
* fast/exclusions/shape-inside/shape-inside-polygon-zoom.html:
* fast/exclusions/shape-inside/shape-inside-rectangle-padding.html:
* fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-001-expected.html:
* fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-001.html:
* fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-002-expected.html:
* fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-002.html:
* fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-003-expected.html:
* fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-003.html:
* fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-004-expected.html:
* fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-004.html:
* fast/exclusions/shape-inside/shape-inside-regular-polygon16-expected.html:
* fast/exclusions/shape-inside/shape-inside-regular-polygon16.html:
* fast/exclusions/shape-inside/shape-inside-regular-polygon8-expected.html:
* fast/exclusions/shape-inside/shape-inside-regular-polygon8.html:
* fast/exclusions/shape-inside/shape-inside-rounded-rectangle-001.html:
* fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-001-expected.html:
* fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-001.html:
* fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html:
* fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-002.html:
* fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-003-expected.html:
* fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-003.html:
* fast/exclusions/shape-inside/shape-inside-rounded-rectangle-padding.html:
* fast/exclusions/shape-inside/shape-inside-shape-logical-top.html:
* fast/exclusions/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout-expected.html:
* fast/exclusions/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout.html:
* fast/exclusions/shape-inside/shape-inside-text.html:
* fast/exclusions/shape-inside/shape-inside-vertical-text.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-bottom.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-left-margin-polygon.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-margin-is-ignored.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-overflow-hidden.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-overhang.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-positioning.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-right-margin-polygon.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-circle.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-ellipse.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-inset-rectangle.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-polygon.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rectangle-horizontal-multiple.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rectangle.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html:
* fast/exclusions/shape-outside-floats/shape-outside-floats-stacked.html:
* fast/regions/shape-inside/shape-inside-on-additional-regions.html:
* fast/regions/shape-inside/shape-inside-on-first-region-block-content.html:
* fast/regions/shape-inside/shape-inside-on-first-region-inline-content-expected.html:
* fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html:
* fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html:
* fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html:
* fast/regions/shape-inside/shape-inside-on-regions-expected.html:
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html:
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html:
* fast/regions/shape-inside/shape-inside-on-regions-inline-content.html:
* fast/regions/shape-inside/shape-inside-on-regions.html:
* fast/regions/shape-inside/shape-inside-on-second-region-block-content.html:
* fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html:
* fast/regions/shape-inside/shape-inside-recursive-layout.html:
* fast/regions/shape-inside/shape-inside-with-region-borders.html:
* fast/regions/shape-inside/shape-inside-with-region-padding.html:

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

173 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/fast/exclusions/css-exclusions-disabled.html
LayoutTests/fast/exclusions/parsing/script-tests/parsing-shape-inside.js
LayoutTests/fast/exclusions/parsing/script-tests/parsing-shape-lengths.js
LayoutTests/fast/exclusions/parsing/script-tests/parsing-shape-margin.js
LayoutTests/fast/exclusions/parsing/script-tests/parsing-shape-outside.js
LayoutTests/fast/exclusions/parsing/script-tests/parsing-shape-padding.js
LayoutTests/fast/exclusions/resources/multi-segment-polygon.js
LayoutTests/fast/exclusions/resources/simple-polygon.js
LayoutTests/fast/exclusions/resources/simple-rectangle.js
LayoutTests/fast/exclusions/shape-inside/shape-inside-animation.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-bottom-edge.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-box-sizing.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-circle-padding.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-circle.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-coincident-vertices-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-coincident-vertices.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-collinear-vertices-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-collinear-vertices.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-counterclockwise-polygon-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-counterclockwise-polygon.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-nested-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-nested.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-shape.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-text.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-ellipse-padding.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-ellipse.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-empty-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-empty.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-first-fit-001.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-first-fit-002.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-first-fit-003.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-first-fit-004-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-first-fit-004.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-first-fit-reflex.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-inline-elements.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-multiple-blocks-vertical.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-multiple-blocks.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-partial-fill-001.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-partial-fill-002.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage-auto.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-polygon-layout.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-polygon-padding-001.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-polygon-padding-002.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-polygon-padding-003.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-polygon-rectangle.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-polygon-zoom.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rectangle-padding.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-001-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-001.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-002-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-002.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-003-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-003.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-004-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-004.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-regular-polygon16-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-regular-polygon16.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-regular-polygon8-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-regular-polygon8.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rounded-rectangle-001.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-001-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-001.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-002.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-003-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-003.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-rounded-rectangle-padding.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-shape-logical-top.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout-expected.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-text.html
LayoutTests/fast/exclusions/shape-inside/shape-inside-vertical-text.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-bottom.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-left-margin-polygon.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-margin-is-ignored.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-overflow-hidden.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-overhang.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-positioning.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-right-margin-polygon.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-circle.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-ellipse.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-inset-rectangle.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-polygon.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rectangle-horizontal-multiple.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rectangle.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html
LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-stacked.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-additional-regions.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-block-content.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-inline-content-expected.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-expected.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-regions.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-block-content.html
LayoutTests/fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html
LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html
LayoutTests/fast/regions/shape-inside/shape-inside-with-region-borders.html
LayoutTests/fast/regions/shape-inside/shape-inside-with-region-padding.html
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.order
Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSProperty.cpp
Source/WebCore/css/CSSPropertyNames.in
Source/WebCore/css/DeprecatedStyleBuilder.cpp
Source/WebCore/css/StyleResolver.cpp
Source/WebCore/page/animation/CSSPropertyAnimation.cpp
Source/WebCore/platform/text/BidiResolver.h
Source/WebCore/rendering/BidiRun.h
Source/WebCore/rendering/ExclusionShapeInfo.cpp
Source/WebCore/rendering/ExclusionShapeInfo.h
Source/WebCore/rendering/ExclusionShapeInsideInfo.cpp
Source/WebCore/rendering/ExclusionShapeInsideInfo.h
Source/WebCore/rendering/ExclusionShapeOutsideInfo.cpp
Source/WebCore/rendering/ExclusionShapeOutsideInfo.h
Source/WebCore/rendering/LayoutState.cpp
Source/WebCore/rendering/LayoutState.h
Source/WebCore/rendering/RenderBlock.cpp
Source/WebCore/rendering/RenderBlock.h
Source/WebCore/rendering/RenderBlockLineLayout.cpp
Source/WebCore/rendering/RenderBox.cpp
Source/WebCore/rendering/RenderBox.h
Source/WebCore/rendering/RenderBoxModelObject.cpp
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/rendering/RenderObject.h
Source/WebCore/rendering/RenderView.h
Source/WebCore/rendering/style/RenderStyle.cpp
Source/WebCore/rendering/style/RenderStyle.h
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/InternalSettings.h
Source/WebCore/testing/InternalSettings.idl
Source/WebKit/blackberry/ChangeLog
Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/autotools/SetupWebKitFeatures.m4
Source/autotools/symbols.filter
Source/cmake/WebKitFeatures.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/webkitperl/FeatureList.pm
Tools/qmake/mkspecs/features/features.pri
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools32/vsprops/FeatureDefines.vsprops
WebKitLibraries/win/tools32/vsprops/FeatureDefinesCairo.vsprops

index a1ce305..34555eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        Adding the CSS_SHAPES compile flag.
+
+        * Source/autotools/SetupWebKitFeatures.m4:
+        * Source/autotools/symbols.filter:
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmakeconfig.h.cmake:
+
 2013-06-05  Zan Dobersek  <zdobersek@igalia.com>
 
         Move MemoryInfo under window.internals
index 1c44299..c1bf803 100644 (file)
@@ -1,3 +1,131 @@
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        Adjusting the shape inside tests to use the new setCSSShapesEnabled method, rather
+        than the older setCSSExclusionsEnabled method.
+
+        * fast/exclusions/css-exclusions-disabled.html:
+        * fast/exclusions/parsing/script-tests/parsing-shape-inside.js:
+        * fast/exclusions/parsing/script-tests/parsing-shape-lengths.js:
+        * fast/exclusions/parsing/script-tests/parsing-shape-margin.js:
+        * fast/exclusions/parsing/script-tests/parsing-shape-outside.js:
+        * fast/exclusions/parsing/script-tests/parsing-shape-padding.js:
+        * fast/exclusions/resources/multi-segment-polygon.js:
+        (generatePolygon):
+        * fast/exclusions/resources/simple-polygon.js:
+        * fast/exclusions/resources/simple-rectangle.js:
+        * fast/exclusions/shape-inside/shape-inside-animation.html:
+        * fast/exclusions/shape-inside/shape-inside-bottom-edge.html:
+        * fast/exclusions/shape-inside/shape-inside-box-sizing.html:
+        * fast/exclusions/shape-inside/shape-inside-circle-padding.html:
+        * fast/exclusions/shape-inside/shape-inside-circle.html:
+        * fast/exclusions/shape-inside/shape-inside-coincident-vertices-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-coincident-vertices.html:
+        * fast/exclusions/shape-inside/shape-inside-collinear-vertices-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-collinear-vertices.html:
+        * fast/exclusions/shape-inside/shape-inside-counterclockwise-polygon-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-counterclockwise-polygon.html:
+        * fast/exclusions/shape-inside/shape-inside-dynamic-nested-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-dynamic-nested.html:
+        * fast/exclusions/shape-inside/shape-inside-dynamic-shape.html:
+        * fast/exclusions/shape-inside/shape-inside-dynamic-text.html:
+        * fast/exclusions/shape-inside/shape-inside-ellipse-padding.html:
+        * fast/exclusions/shape-inside/shape-inside-ellipse.html:
+        * fast/exclusions/shape-inside/shape-inside-empty-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-empty.html:
+        * fast/exclusions/shape-inside/shape-inside-first-fit-001.html:
+        * fast/exclusions/shape-inside/shape-inside-first-fit-002.html:
+        * fast/exclusions/shape-inside/shape-inside-first-fit-003.html:
+        * fast/exclusions/shape-inside/shape-inside-first-fit-004-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-first-fit-004.html:
+        * fast/exclusions/shape-inside/shape-inside-first-fit-reflex.html:
+        * fast/exclusions/shape-inside/shape-inside-inline-elements.html:
+        * fast/exclusions/shape-inside/shape-inside-multiple-blocks-vertical.html:
+        * fast/exclusions/shape-inside/shape-inside-multiple-blocks.html:
+        * fast/exclusions/shape-inside/shape-inside-on-nested-container-with-unresolved-height.html:
+        * fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html:
+        * fast/exclusions/shape-inside/shape-inside-overflow.html:
+        * fast/exclusions/shape-inside/shape-inside-partial-fill-001.html:
+        * fast/exclusions/shape-inside/shape-inside-partial-fill-002.html:
+        * fast/exclusions/shape-inside/shape-inside-percentage-auto.html:
+        * fast/exclusions/shape-inside/shape-inside-percentage.html:
+        * fast/exclusions/shape-inside/shape-inside-polygon-layout.html:
+        * fast/exclusions/shape-inside/shape-inside-polygon-padding-001.html:
+        * fast/exclusions/shape-inside/shape-inside-polygon-padding-002.html:
+        * fast/exclusions/shape-inside/shape-inside-polygon-padding-003.html:
+        * fast/exclusions/shape-inside/shape-inside-polygon-rectangle.html:
+        * fast/exclusions/shape-inside/shape-inside-polygon-zoom.html:
+        * fast/exclusions/shape-inside/shape-inside-rectangle-padding.html:
+        * fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-001-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-001.html:
+        * fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-002-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-002.html:
+        * fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-003-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-003.html:
+        * fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-004-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-rectilinear-polygon-004.html:
+        * fast/exclusions/shape-inside/shape-inside-regular-polygon16-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-regular-polygon16.html:
+        * fast/exclusions/shape-inside/shape-inside-regular-polygon8-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-regular-polygon8.html:
+        * fast/exclusions/shape-inside/shape-inside-rounded-rectangle-001.html:
+        * fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-001-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-001.html:
+        * fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-002-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-002.html:
+        * fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-003-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-rounded-rectangle-fit-003.html:
+        * fast/exclusions/shape-inside/shape-inside-rounded-rectangle-padding.html:
+        * fast/exclusions/shape-inside/shape-inside-shape-logical-top.html:
+        * fast/exclusions/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout-expected.html:
+        * fast/exclusions/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout.html:
+        * fast/exclusions/shape-inside/shape-inside-text.html:
+        * fast/exclusions/shape-inside/shape-inside-vertical-text.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-diamond-margin-polygon.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-bottom.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-left-margin-polygon.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-margin-is-ignored.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-overflow-hidden.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-overhang.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-positioning.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-right-margin-polygon.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-circle.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-ellipse.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-inset-rectangle-percentage.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-inset-rectangle.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-polygon.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rectangle-horizontal-multiple.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rectangle-percentage.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rectangle.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html:
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-stacked.html:
+        * fast/regions/shape-inside/shape-inside-on-additional-regions.html:
+        * fast/regions/shape-inside/shape-inside-on-first-region-block-content.html:
+        * fast/regions/shape-inside/shape-inside-on-first-region-inline-content-expected.html:
+        * fast/regions/shape-inside/shape-inside-on-first-region-inline-content.html:
+        * fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html:
+        * fast/regions/shape-inside/shape-inside-on-regions-block-content-overflow-multiple-shapes.html:
+        * fast/regions/shape-inside/shape-inside-on-regions-expected.html:
+        * fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html:
+        * fast/regions/shape-inside/shape-inside-on-regions-inline-content-overflow-multiple-shapes.html:
+        * fast/regions/shape-inside/shape-inside-on-regions-inline-content.html:
+        * fast/regions/shape-inside/shape-inside-on-regions.html:
+        * fast/regions/shape-inside/shape-inside-on-second-region-block-content.html:
+        * fast/regions/shape-inside/shape-inside-on-second-region-inline-content.html:
+        * fast/regions/shape-inside/shape-inside-recursive-layout.html:
+        * fast/regions/shape-inside/shape-inside-with-region-borders.html:
+        * fast/regions/shape-inside/shape-inside-with-region-padding.html:
+
 2013-06-05  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
 
         [Qt] Unreviewed gardening. Rebaselining after r151205.
index c58610c..e51814c 100644 (file)
@@ -6,8 +6,10 @@
 
 description('Test that parsing of css exclusions related properties can be disabled.');
 
-if (window.internals)
+if (window.internals) {
+    window.internals.settings.setCSSShapesEnabled(false);
     window.internals.settings.setCSSExclusionsEnabled(false);
+}
 
 function testInlineStyle(property, value) {
     var div = document.createElement("div");
index 369bf55..8dbfba8 100644 (file)
@@ -1,7 +1,7 @@
 description('Testing parsing of the -webkit-shape-inside property.');
 
 if (window.internals)
-    window.internals.settings.setCSSExclusionsEnabled(true);
+    window.internals.settings.setCSSShapesEnabled(true);
 
 // The test functions and globals used here are defined parsing-test-utils.js.
 
index 7ce64e3..c02b7a4 100644 (file)
@@ -1,7 +1,7 @@
 description('Test that exclusion shapes accept different length units');
 
 if (window.internals)
-    window.internals.settings.setCSSExclusionsEnabled(true);
+    window.internals.settings.setCSSShapesEnabled(true);
 
 // The test functions and globals used here are defined parsing-test-utils.js.
 
index 5ac44c1..9aa3bb0 100644 (file)
@@ -1,7 +1,7 @@
 description('Test parsing of the CSS shape-margin property.');
 
 if (window.internals)
-    window.internals.settings.setCSSExclusionsEnabled(true);
+    window.internals.settings.setCSSShapesEnabled(true);
 
 // The test functions and globals used here are defined parsing-test-utils.js.
 
index 7075b42..486f736 100644 (file)
@@ -1,7 +1,7 @@
 description('Testing parsing of the -webkit-shape-outside property.');
 
 if (window.internals)
-    window.internals.settings.setCSSExclusionsEnabled(true);
+    window.internals.settings.setCSSShapesEnabled(true);
 
 // The test functions and globals used here are defined parsing-test-utils.js.
 
index 8ef247d..08b95c4 100644 (file)
@@ -1,7 +1,7 @@
 description('Test parsing of the CSS shape-padding property.');
 
 if (window.internals)
-    window.internals.settings.setCSSExclusionsEnabled(true);
+    window.internals.settings.setCSSShapesEnabled(true);
 
 // The test functions and globals used here are defined parsing-test-utils.js.
 
index 3229a18..f83bef9 100644 (file)
@@ -1,6 +1,6 @@
 function generatePolygon(width, height, fontSize, points, content, elementId) {
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
     var div = createOrInsert(elementId);
     var polygon = points.map(function(elem, index, array) {
         return elem.toString() + 'px' + (index < array.length - 1 && index % 2 == 1 ? ',' : '');
index e1a11af..85432ba 100644 (file)
@@ -1,7 +1,7 @@
 // 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.
 if (window.internals)
-    window.internals.settings.setCSSExclusionsEnabled(true);
+    window.internals.settings.setCSSShapesEnabled(true);
 
 function createPolygon(vertices) {
     var xCoordinates = vertices.map( function(p) { return p.x; } );
index 347d0a9..bfc8f88 100644 (file)
@@ -1,5 +1,5 @@
 if (window.internals)
-    window.internals.settings.setCSSExclusionsEnabled(true);
+    window.internals.settings.setCSSShapesEnabled(true);
 
 function createRectangleTest(elementId, stylesheetId, bounds, shapeBounds, units, content) {
     var elem;
index d4b2299..26e989f 100644 (file)
@@ -4,7 +4,7 @@
 <head>
   <script>
       if (window.internals)
-          window.internals.settings.setCSSExclusionsEnabled(true);
+          window.internals.settings.setCSSShapesEnabled(true);
   </script>
   <style>
     .box {
index e263228..973739e 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .box {
index ad5452e..7a1585f 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
     .border {
index 4a7c375..8328ec9 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     /* This test is the same as circle-shape-inside except that the circle's radius is 150px instead 
index a58aa03..f79c766 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     /* The size of a square that just fits within a circle of radius r is r * sqrt(2).  In this
index 1a6b564..e120cfc 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 2a691e4..1e3b98e 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside-coincident-vertices {
index 4ef76c6..fde133c 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 2e2f11b..665deae 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside-collinear-vertices {
index 5f97ba3..b5087ce 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     // Rectilinear polygon with this shape (same as shape-inside-rectilinear-polygon-002.html).
     // The vertices are specified in counter-clockwise order.
index cea83b4..ac7bb23 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     // Rectilinear polygon with this shape (same as shape-inside-rectilinear-polygon-002.html).
     // The vertices are specified in counter-clockwise order.
index 0716d21..65ace5c 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     .container {
index 3e6f67f..e929817 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
     window.onload = function() {
         if (document.body)
             document.body.offsetTop;
index 5901637..798bb04 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
     window.onload = function() {
         var elem = document.getElementById("shape-inside");
         elem.setAttribute("style", "-webkit-shape-inside: rectangle(10px, 10px, 180px, 180px);");
index 93639a4..435162c 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
     window.onload = function() {
         var node = document.createTextNode("This text should be contained by the blue square.");
         document.getElementById("shape-inside").appendChild(node);
index bc5155f..261013b 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     /* This test is the same as ellipse-shape-inside except that the ellipse radii are 250px,150px instead 
index 617dfac..1c090a8 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     /* The Ahem font's size is equal to a little less than the size of the largest square that will 
index c7e5b7a..0f615da 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #rectangles div {
index ef37688..ea83fb4 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #rectangles p {
index 9696fc3..05c393a 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     .shape-inside {
index 60bf6c8..8254c35 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index f9360b7..bb6b932 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index b4e0a2d..4b93ce2 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 880b14f..fe3e57b 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index c963634..229b30f 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 8aacbcd..03ccdc0 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 9538699..0a1f82e 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     .shape-inside {
index d80fed2..b9b9b81 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 928dee8..c1551f1 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .parent {
index 152c2ca..b61337d 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 #container {
index 77360ec..7eec38b 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #container {
index cd9a6f8..6e4d917 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     .shape-inside {
index d9ebf65..ab21ec2 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     .shape-inside {
index 7cfc3bc..8053875 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 4cb7bd2..3f0cb31 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #container {
index c7f64fd..a1c5546 100644 (file)
@@ -5,7 +5,7 @@
 <script src="../resources/subpixel-utils.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 85bb3b3..44028ab 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 9b4d410..1708919 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../../js/resources/js-test-pre.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <!--
 The shape-inside polygon is just a square rotated 90 degrees. The X and Y offsets of the inset "padded"
index c7a16a5..6e6a1aa 100644 (file)
@@ -5,7 +5,7 @@
 <script src="../resources/subpixel-utils.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index b7cf1ff..31156c1 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside-horizontal {
index 90de7c2..ffb8581 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 84faa50..82c03d0 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 96be82a..ac8540a 100644 (file)
@@ -5,7 +5,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     // Rectilinear polygon with this shape:
     //   XXX
index 88b6514..4e46d95 100644 (file)
@@ -5,7 +5,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     // Rectilinear polygon with this shape:
     //   XXX
index 33407f0..021d0d9 100644 (file)
@@ -5,7 +5,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     // Rectilinear polygon with this shape:
     //   XXX
index 1a61427..fa7fb19 100644 (file)
@@ -5,7 +5,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     // Rectilinear polygon with this shape:
     //   XXX
index 98eb784..7204062 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 
 <!-- 
index 11ad4c8..7c2375d 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 
 <!-- 
index 286b0db..cc84f77 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 
 <!-- 
index 2997a83..b59d642 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 
 <!-- 
index a9f8dcf..9b5e04f 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     var vertices = createRegularPolygonVertices(400, 16); // 400x400 16 sided regular polygon
     var lineHeight = 40;
index 452507e..d34ecbc 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     var vertices = createRegularPolygonVertices(400, 16); // 400x400 16 sided regular polygon
     var lineHeight = 40;
index 2915e9c..d4b22eb 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     var vertices = createRegularPolygonVertices(400, 8); // 400x400 8 sided regular polygon
     var lineHeight = 40;
index 917c6b6..a661517 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../resources/simple-polygon.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 
     var vertices = createRegularPolygonVertices(400, 8); // 400x400 regular octahedron
     var lineHeight = 40;
index 997bd87..5551bbe 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index a6ea149..b060802 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .shape-container {
index 6b7de5e..e4fbdb8 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .shape-container {
index 0479d1f..405bd59 100644 (file)
@@ -4,7 +4,7 @@
 <script src="../resources/subpixel-utils.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <!-- 
 In this test the shape-inside shape is a rounded rectangle configured as a circle with radius of 100px.
index f59ffdf..3e197b8 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <!-- 
 In this test the shape-inside shape is a rounded rectangle configured as a circle with radius of 100px.
index 66f4f6f..ea8fe80 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .shape-container {
index 9e9ce81..9ac8acd 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .shape-container {
index f74de5a..c395fe8 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index aad8472..9be7750 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 8500df7..9c580c6 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside {
index 1b52150..f446794 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #shape-inside-vertical-lr {
index 31d40cd..42f6ffb 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <script src="../../js/resources/js-test-pre.js"></script>
 <script src="../resources/subpixel-utils.js"></script>
index df70320..fe8b544 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 
 <style>
index ff2115f..1358c09 100644 (file)
@@ -5,7 +5,7 @@
 <script src="../resources/subpixel-utils.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 
 <style>
index b6601cd..632ec1a 100644 (file)
@@ -5,7 +5,7 @@
 <script src="../resources/subpixel-utils.js"></script>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 
 <style>
index fbe005b..e6bee79 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 
 <style>
index aa00b85..73d2080 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     .container {
index 9505f80..8a9ea24 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .container {
index 608b856..5b0f42c 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .container {
index 4fc404c..f73343f 100644 (file)
@@ -2,7 +2,7 @@
   <head>
     <script>
       if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
       #top {
index 167d3e3..9b61387 100644 (file)
@@ -3,7 +3,7 @@
 <head>
   <script>
     if (window.internals)
-      window.internals.settings.setCSSExclusionsEnabled(true);
+      window.internals.settings.setCSSShapesEnabled(true);
   </script>
   <style>
     .container {
index 1aaec9a..512da9a 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 
 <style>
index 177bf7a..3f2f134 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .container {
index f3a7fb9..f425845 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .container {
index 4aa36cd..00c166a 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         .test {
index 491f45e..07f35d7 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         .test {
index 0900b8a..0176ce1 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .container {
index c11d639..543cdb2 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     .container {
index cb77ad8..94d54a2 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         .test {
index 46e5084..75b1e1b 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .container {
index 4c22399..78d87a3 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .container {
index bb46de6..c760bcc 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
 .container {
index 0b21fa4..795d5ac 100644 (file)
@@ -3,7 +3,7 @@
 <head>
   <script>
     if (window.internals)
-      window.internals.settings.setCSSExclusionsEnabled(true);
+      window.internals.settings.setCSSShapesEnabled(true);
   </script>
   <style>
     .container {
index 6b98377..12f6cda 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #content {
index 7e15e46..af4a9be 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #content {
index 1924067..c6ce185 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     .region {
index d4bd98d..d384cf5 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #content {
index bf7a8ea..d4cf26d 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         #rectangle {
index 36d953f..185b233 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         #rectangle {
index 431319e..e8273db 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         #page { font: 16px Ahem, sans-serif; }
index 780435c..79242b3 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         #rectangle {
index f361f94..848238c 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         #rectangle {
index 011101f..78a99f6 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         #rectangle {
index a5d6c47..9489caf 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
         if (window.internals)
-            window.internals.settings.setCSSExclusionsEnabled(true);
+            window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
         #rectangle {
index c7dff57..29a1cc1 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #content {
index a113586..3c5b4ff 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #content {
index 15c6714..21649b5 100644 (file)
@@ -3,7 +3,7 @@
 <head>
     <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
     </script>
     <style>
     .region, .content {
index 5432d49..93e2ed5 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #content {
index 0edf3ca..1361c34 100644 (file)
@@ -3,7 +3,7 @@
 <head>
 <script>
     if (window.internals)
-        window.internals.settings.setCSSExclusionsEnabled(true);
+        window.internals.settings.setCSSShapesEnabled(true);
 </script>
 <style>
     #content {
index ad4e0dc..da16417 100644 (file)
@@ -1,3 +1,14 @@
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        Adding the CSS_SHAPES compile flag.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-06-05  Balazs Kilvady  <kilvadyb@homejinni.com>
 
         JSC Assertion tests failures on MIPS.
index f956a78..4903d2b 100644 (file)
@@ -52,6 +52,7 @@ ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
 ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
+ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
 ENABLE_CSS_VARIABLES = ;
@@ -183,4 +184,4 @@ ENABLE_WORKERS = ENABLE_WORKERS;
 ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(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_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(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_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(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_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(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_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(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_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(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_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(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_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(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_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index 1893150..59adc93 100644 (file)
@@ -1,3 +1,97 @@
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        This patch adds a new compile and runtime flag for the CSS Shapes feature, which
+        has split off from the previous CSS Exclusions and Shapes specification. The
+        specifications are available here:
+        http://dev.w3.org/csswg/css-exclusions/
+        http://dev.w3.org/csswg/css-shapes/
+
+        The changes introduce a new CSS_SHAPES compile flag, and a new cssShapesEnabled
+        runtime flag. In general, the code changes are simple renames.
+
+        Refactoring, no new tests.
+
+        * bindings/generic/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::setCSSShapesEnabled):
+        (WebCore::RuntimeEnabledFeatures::cssShapesEnabled):
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::propertyValue):
+        * css/CSSParser.cpp:
+        (WebCore::isSimpleLengthPropertyID):
+        (WebCore::CSSParser::parseValue):
+        * css/CSSProperty.cpp:
+        (WebCore::CSSProperty::isInheritedProperty):
+        * css/DeprecatedStyleBuilder.cpp:
+        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+        (WebCore::StyleResolver::loadPendingImages):
+        * page/animation/CSSPropertyAnimation.cpp:
+        (WebCore::CSSPropertyAnimation::ensurePropertyMap):
+        * rendering/BidiRun.h:
+        (WebCore::BidiRun::BidiRun):
+        * rendering/ExclusionShapeInfo.cpp:
+        * rendering/ExclusionShapeInfo.h:
+        * rendering/ExclusionShapeInsideInfo.cpp:
+        * rendering/ExclusionShapeInsideInfo.h:
+        * rendering/ExclusionShapeOutsideInfo.cpp:
+        * rendering/ExclusionShapeOutsideInfo.h:
+        * rendering/LayoutState.cpp:
+        (WebCore::LayoutState::LayoutState):
+        * rendering/LayoutState.h:
+        (WebCore::LayoutState::LayoutState):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::styleDidChange):
+        (WebCore::exclusionInfoRequiresRelayout):
+        (WebCore::RenderBlock::updateRegionsAndExclusionsBeforeChildLayout):
+        (WebCore::RenderBlock::updateRegionsAndExclusionsAfterChildLayout):
+        (WebCore::RenderBlock::insertFloatingObject):
+        (WebCore::RenderBlock::computeLogicalLocationForFloat):
+        (WebCore::RenderBlock::positionNewFloats):
+        (WebCore::::collectIfNeeded):
+        (WebCore::RenderBlock::logicalLeftOffsetForLine):
+        (WebCore::RenderBlock::logicalRightOffsetForLine):
+        * rendering/RenderBlock.h:
+        (WebCore::RenderBlock::xPositionForFloatIncludingMargin):
+        (WebCore::RenderBlock::yPositionForFloatIncludingMargin):
+        (WebCore::RenderBlock::FloatIntervalSearchAdapter::FloatIntervalSearchAdapter):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::LineWidth::LineWidth):
+        (WebCore::LineWidth::updateAvailableWidth):
+        (WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded):
+        (WebCore::RenderBlock::constructLine):
+        (WebCore::computeExpansionForJustifiedText):
+        (WebCore::RenderBlock::computeInlineDirectionPositionsForLine):
+        (WebCore::RenderBlock::computeInlineDirectionPositionsForSegment):
+        (WebCore::constructBidiRunsForLine):
+        (WebCore::RenderBlock::layoutRunsAndFloatsInRange):
+        (WebCore::RenderBlock::LineBreaker::nextLineBreak):
+        (WebCore::RenderBlock::LineBreaker::nextSegmentBreak):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::willBeDestroyed):
+        (WebCore::RenderBox::styleDidChange):
+        * rendering/RenderBox.h:
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintOffset):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::shouldBeNormalFlowOnly):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::hasPaintOffset):
+        * rendering/RenderView.h:
+        (WebCore::RenderView::pushLayoutState):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::changeRequiresLayout):
+        * rendering/style/RenderStyle.h:
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        (WebCore::InternalSettings::setCSSShapesEnabled):
+
 2013-06-05  Oliver Hunt  <oliver@apple.com>
 
         Don't throttle timers if a page is doing something that might be interesting
index f956a78..72aee65 100644 (file)
@@ -52,6 +52,7 @@ ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
 ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
+ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
 ENABLE_CSS_VARIABLES = ;
@@ -183,4 +184,4 @@ ENABLE_WORKERS = ENABLE_WORKERS;
 ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(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_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(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_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(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_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(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_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(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_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(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_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(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_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(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_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index f50ae4a..cebc2dc 100644 (file)
@@ -734,6 +734,7 @@ __ZN7WebCore21setPlatformStrategiesEPNS_18PlatformStrategiesE
 __ZN7WebCore22HTMLPlugInImageElement24restartSnapshottedPlugInEv
 __ZN7WebCore22HTMLPlugInImageElement29setIsPrimarySnapshottedPlugInEb
 __ZN7WebCore22RuntimeEnabledFeatures22isCSSExclusionsEnabledE
+__ZN7WebCore22RuntimeEnabledFeatures18isCSSShapesEnabledE
 __ZN7WebCore22RuntimeEnabledFeatures40isLangAttributeAwareFormControlUIEnabledE
 __ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
 __ZN7WebCore22StorageEventDispatcher34dispatchLocalStorageEventsToFramesERNS_9PageGroupERKN3WTF6VectorINS3_6RefPtrINS_5FrameEEELm0ENS3_15CrashOnOverflowEEERKNS3_6StringESE_SE_SE_PNS_14SecurityOriginE
index a380c05..5a42072 100644 (file)
@@ -40796,6 +40796,7 @@ __ZN7WebCore23RenderSVGResourceMasker14s_resourceTypeE
 __ZN7WebCore15ResourceRequest23s_httpPipeliningEnabledE
 __ZN7WebCore22RuntimeEnabledFeatures17isWebAudioEnabledE
 __ZN7WebCore22RuntimeEnabledFeatures22isCSSExclusionsEnabledE
+__ZN7WebCore22RuntimeEnabledFeatures18isCSSShapesEnabledE
 __ZN7WebCore22RuntimeEnabledFeatures40isLangAttributeAwareFormControlUIEnabledE
 __ZN7WebCore8Settings33gDefaultDOMTimerAlignmentIntervalE
 __ZN7WebCore8Settings22gUsesOverlayScrollbarsE
index 5a2a139..3658145 100644 (file)
@@ -56,6 +56,7 @@ bool RuntimeEnabledFeatures::isDeviceOrientationEnabled = true;
 bool RuntimeEnabledFeatures::isSpeechInputEnabled = true;
 bool RuntimeEnabledFeatures::isCanvasPathEnabled = false;
 bool RuntimeEnabledFeatures::isCSSExclusionsEnabled = true;
+bool RuntimeEnabledFeatures::isCSSShapesEnabled = true;
 bool RuntimeEnabledFeatures::isCSSRegionsEnabled = false;
 bool RuntimeEnabledFeatures::isCSSCompositingEnabled = false;
 bool RuntimeEnabledFeatures::isLangAttributeAwareFormControlUIEnabled = false;
index 43e29ad..2cbba90 100644 (file)
@@ -79,6 +79,14 @@ public:
     static bool cssExclusionsEnabled() { return false; }
 #endif
 
+#if ENABLE(CSS_SHAPES)
+    static void setCSSShapesEnabled(bool isEnabled) { isCSSShapesEnabled = isEnabled; }
+    static bool cssShapesEnabled() { return isCSSShapesEnabled; }
+#else
+    static void setCSSShapesEnabled(bool) { }
+    static bool cssShapesEnabled() { return false; }
+#endif
+
 #if ENABLE(CSS_REGIONS)
     static void setCSSRegionsEnabled(bool isEnabled) { isCSSRegionsEnabled = isEnabled; }
     static bool cssRegionsEnabled() { return isCSSRegionsEnabled; }
@@ -316,6 +324,7 @@ private:
     static bool isSpeechInputEnabled;
     static bool isCanvasPathEnabled;
     static bool isCSSExclusionsEnabled;
+    static bool isCSSShapesEnabled;
     static bool isCSSRegionsEnabled;
     static bool isCSSCompositingEnabled;
     WEBCORE_TESTING static bool isLangAttributeAwareFormControlUIEnabled;
index b52d71f..3a94ef8 100644 (file)
@@ -65,7 +65,7 @@
 #include "WebKitFontFamilyNames.h"
 #include <wtf/text/StringBuilder.h>
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 #include "ExclusionShapeValue.h"
 #endif
 
@@ -338,7 +338,7 @@ static const CSSPropertyID computedProperties[] = {
     CSSPropertyWebkitPerspectiveOrigin,
     CSSPropertyWebkitPrintColorAdjust,
     CSSPropertyWebkitRtlOrdering,
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     CSSPropertyWebkitShapeInside,
     CSSPropertyWebkitShapeOutside,
 #endif
@@ -379,9 +379,11 @@ static const CSSPropertyID computedProperties[] = {
 #endif
 #if ENABLE(CSS_EXCLUSIONS)
     CSSPropertyWebkitWrapFlow,
+    CSSPropertyWebkitWrapThrough,
+#endif
+#if ENABLE(CSS_SHAPES)
     CSSPropertyWebkitShapeMargin,
     CSSPropertyWebkitShapePadding,
-    CSSPropertyWebkitWrapThrough,
 #endif
 #if ENABLE(SVG)
     CSSPropertyBufferedRendering,
@@ -2686,6 +2688,10 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
 #if ENABLE(CSS_EXCLUSIONS)
         case CSSPropertyWebkitWrapFlow:
             return cssValuePool().createValue(style->wrapFlow());
+        case CSSPropertyWebkitWrapThrough:
+            return cssValuePool().createValue(style->wrapThrough());
+#endif
+#if ENABLE(CSS_SHAPES)
         case CSSPropertyWebkitShapeMargin:
             return cssValuePool().createValue(style->shapeMargin());
         case CSSPropertyWebkitShapePadding:
@@ -2712,8 +2718,6 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
             }
             ASSERT(style->shapeOutside()->type() == ExclusionShapeValue::Shape);
             return valueForBasicShape(style->shapeOutside()->shape());
-        case CSSPropertyWebkitWrapThrough:
-            return cssValuePool().createValue(style->wrapThrough());
 #endif
 #if ENABLE(CSS_FILTERS)
         case CSSPropertyWebkitFilter:
index 7ac9651..695f31d 100644 (file)
@@ -584,11 +584,11 @@ static inline bool isSimpleLengthPropertyID(CSSPropertyID propertyId, bool& acce
     case CSSPropertyWebkitPaddingStart:
         acceptsNegativeNumbers = false;
         return true;
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     case CSSPropertyWebkitShapeMargin:
     case CSSPropertyWebkitShapePadding:
         acceptsNegativeNumbers = false;
-        return RuntimeEnabledFeatures::cssExclusionsEnabled();
+        return RuntimeEnabledFeatures::cssShapesEnabled();
 #endif
     case CSSPropertyBottom:
     case CSSPropertyLeft:
@@ -2952,10 +2952,10 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
         }
 #endif
         break;
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     case CSSPropertyWebkitShapeInside:
     case CSSPropertyWebkitShapeOutside:
-        if (!RuntimeEnabledFeatures::cssExclusionsEnabled())
+        if (!RuntimeEnabledFeatures::cssShapesEnabled())
             return false;
         if (id == CSSValueAuto)
             validPrimitive = true;
@@ -2970,7 +2970,7 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
         break;
     case CSSPropertyWebkitShapeMargin:
     case CSSPropertyWebkitShapePadding:
-        validPrimitive = (RuntimeEnabledFeatures::cssExclusionsEnabled() && !id && validUnit(value, FLength | FNonNeg));
+        validPrimitive = (RuntimeEnabledFeatures::cssShapesEnabled() && !id && validUnit(value, FLength | FNonNeg));
         break;
 #endif
 #if ENABLE(CSS_IMAGE_ORIENTATION)
index bedf7d7..680aa5c 100644 (file)
@@ -671,11 +671,13 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
 #endif
 #if ENABLE(CSS_EXCLUSIONS)
     case CSSPropertyWebkitWrapFlow:
+    case CSSPropertyWebkitWrapThrough:
+#endif
+#if ENABLE(CSS_SHAPES)
     case CSSPropertyWebkitShapeMargin:
     case CSSPropertyWebkitShapePadding:
     case CSSPropertyWebkitShapeInside:
     case CSSPropertyWebkitShapeOutside:
-    case CSSPropertyWebkitWrapThrough:
 #endif
 #if ENABLE(CSS_SHADERS)
     case CSSPropertyMix:
index 9ffcd17..fee824a 100644 (file)
@@ -420,11 +420,13 @@ z-index
 -webkit-region-break-before
 -webkit-region-break-inside
 #endif
-#if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS
+#if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES
 -webkit-shape-inside
 -webkit-shape-outside
 -webkit-shape-margin
 -webkit-shape-padding
+#endif
+#if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS
 -webkit-wrap-flow
 -webkit-wrap-through
 #endif
index 50b5186..00f0be3 100644 (file)
@@ -47,7 +47,7 @@
 #include "StyleResolver.h"
 #include <wtf/StdLibExtras.h>
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 #include "ExclusionShapeValue.h"
 #endif
 
@@ -1932,7 +1932,7 @@ public:
     }
 };
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 template <ExclusionShapeValue* (RenderStyle::*getterFunction)() const, void (RenderStyle::*setterFunction)(PassRefPtr<ExclusionShapeValue>), ExclusionShapeValue* (*initialFunction)()>
 class ApplyPropertyExclusionShape {
 public:
@@ -2338,9 +2338,11 @@ DeprecatedStyleBuilder::DeprecatedStyleBuilder()
 
 #if ENABLE(CSS_EXCLUSIONS)
     setPropertyHandler(CSSPropertyWebkitWrapFlow, ApplyPropertyDefault<WrapFlow, &RenderStyle::wrapFlow, WrapFlow, &RenderStyle::setWrapFlow, WrapFlow, &RenderStyle::initialWrapFlow>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler());
+#endif
+#if ENABLE(CSS_SHAPES)
     setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());
     setPropertyHandler(CSSPropertyWebkitShapePadding, ApplyPropertyLength<&RenderStyle::shapePadding, &RenderStyle::setShapePadding, &RenderStyle::initialShapePadding>::createHandler());
-    setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler());
     setPropertyHandler(CSSPropertyWebkitShapeInside, ApplyPropertyExclusionShape<&RenderStyle::shapeInside, &RenderStyle::setShapeInside, &RenderStyle::initialShapeInside>::createHandler());
     setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyExclusionShape<&RenderStyle::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOutside>::createHandler());
 #endif
index dca4b1a..5736b0c 100644 (file)
@@ -3120,14 +3120,16 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
     case CSSPropertyWebkitUserModify:
     case CSSPropertyWebkitUserSelect:
     case CSSPropertyWebkitClipPath:
-#if ENABLE(CSS_EXCLUSIONS)
-    case CSSPropertyWebkitWrapFlow:
+#if ENABLE(CSS_SHAPES)
     case CSSPropertyWebkitShapeMargin:
     case CSSPropertyWebkitShapePadding:
-    case CSSPropertyWebkitWrapThrough:
     case CSSPropertyWebkitShapeInside:
     case CSSPropertyWebkitShapeOutside:
 #endif
+#if ENABLE(CSS_EXCLUSIONS)
+    case CSSPropertyWebkitWrapFlow:
+    case CSSPropertyWebkitWrapThrough:
+#endif
 #if ENABLE(CSS_SHADERS)
     case CSSPropertyMix:
     case CSSPropertyParameters:
@@ -4171,7 +4173,7 @@ void StyleResolver::loadPendingImages()
             }
             break;
         }
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         case CSSPropertyWebkitShapeInside:
             if (m_state.style()->shapeInside() && m_state.style()->shapeInside()->image() && m_state.style()->shapeInside()->image()->isPendingImage())
                 m_state.style()->shapeInside()->setImage(loadPendingImage(static_cast<StylePendingImage*>(m_state.style()->shapeInside()->image())));
index d18bc30..5244003 100644 (file)
@@ -143,7 +143,7 @@ static inline PassRefPtr<ClipPathOperation> blendFunc(const AnimationBase*, Clip
     return ShapeClipPathOperation::create(toShape->blend(fromShape, progress));
 }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 static inline PassRefPtr<ExclusionShapeValue> blendFunc(const AnimationBase*, ExclusionShapeValue* from, ExclusionShapeValue* to, double progress)
 {
     // FIXME Bug 102723: Shape-inside should be able to animate a value of 'outside-shape' when shape-outside is set to a BasicShape
@@ -404,7 +404,7 @@ public:
     }
 };
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 class PropertyWrapperExclusionShape : public RefCountedPropertyWrapper<ExclusionShapeValue> {
 public:
     PropertyWrapperExclusionShape(CSSPropertyID prop, ExclusionShapeValue* (RenderStyle::*getter)() const, void (RenderStyle::*setter)(PassRefPtr<ExclusionShapeValue>))
@@ -1164,7 +1164,7 @@ void CSSPropertyAnimation::ensurePropertyMap()
 
     gPropertyWrappers->append(new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath));
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     gPropertyWrappers->append(new PropertyWrapperExclusionShape(CSSPropertyWebkitShapeInside, &RenderStyle::shapeInside, &RenderStyle::setShapeInside));
 #endif
 
index 17b8024..e0649fc 100644 (file)
@@ -149,7 +149,7 @@ struct BidiCharacterRun {
     // Do not add anything apart from bitfields until after m_next. See https://bugs.webkit.org/show_bug.cgi?id=100173
     bool m_override : 1;
     bool m_hasHyphen : 1; // Used by BidiRun subclass which is a layering violation but enables us to save 8 bytes per object on 64-bit.
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     bool m_startsSegment : 1; // Same comment as m_hasHyphen.
 #endif
     unsigned char m_level;
index c95415c..e1c7252 100644 (file)
@@ -42,7 +42,7 @@ struct BidiRun : BidiCharacterRun {
         ASSERT(!object->isText() || static_cast<unsigned>(stop) <= toRenderText(object)->textLength());
         // Stored in base class to save space.
         m_hasHyphen = false;
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         m_startsSegment = false;
 #endif
     }
index 07d3ee6..9f14f82 100644 (file)
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "ExclusionShapeInfo.h"
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 
 #include "ExclusionShape.h"
 #include "RenderBlock.h"
index 6ede5a2..5a70792 100644 (file)
@@ -30,7 +30,7 @@
 #ifndef ExclusionShapeInfo_h
 #define ExclusionShapeInfo_h
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 
 #include "ExclusionShape.h"
 #include "ExclusionShapeValue.h"
index 5d15740..e8a744f 100644 (file)
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "ExclusionShapeInsideInfo.h"
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 
 #include "InlineIterator.h"
 #include "RenderBlock.h"
index aac67bf..384032f 100644 (file)
@@ -30,7 +30,7 @@
 #ifndef ExclusionShapeInsideInfo_h
 #define ExclusionShapeInsideInfo_h
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 
 #include "ExclusionShapeInfo.h"
 #include <wtf/PassOwnPtr.h>
index 8963954..c49cce5 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "config.h"
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 
 #include "ExclusionShapeOutsideInfo.h"
 
index 88fee18..c87a5c4 100644 (file)
@@ -30,7 +30,7 @@
 #ifndef ExclusionShapeOutsideInfo_h
 #define ExclusionShapeOutsideInfo_h
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 
 #include "ExclusionShapeInfo.h"
 #include "LayoutSize.h"
index 9c41760..0f6d93c 100644 (file)
@@ -39,7 +39,7 @@ LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const LayoutSiz
     : m_columnInfo(columnInfo)
     , m_lineGrid(0)
     , m_next(prev)
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     , m_exclusionShapeInsideInfo(0)
 #endif
 #ifndef NDEBUG
@@ -110,7 +110,7 @@ LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const LayoutSiz
     if (!m_columnInfo)
         m_columnInfo = m_next->m_columnInfo;
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     if (renderer->isRenderBlock()) {
         const RenderBlock* renderBlock = toRenderBlock(renderer);
         m_exclusionShapeInsideInfo = renderBlock->exclusionShapeInsideInfo();
@@ -148,7 +148,7 @@ LayoutState::LayoutState(RenderObject* root)
     , m_columnInfo(0)
     , m_lineGrid(0)
     , m_next(0)
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     , m_exclusionShapeInsideInfo(0)
 #endif
     , m_pageLogicalHeight(0)
index 38571f9..75c353d 100644 (file)
@@ -38,7 +38,7 @@ class RenderBlock;
 class RenderBox;
 class RenderObject;
 class RenderFlowThread;
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 class ExclusionShapeInsideInfo;
 #endif
 
@@ -56,7 +56,7 @@ public:
         , m_columnInfo(0)
         , m_lineGrid(0)
         , m_next(0)
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         , m_exclusionShapeInsideInfo(0)
 #endif
         , m_pageLogicalHeight(0)
@@ -98,7 +98,7 @@ public:
 
     bool needsBlockDirectionLocationSetBeforeLayout() const { return m_lineGrid || (m_isPaginated && m_pageLogicalHeight); }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     ExclusionShapeInsideInfo* exclusionShapeInsideInfo() const { return m_exclusionShapeInsideInfo; }
 #endif
 private:
index d4a80f8..b0d159f 100644 (file)
@@ -66,7 +66,7 @@
 #include "ShadowRoot.h"
 #include "TransformState.h"
 #include <wtf/StdLibExtras.h>
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 #include "ExclusionShapeInsideInfo.h"
 #include "ExclusionShapeOutsideInfo.h"
 #endif
@@ -362,7 +362,7 @@ void RenderBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldSty
     
     RenderStyle* newStyle = style();
     
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     // FIXME: Bug 89993: Style changes should affect the ExclusionShapeInsideInfos for other render blocks that
     // share the same ExclusionShapeInsideInfo
     updateExclusionShapeInsideInfoAfterStyleChange(newStyle->resolvedShapeInside(), oldStyle ? oldStyle->resolvedShapeInside() : 0);
@@ -1439,7 +1439,7 @@ void RenderBlock::layout()
     invalidateBackgroundObscurationStatus();
 }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 void RenderBlock::updateExclusionShapeInsideInfoAfterStyleChange(const ExclusionShapeValue* shapeInside, const ExclusionShapeValue* oldShapeInside)
 {
     // FIXME: A future optimization would do a deep comparison for equality.
@@ -1474,7 +1474,7 @@ void RenderBlock::markShapeInsideDescendantsForLayout()
 
 static inline bool exclusionInfoRequiresRelayout(const RenderBlock* block)
 {
-#if !ENABLE(CSS_EXCLUSIONS)
+#if !ENABLE(CSS_SHAPES)
     return false;
 #else
     ExclusionShapeInsideInfo* info = block->exclusionShapeInsideInfo();
@@ -1488,7 +1488,7 @@ static inline bool exclusionInfoRequiresRelayout(const RenderBlock* block)
 
 bool RenderBlock::updateRegionsAndExclusionsBeforeChildLayout(RenderFlowThread* flowThread)
 {
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     if (!flowThread && !exclusionShapeInsideInfo())
 #else
     if (!flowThread)
@@ -1503,7 +1503,7 @@ bool RenderBlock::updateRegionsAndExclusionsBeforeChildLayout(RenderFlowThread*
     setLogicalHeight(LayoutUnit::max() / 2);
     updateLogicalHeight();
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     computeExclusionShapeSize();
 #endif
 
@@ -1517,7 +1517,7 @@ bool RenderBlock::updateRegionsAndExclusionsBeforeChildLayout(RenderFlowThread*
     return exclusionInfoRequiresRelayout(this);
 }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 void RenderBlock::computeExclusionShapeSize()
 {
     ExclusionShapeInsideInfo* exclusionShapeInsideInfo = this->exclusionShapeInsideInfo();
@@ -1530,7 +1530,7 @@ void RenderBlock::computeExclusionShapeSize()
 
 void RenderBlock::updateRegionsAndExclusionsAfterChildLayout(RenderFlowThread* flowThread, bool heightChanged)
 {
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     // A previous sibling has changed dimension, so we need to relayout the shape with the content
     ExclusionShapeInsideInfo* shapeInsideInfo = layoutExclusionShapeInsideInfo();
     if (heightChanged && shapeInsideInfo)
@@ -4010,7 +4010,7 @@ RenderBlock::FloatingObject* RenderBlock::insertFloatingObject(RenderBox* o)
         o->computeAndSetBlockDirectionMargins(this);
     }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     ExclusionShapeOutsideInfo* shapeOutside = o->exclusionShapeOutsideInfo();
     if (shapeOutside) {
         shapeOutside->setShapeSize(o->logicalWidth(), o->logicalHeight());
@@ -4090,7 +4090,7 @@ LayoutPoint RenderBlock::computeLogicalLocationForFloat(const FloatingObject* fl
     RenderBox* childBox = floatingObject->renderer();
     LayoutUnit logicalLeftOffset = logicalLeftOffsetForContent(logicalTopOffset); // Constant part of left offset.
     LayoutUnit logicalRightOffset; // Constant part of right offset.
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     // FIXME Bug 102948: This only works for shape outside directly set on this block.
     ExclusionShapeInsideInfo* shapeInsideInfo = exclusionShapeInsideInfo();
     // FIXME Bug 102846: Take into account the height of the content. The offset should be
@@ -4246,7 +4246,7 @@ bool RenderBlock::positionNewFloats()
         }
 
         setLogicalTopForFloat(floatingObject, floatLogicalLocation.y());
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         if (childBox->exclusionShapeOutsideInfo())
             setLogicalHeightForFloat(floatingObject, childBox->exclusionShapeOutsideInfo()->shapeLogicalHeight());
         else
@@ -4386,7 +4386,7 @@ inline void RenderBlock::FloatIntervalSearchAdapter<FloatTypeValue>::collectIfNe
             *m_heightRemaining = m_renderer->logicalBottomForFloat(r) - m_lowValue;
     }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     m_last = r;
 #endif
 }
@@ -4431,7 +4431,7 @@ LayoutUnit RenderBlock::logicalLeftOffsetForLine(LayoutUnit logicalTop, LayoutUn
         FloatIntervalSearchAdapter<FloatingObject::FloatLeft> adapter(this, roundToInt(logicalTop), roundToInt(logicalTop + logicalHeight), left, heightRemaining);
         m_floatingObjects->placedFloatsTree().allOverlapsWithAdapter(adapter);
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         const FloatingObject* lastFloat = adapter.lastFloat();
         if (offsetMode == ShapeOutsideFloatShapeOffset && lastFloat) {
             if (ExclusionShapeOutsideInfo* shapeOutside = lastFloat->renderer()->exclusionShapeOutsideInfo()) {
@@ -4489,7 +4489,7 @@ LayoutUnit RenderBlock::logicalRightOffsetForLine(LayoutUnit logicalTop, LayoutU
         FloatIntervalSearchAdapter<FloatingObject::FloatRight> adapter(this, roundToInt(logicalTop), roundToInt(logicalTop + logicalHeight), rightFloatOffset, heightRemaining);
         m_floatingObjects->placedFloatsTree().allOverlapsWithAdapter(adapter);
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         const FloatingObject* lastFloat = adapter.lastFloat();
         if (offsetMode == ShapeOutsideFloatShapeOffset && lastFloat) {
             if (ExclusionShapeOutsideInfo* shapeOutside = lastFloat->renderer()->exclusionShapeOutsideInfo()) {
index a2da61f..d3dca3f 100644 (file)
@@ -34,7 +34,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/ListHashSet.h>
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 #include "ExclusionShapeInsideInfo.h"
 #include "ExclusionShapeValue.h"
 #endif
@@ -54,7 +54,7 @@ struct BidiRun;
 struct PaintInfo;
 class LineInfo;
 class RenderRubyRun;
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 class BasicShape;
 #endif
 class TextLayout;
@@ -445,7 +445,7 @@ public:
     void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0) const;
 #endif
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     ExclusionShapeInsideInfo* ensureExclusionShapeInsideInfo()
     {
         if (!m_rareData || !m_rareData->m_shapeInsideInfo)
@@ -584,7 +584,7 @@ protected:
     virtual void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);
 
 private:
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     void computeExclusionShapeSize();
     void updateExclusionShapeInsideInfoAfterStyleChange(const ExclusionShapeValue*, const ExclusionShapeValue* oldExclusionShape);
 #endif
@@ -788,7 +788,7 @@ private:
 
     LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) const
     {
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         ExclusionShapeOutsideInfo *shapeOutside = child->renderer()->exclusionShapeOutsideInfo();
         if (shapeOutside)
             return child->x();
@@ -802,7 +802,7 @@ private:
         
     LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) const
     {
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         ExclusionShapeOutsideInfo *shapeOutside = child->renderer()->exclusionShapeOutsideInfo();
         if (shapeOutside)
             return child->y();
@@ -1083,7 +1083,7 @@ private:
     RootInlineBox* createLineBoxesFromBidiRuns(BidiRunList<BidiRun>&, const InlineIterator& end, LineInfo&, VerticalPositionCache&, BidiRun* trailingSpaceRun, WordMeasurements&);
     void layoutRunsAndFloats(LineLayoutState&, bool hasInlineChild);
     void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&, const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiStatus, unsigned consecutiveHyphenatedLines);
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     void updateLineBoundariesForExclusions(ExclusionShapeInsideInfo*, LayoutUnit&, LineLayoutState&, bool&);
     bool adjustLogicalLineTopAndLogicalHeightIfNeeded(ExclusionShapeInsideInfo*, LayoutUnit, LineLayoutState&, InlineBidiResolver&, FloatingObject*, InlineIterator&, WordMeasurements&);
 #endif
@@ -1171,7 +1171,7 @@ protected:
             , m_highValue(highValue)
             , m_offset(offset)
             , m_heightRemaining(heightRemaining)
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
             , m_last(0)
 #endif
         {
@@ -1181,7 +1181,7 @@ protected:
         inline int highValue() const { return m_highValue; }
         void collectIfNeeded(const IntervalType&) const;
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         // When computing the offset caused by the floats on a given line, if
         // the outermost float on that line has a shape-outside, the inline
         // content that butts up against that float must be positioned using
@@ -1197,7 +1197,7 @@ protected:
         int m_highValue;
         LayoutUnit& m_offset;
         LayoutUnit* m_heightRemaining;
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         // This member variable is mutable because the collectIfNeeded method
         // is declared as const, even though it doesn't actually respect that
         // contract. It modifies other member variables via loopholes in the
@@ -1291,7 +1291,7 @@ public:
         RootInlineBox* m_lineGridBox;
 
         RootInlineBox* m_lineBreakToAvoidWidow;
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         OwnPtr<ExclusionShapeInsideInfo> m_shapeInsideInfo;
 #endif
         bool m_shouldBreakAtLineToAvoidWidow : 1;
index 23303c6..fd9c7c9 100644 (file)
@@ -47,7 +47,7 @@
 #include <wtf/Vector.h>
 #include <wtf/unicode/CharacterNames.h>
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 #include "ExclusionShapeInsideInfo.h"
 #endif
 
@@ -76,7 +76,7 @@ static LayoutUnit logicalHeightForLine(const RenderBlock* block, bool isFirstLin
     return max<LayoutUnit>(replacedHeight, block->lineHeight(isFirstLine, block->isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes));
 }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 ExclusionShapeInsideInfo* RenderBlock::layoutExclusionShapeInsideInfo() const
 {
     ExclusionShapeInsideInfo* shapeInsideInfo = view()->layoutState()->exclusionShapeInsideInfo();
@@ -106,14 +106,14 @@ public:
         , m_left(0)
         , m_right(0)
         , m_availableWidth(0)
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         , m_segment(0)
 #endif
         , m_isFirstLine(isFirstLine)
         , m_shouldIndentText(shouldIndentText)
     {
         ASSERT(block);
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         ExclusionShapeInsideInfo* exclusionShapeInsideInfo = m_block->layoutExclusionShapeInsideInfo();
         if (exclusionShapeInsideInfo)
             m_segment = exclusionShapeInsideInfo->currentSegment();
@@ -160,7 +160,7 @@ private:
     float m_left;
     float m_right;
     float m_availableWidth;
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     const LineSegment* m_segment;
 #endif
     bool m_isFirstLine;
@@ -174,7 +174,7 @@ inline void LineWidth::updateAvailableWidth(LayoutUnit replacedHeight)
     m_left = m_block->logicalLeftOffsetForLine(height, shouldIndentText(), logicalHeight);
     m_right = m_block->logicalRightOffsetForLine(height, shouldIndentText(), logicalHeight);
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     if (m_segment) {
         m_left = max<float>(m_segment->logicalLeft, m_left);
         m_right = min<float>(m_segment->logicalRight, m_right);
@@ -190,7 +190,7 @@ inline void LineWidth::shrinkAvailableWidthForNewFloatIfNeeded(RenderBlock::Floa
     if (height < m_block->logicalTopForFloat(newFloat) || height >= m_block->logicalBottomForFloat(newFloat))
         return;
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     // When floats with shape outside are stacked, the floats are positioned based on the bounding box of the shape,
     // not the shape's contour. Since we computed the width based on the shape contour when we added the float,
     // when we add a subsequent float on the same line, we need to undo the shape delta in order to position
@@ -217,7 +217,7 @@ inline void LineWidth::shrinkAvailableWidthForNewFloatIfNeeded(RenderBlock::Floa
 
     if (newFloat->type() == RenderBlock::FloatingObject::FloatLeft) {
         float newLeft = m_block->logicalRightForFloat(newFloat);
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         if (lastShapeOutsideInfo)
             newLeft -= lastShapeOutsideInfo->rightSegmentShapeBoundingBoxDelta();
         if (shapeOutsideInfo)
@@ -229,7 +229,7 @@ inline void LineWidth::shrinkAvailableWidthForNewFloatIfNeeded(RenderBlock::Floa
         m_left = max<float>(m_left, newLeft);
     } else {
         float newRight = m_block->logicalLeftForFloat(newFloat);
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         if (lastShapeOutsideInfo)
             newRight -= lastShapeOutsideInfo->leftSegmentShapeBoundingBoxDelta();
         if (shapeOutsideInfo)
@@ -680,7 +680,7 @@ RootInlineBox* RenderBlock::constructLine(BidiRunList<BidiRun>& bidiRuns, const
         // then we need to construct inline boxes as necessary to properly enclose the
         // run's inline box. Segments can only be siblings at the root level, as
         // they are positioned separately.
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         bool runStartsSegment = r->m_startsSegment;
 #else
         bool runStartsSegment = false;
@@ -920,7 +920,7 @@ static inline void computeExpansionForJustifiedText(BidiRun* firstRun, BidiRun*
 
     size_t i = 0;
     for (BidiRun* r = firstRun; r; r = r->next()) {
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         // This method is called once per segment, do not move past the current segment.
         if (r->m_startsSegment)
             break;
@@ -1034,7 +1034,7 @@ void RenderBlock::computeInlineDirectionPositionsForLine(RootInlineBox* lineBox,
     float availableLogicalWidth;
     updateLogicalInlinePositions(this, lineLogicalLeft, lineLogicalRight, availableLogicalWidth, isFirstLine, shouldIndentText, 0);
     bool needsWordSpacing;
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     ExclusionShapeInsideInfo* exclusionShapeInsideInfo = layoutExclusionShapeInsideInfo();
     if (exclusionShapeInsideInfo && exclusionShapeInsideInfo->hasSegments()) {
         BidiRun* segmentStart = firstRun;
@@ -1091,7 +1091,7 @@ BidiRun* RenderBlock::computeInlineDirectionPositionsForSegment(RootInlineBox* l
 
     BidiRun* r = firstRun;
     for (; r; r = r->next()) {
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         // Once we have reached the start of the next segment, we have finished
         // computing the positions for this segment's contents.
         if (r->m_startsSegment)
@@ -1355,7 +1355,7 @@ static inline void constructBidiRunsForSegment(InlineBidiResolver& topResolver,
 
 static inline void constructBidiRunsForLine(const RenderBlock* block, InlineBidiResolver& topResolver, BidiRunList<BidiRun>& bidiRuns, const InlineIterator& endOfLine, VisualDirectionOverride override, bool previousLineBrokeCleanly)
 {
-#if !ENABLE(CSS_EXCLUSIONS)
+#if !ENABLE(CSS_SHAPES)
     UNUSED_PARAM(block);
     constructBidiRunsForSegment(topResolver, bidiRuns, endOfLine, override, previousLineBrokeCleanly);
 #else
@@ -1621,7 +1621,7 @@ inline const InlineIterator& RenderBlock::restartLayoutRunsAndFloatsInRange(Layo
     return oldEnd;
 }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 static inline float firstPositiveWidth(const WordMeasurements& wordMeasurements)
 {
     for (size_t i = 0; i < wordMeasurements.size(); ++i) {
@@ -1727,7 +1727,7 @@ void RenderBlock::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, Inlin
 
     LineBreaker lineBreaker(this);
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     LayoutUnit absoluteLogicalTop;
     ExclusionShapeInsideInfo* exclusionShapeInsideInfo = layoutExclusionShapeInsideInfo();
     if (exclusionShapeInsideInfo) {
@@ -1768,7 +1768,7 @@ void RenderBlock::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, Inlin
         bool isNewUBAParagraph = layoutState.lineInfo().previousLineBrokeCleanly();
         FloatingObject* lastFloatFromPreviousLine = (containsFloats()) ? m_floatingObjects->set().last() : 0;
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         updateLineBoundariesForExclusions(exclusionShapeInsideInfo, absoluteLogicalTop, layoutState, lineOverflowsFromShapeInside);
 #endif
         WordMeasurements wordMeasurements;
@@ -1784,7 +1784,7 @@ void RenderBlock::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, Inlin
             break;
         }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         if (adjustLogicalLineTopAndLogicalHeightIfNeeded(exclusionShapeInsideInfo, absoluteLogicalTop, layoutState, resolver, lastFloatFromPreviousLine, end, wordMeasurements))
             continue;
 #endif
@@ -2735,7 +2735,7 @@ void RenderBlock::LineBreaker::reset()
 
 InlineIterator RenderBlock::LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo& lineInfo, RenderTextInfo& renderTextInfo, FloatingObject* lastFloatFromPreviousLine, unsigned consecutiveHyphenatedLines, WordMeasurements& wordMeasurements)
 {
-#if !ENABLE(CSS_EXCLUSIONS)
+#if !ENABLE(CSS_SHAPES)
     return nextSegmentBreak(resolver, lineInfo, renderTextInfo, lastFloatFromPreviousLine, consecutiveHyphenatedLines, wordMeasurements);
 #else
     ExclusionShapeInsideInfo* exclusionShapeInsideInfo = m_block->layoutExclusionShapeInsideInfo();
@@ -3397,7 +3397,7 @@ InlineIterator RenderBlock::LineBreaker::nextSegmentBreak(InlineBidiResolver& re
         lBreak.clear();
 
  end:
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     ExclusionShapeInsideInfo* shapeInfo = m_block->layoutExclusionShapeInsideInfo();
     bool segmentAllowsOverflow = !shapeInfo || !shapeInfo->hasSegments();
 #else
index 90c434a..114df5b 100644 (file)
@@ -162,7 +162,7 @@ void RenderBox::willBeDestroyed()
 
     RenderBlock::removePercentHeightDescendantIfNeeded(this);
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     ExclusionShapeOutsideInfo::removeInfo(this);
 #endif
 
@@ -314,12 +314,12 @@ void RenderBox::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle
         frame()->view()->recalculateScrollbarOverlayStyle();
     }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     updateExclusionShapeOutsideInfoAfterStyleChange(style()->shapeOutside(), oldStyle ? oldStyle->shapeOutside() : 0);
 #endif
 }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 void RenderBox::updateExclusionShapeOutsideInfoAfterStyleChange(const ExclusionShapeValue* shapeOutside, const ExclusionShapeValue* oldShapeOutside)
 {
     // FIXME: A future optimization would do a deep comparison for equality. (bug 100811)
index a48b919..9abf6b4 100644 (file)
@@ -26,7 +26,7 @@
 #include "RenderBoxModelObject.h"
 #include "RenderOverflow.h"
 #include "ScrollTypes.h"
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
 #include "ExclusionShapeOutsideInfo.h"
 #endif
 
@@ -576,7 +576,7 @@ public:
 
     bool hasSameDirectionAs(const RenderBox* object) const { return style()->direction() == object->style()->direction(); }
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     ExclusionShapeOutsideInfo* exclusionShapeOutsideInfo() const
     {
         return isFloatingWithShapeOutside() && ExclusionShapeOutsideInfo::isEnabledFor(this) ? ExclusionShapeOutsideInfo::info(this) : 0;
@@ -623,7 +623,7 @@ protected:
     RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild);
  
 private:
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     void updateExclusionShapeOutsideInfoAfterStyleChange(const ExclusionShapeValue* shapeOutside, const ExclusionShapeValue* oldShapeOutside);
 #endif
 
index b08cd11..61bb1c6 100644 (file)
@@ -625,7 +625,7 @@ LayoutSize RenderBoxModelObject::paintOffset() const
 {
     LayoutSize offset = offsetForInFlowPosition();
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
     if (isBox() && isFloating())
         if (ExclusionShapeOutsideInfo* shapeOutside = toRenderBox(this)->exclusionShapeOutsideInfo())
             offset -= shapeOutside->shapeLogicalOffset();
index 9f04b9f..1e1b281 100644 (file)
@@ -5967,7 +5967,7 @@ bool RenderLayer::shouldBeNormalFlowOnly() const
 #endif
             && !isTransparent()
             && !needsCompositedScrolling()
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
             && !renderer()->isFloatingWithShapeOutside()
 #endif
             ;
index a692bd1..9357ac5 100644 (file)
@@ -545,7 +545,7 @@ public:
     bool hasPaintOffset() const
     {
         bool positioned = isInFlowPositioned();
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         // Shape outside on a float can reposition the float in much the
         // same way as relative positioning, so treat it as such.
         positioned = positioned || isFloatingWithShapeOutside();
index 0d19b2a..88a08b8 100644 (file)
@@ -248,7 +248,7 @@ private:
         // We push LayoutState even if layoutState is disabled because it stores layoutDelta too.
         if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer->hasColumns() || renderer->flowThreadContainingBlock()
             || m_layoutState->lineGrid() || (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isBlockFlow())
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
             || (renderer->isRenderBlock() && toRenderBlock(renderer)->exclusionShapeInsideInfo())
             || (m_layoutState->exclusionShapeInsideInfo() && renderer->isRenderBlock() && !toRenderBlock(renderer)->allowsExclusionShapeInsideInfoSharing())
 #endif
index 90f9ec7..b8b220a 100644 (file)
@@ -462,7 +462,7 @@ bool RenderStyle::changeRequiresLayout(const RenderStyle* other, unsigned& chang
             return true;
 #endif
 
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData->m_shapeInside)
             return true;
 #endif
index ed9e335..69220f3 100644 (file)
@@ -463,7 +463,7 @@ public:
     bool hasPaintOffset() const
     {
         bool paintOffset = hasInFlowPosition();
-#if ENABLE(CSS_EXCLUSIONS)
+#if ENABLE(CSS_SHAPES)
         paintOffset = paintOffset || (isFloating() && shapeOutside());
 #endif
         return paintOffset;
index 2c1c798..f33be9b 100644 (file)
@@ -67,6 +67,7 @@ namespace WebCore {
 
 InternalSettings::Backup::Backup(Settings* settings)
     : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnabled())
+    , m_originalCSSShapesEnabled(RuntimeEnabledFeatures::cssShapesEnabled())
     , m_originalCSSVariablesEnabled(settings->cssVariablesEnabled())
 #if ENABLE(SHADOW_DOM)
     , m_originalShadowDOMEnabled(RuntimeEnabledFeatures::shadowDOMEnabled())
@@ -104,6 +105,7 @@ InternalSettings::Backup::Backup(Settings* settings)
 void InternalSettings::Backup::restoreTo(Settings* settings)
 {
     RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabled);
+    RuntimeEnabledFeatures::setCSSShapesEnabled(m_originalCSSShapesEnabled);
     settings->setCSSVariablesEnabled(m_originalCSSVariablesEnabled);
 #if ENABLE(SHADOW_DOM)
     RuntimeEnabledFeatures::setShadowDOMEnabled(m_originalShadowDOMEnabled);
@@ -351,6 +353,12 @@ void InternalSettings::setCSSExclusionsEnabled(bool enabled, ExceptionCode& ec)
     RuntimeEnabledFeatures::setCSSExclusionsEnabled(enabled);
 }
 
+void InternalSettings::setCSSShapesEnabled(bool enabled, ExceptionCode& ec)
+{
+    UNUSED_PARAM(ec);
+    RuntimeEnabledFeatures::setCSSShapesEnabled(enabled);
+}
+
 void InternalSettings::setCSSVariablesEnabled(bool enabled, ExceptionCode& ec)
 {
     InternalSettingsGuardForSettings();
index f7a0bbd..54b0442 100644 (file)
@@ -51,6 +51,7 @@ public:
         void restoreTo(Settings*);
 
         bool m_originalCSSExclusionsEnabled;
+        bool m_originalCSSShapesEnabled;
         bool m_originalCSSVariablesEnabled;
 #if ENABLE(SHADOW_DOM)
         bool m_originalShadowDOMEnabled;
@@ -113,6 +114,7 @@ public:
     void setTextAutosizingFontScaleFactor(float fontScaleFactor, ExceptionCode&);
     void setMediaTypeOverride(const String& mediaType, ExceptionCode&);
     void setCSSExclusionsEnabled(bool enabled, ExceptionCode&);
+    void setCSSShapesEnabled(bool enabled, ExceptionCode&);
     void setCSSVariablesEnabled(bool enabled, ExceptionCode&);
     bool cssVariablesEnabled(ExceptionCode&);
     void setCanStartMedia(bool, ExceptionCode&);
index 7d41857..3905b13 100644 (file)
@@ -44,6 +44,7 @@
     void setTextAutosizingFontScaleFactor(float fontScaleFactor) raises(DOMException);
     void setMediaTypeOverride(DOMString mediaTypeOverride) raises(DOMException);
     void setCSSExclusionsEnabled(boolean enabled) raises(DOMException);
+    void setCSSShapesEnabled(boolean enabled) raises(DOMException);
     void setCSSVariablesEnabled(boolean enabled) raises(DOMException);
     boolean cssVariablesEnabled() raises(DOMException);
     void setCanStartMedia(boolean enabled) raises(DOMException);
index f84beeb..a87e276 100644 (file)
@@ -1,3 +1,14 @@
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        Adding the CSS_SHAPES compile flag.
+
+        * WebCoreSupport/AboutDataEnableFeatures.in:
+
 2013-06-05  Genevieve Mak  <gmak@rim.com>
 
         [BlackBerry] Deleting the pendingSelectionCandidate on the wrong thread causes an assert.
index 676bc04..0319849 100644 (file)
@@ -35,6 +35,7 @@ CSS_IMAGE_RESOLUTION
 CSS_IMAGE_SET
 CSS_REGIONS
 CSS_SHADERS
+CSS_SHAPES
 CSS_STICKY_POSITION
 CSS_VARIABLES
 CURSOR_VISIBILITY
index 147879c..a912270 100644 (file)
@@ -1,3 +1,14 @@
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        Adding the CSS_SHAPES compile flag.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-06-01  Andreas Kling  <akling@apple.com>
 
         Remove unnused WebDOMNodeOperationsInternal category.
index f956a78..72aee65 100644 (file)
@@ -52,6 +52,7 @@ ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
 ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
+ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
 ENABLE_CSS_VARIABLES = ;
@@ -183,4 +184,4 @@ ENABLE_WORKERS = ENABLE_WORKERS;
 ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(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_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(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_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(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_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(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_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(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_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(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_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(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_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(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_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index ad7e22d..3f6e5d6 100644 (file)
@@ -1,3 +1,14 @@
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        Adding the CSS_SHAPES compile flag.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-06-05  Anders Carlsson  <andersca@apple.com>
 
         Crash if an IPC connection is invalidated before it's completely set up
index f956a78..72aee65 100644 (file)
@@ -52,6 +52,7 @@ ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
 ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
+ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
 ENABLE_CSS_VARIABLES = ;
@@ -183,4 +184,4 @@ ENABLE_WORKERS = ENABLE_WORKERS;
 ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(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_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(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_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(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_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(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_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(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_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(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_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(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_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(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_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index ad48dad..3e05864 100644 (file)
@@ -108,6 +108,7 @@ $srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \
     ENABLE_CSS_IMAGE_RESOLUTION=0 \
     ENABLE_CSS_IMAGE_SET=0 \
     ENABLE_CSS_REGIONS=0 \
+    ENABLE_CSS_SHAPES=1 \
     ENABLE_CSS_STICKY_POSITION=0 \
     ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=0 \
     ENABLE_CSS_VARIABLES=0 \
index 55f6b61..31cc13d 100644 (file)
@@ -231,6 +231,7 @@ _ZN7WebCore22RuntimeEnabledFeatures31isMultipleShadowSubtreesEnabledE;
 _ZN7WebCore22RuntimeEnabledFeatures32setMultipleShadowSubtreesEnabledEb;
 _ZN7WebCore22RuntimeEnabledFeatures18isShadowDOMEnabledE;
 _ZN7WebCore22RuntimeEnabledFeatures22isCSSExclusionsEnabledE;
+_ZN7WebCore22RuntimeEnabledFeatures18isCSSShapesEnabledE;
 _ZN7WebCore22RuntimeEnabledFeatures40isLangAttributeAwareFormControlUIEnabledE;
 _ZN7WebCore22RuntimeEnabledFeatures22isDialogElementEnabledE;
 _ZN7WebCore22RuntimeEnabledFeatures37isAuthorShadowDOMForAnyElementEnabledE;
index ce3bcc1..44766ea 100644 (file)
@@ -36,6 +36,7 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHADERS "Toggle CSS Shaders (within CSS Filters) support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_STICKY_POSITION "Toggle CSS sticky position support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED "Toggle support for unprefixed CSS animations and transforms" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_VARIABLES "Toggle CSS Variables support" OFF)
index e50bf75..a77590a 100644 (file)
@@ -27,6 +27,7 @@
 #cmakedefine01 ENABLE_CSS_IMAGE_SET
 #cmakedefine01 ENABLE_CSS_REGIONS
 #cmakedefine01 ENABLE_CSS_SHADERS
+#cmakedefine01 ENABLE_CSS_SHAPES
 #cmakedefine01 ENABLE_CSS_STICKY_POSITION
 #cmakedefine01 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED
 #cmakedefine01 ENABLE_CSS_VARIABLES
index 17b983c..3c7ab6f 100644 (file)
@@ -1,3 +1,15 @@
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        Adding the CSS_SHAPES compile flag.
+
+        * Scripts/webkitperl/FeatureList.pm:
+        * qmake/mkspecs/features/features.pri:
+
 2013-06-05  Brent Fulgham  <bfulgham@apple.com>
 
         [Windows] Unreviewed build fix. Add CRLF eol-style for DOS shell scripts; if they accidentally change
index 3f90d01..c2c750a 100644 (file)
@@ -63,6 +63,7 @@ my (
     $cssImageSetSupport,
     $cssRegionsSupport,
     $cssShadersSupport,
+    $cssShapesSupport,
     $cssStickyPositionSupport,
     $cssCompositingSupport,
     $cssAnimationsTransformsUnprefixedSupport,
@@ -187,6 +188,9 @@ my @features = (
     { option => "css-exclusions", desc => "Toggle CSS Exclusions support",
       define => "ENABLE_CSS_EXCLUSIONS", default => 1, value => \$cssExclusionsSupport },
 
+    { option => "css-shapes", desc => "Toggle CSS Shapes support",
+      define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
+
     { option => "css-filters", desc => "Toggle CSS Filters support",
       define => "ENABLE_CSS_FILTERS", default => isAppleWebKit() || isBlackBerry(), value => \$cssFiltersSupport },
 
index bdbac80..1078850 100644 (file)
@@ -32,6 +32,7 @@ FEATURE_DEFAULTS = \
     ENABLE_CSS_IMAGE_SET=1 \
     ENABLE_CSS_REGIONS=1 \
     ENABLE_CSS_SHADERS=0 \
+    ENABLE_CSS_SHAPES=1 \
     ENABLE_CSS_STICKY_POSITION=1 \
     ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 \
     ENABLE_CSS_VARIABLES=0 \
index e083b0c..be4522f 100644 (file)
@@ -1,3 +1,15 @@
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        Adding the CSS_SHAPES compile flag.
+
+        * win/tools32/vsprops/FeatureDefines.vsprops:
+        * win/tools32/vsprops/FeatureDefinesCairo.vsprops:
+
 2013-06-03  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed. Some AppleWin VS2010 house cleaning.
index 9800b3c..df2811e 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS3_TEXT_LINE_BREAK);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FONT_LOAD_EVENTS);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOSNIFF);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS3_TEXT_LINE_BREAK);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FONT_LOAD_EVENTS);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOSNIFF);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_RENDERING"
                PerformEnvironmentSet="true"
        />
   <UserMacro
+               Name="ENABLE_CSS_SHAPES"
+               Value=""
+               PerformEnvironmentSet="true"
+       />
+  <UserMacro
                Name="ENABLE_CSS_STICKY_POSITION"
                Value="ENABLE_CSS_STICKY_POSITION"
                PerformEnvironmentSet="true"
index 76f574b..06d7191 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS3_TEXT_LINE_BREAK);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FONT_LOAD_EVENTS);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOSNIFF);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS3_TEXT_LINE_BREAK);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FONT_LOAD_EVENTS);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOSNIFF);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_RENDERING"
                PerformEnvironmentSet="true"
        />
   <UserMacro
+               Name="ENABLE_CSS_SHAPES"
+               Value=""
+               PerformEnvironmentSet="true"
+       />
+  <UserMacro
                Name="ENABLE_CSS_STICKY_POSITION"
                Value="ENABLE_CSS_STICKY_POSITION"
                PerformEnvironmentSet="true"