<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207499] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207499">207499</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-10-18 16:33:22 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove CSS_SHAPES feature definition. This should always be on.
https://bugs.webkit.org/show_bug.cgi?id=163628
<rdar://problem/28834613>
.:
Reviewed by Tim Horton.
* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsWin.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmake/tools/vsprops/FeatureDefines.props:
* Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
Source/JavaScriptCore:
Reviewed by Tim Horton.
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
Reviewed by Tim Horton.
CSS Shapes is in Candidate Recommendation. It's a core part
of CSS. It should always be enabled.
* Configurations/FeatureDefines.xcconfig:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::shapePropertyValue):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSPropertyNames.in:
* css/CSSValueKeywords.in:
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertShapeValue):
* css/parser/CSSParser.cpp:
(WebCore::isSimpleLengthPropertyID):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseShapeProperty):
* css/parser/CSSParser.h:
* inspector/InspectorOverlay.cpp:
(WebCore::buildObjectForShapeOutside):
(WebCore::buildObjectForElementData):
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc):
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* rendering/FloatingObjects.cpp:
(WebCore::FindNextFloatLogicalBottomAdapter::collectIfNeeded):
(WebCore::ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatLeft>::updateOffsetIfNeeded):
(WebCore::ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatRight>::updateOffsetIfNeeded):
* rendering/RenderBlock.cpp:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::positionNewFloats):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::~RenderBox):
(WebCore::RenderBox::styleDidChange):
(WebCore::RenderBox::updateShapeOutsideInfoAfterStyleChange):
(WebCore::isCandidateForOpaquenessTest):
(WebCore::RenderBox::imageChanged):
* rendering/RenderBox.h:
(WebCore::RenderBox::markShapeOutsideDependentsForLayout):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::~RenderElement):
(WebCore::RenderElement::updateShapeImage):
(WebCore::RenderElement::initializeStyle):
(WebCore::RenderElement::setStyle):
* rendering/RenderElement.h:
(WebCore::RenderElement::hasShapeOutside):
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForWithReason):
* rendering/line/LineWidth.cpp:
(WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded):
(WebCore::LineWidth::wrapNextToShapeOutside):
(WebCore::LineWidth::fitBelowFloats):
* rendering/line/LineWidth.h:
* rendering/shapes/ShapeOutsideInfo.cpp:
* rendering/shapes/ShapeOutsideInfo.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
(WebCore::RenderStyle::changeRequiresRepaint):
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::initialShapeImageThreshold):
* rendering/style/ShapeValue.cpp:
* rendering/style/ShapeValue.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
* style/StylePendingResources.cpp:
(WebCore::Style::loadPendingResources):
Source/WebKit/mac:
Reviewed by Tim Horton.
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
Reviewed by Tim Horton.
* Configurations/FeatureDefines.xcconfig:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserh">trunk/Source/WebCore/css/parser/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFloatingObjectscpp">trunk/Source/WebCore/rendering/FloatingObjects.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthcpp">trunk/Source/WebCore/rendering/line/LineWidth.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthh">trunk/Source/WebCore/rendering/line/LineWidth.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleShapeValuecpp">trunk/Source/WebCore/rendering/style/ShapeValue.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleShapeValueh">trunk/Source/WebCore/rendering/style/ShapeValue.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#trunkSourceWebCorestyleStylePendingResourcescpp">trunk/Source/WebCore/style/StylePendingResources.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWincmake">trunk/Source/cmake/OptionsWin.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmaketoolsvspropsFeatureDefinesprops">trunk/Source/cmake/tools/vsprops/FeatureDefines.props</a></li>
<li><a href="#trunkSourcecmaketoolsvspropsFeatureDefinesCairoprops">trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/ChangeLog 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-18 Dean Jackson <dino@apple.com>
+
+ Remove CSS_SHAPES feature definition. This should always be on.
+ https://bugs.webkit.org/show_bug.cgi?id=163628
+ <rdar://problem/28834613>
+
+ Reviewed by Tim Horton.
+
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/OptionsWin.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmake/tools/vsprops/FeatureDefines.props:
+ * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
+
</ins><span class="cx"> 2016-10-14 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Private/unsupported build options should be marked as advanced
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-10-18 Dean Jackson <dino@apple.com>
+
+ Remove CSS_SHAPES feature definition. This should always be on.
+ https://bugs.webkit.org/show_bug.cgi?id=163628
+ <rdar://problem/28834613>
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-10-18 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Add JSC option to show time spent in each optimization phase
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</span><del>-ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</del><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -202,4 +201,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(
ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENA
BLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE
_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(
ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(EN
ABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/ChangeLog 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -1,3 +1,78 @@
</span><ins>+2016-10-18 Dean Jackson <dino@apple.com>
+
+ Remove CSS_SHAPES feature definition. This should always be on.
+ https://bugs.webkit.org/show_bug.cgi?id=163628
+ <rdar://problem/28834613>
+
+ Reviewed by Tim Horton.
+
+ CSS Shapes is in Candidate Recommendation. It's a core part
+ of CSS. It should always be enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::shapePropertyValue):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSPropertyNames.in:
+ * css/CSSValueKeywords.in:
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertShapeValue):
+ * css/parser/CSSParser.cpp:
+ (WebCore::isSimpleLengthPropertyID):
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseShapeProperty):
+ * css/parser/CSSParser.h:
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::buildObjectForShapeOutside):
+ (WebCore::buildObjectForElementData):
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFunc):
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * rendering/FloatingObjects.cpp:
+ (WebCore::FindNextFloatLogicalBottomAdapter::collectIfNeeded):
+ (WebCore::ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatLeft>::updateOffsetIfNeeded):
+ (WebCore::ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatRight>::updateOffsetIfNeeded):
+ * rendering/RenderBlock.cpp:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::positionNewFloats):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::~RenderBox):
+ (WebCore::RenderBox::styleDidChange):
+ (WebCore::RenderBox::updateShapeOutsideInfoAfterStyleChange):
+ (WebCore::isCandidateForOpaquenessTest):
+ (WebCore::RenderBox::imageChanged):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::markShapeOutsideDependentsForLayout):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::~RenderElement):
+ (WebCore::RenderElement::updateShapeImage):
+ (WebCore::RenderElement::initializeStyle):
+ (WebCore::RenderElement::setStyle):
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::hasShapeOutside):
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForWithReason):
+ * rendering/line/LineWidth.cpp:
+ (WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded):
+ (WebCore::LineWidth::wrapNextToShapeOutside):
+ (WebCore::LineWidth::fitBelowFloats):
+ * rendering/line/LineWidth.h:
+ * rendering/shapes/ShapeOutsideInfo.cpp:
+ * rendering/shapes/ShapeOutsideInfo.h:
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout):
+ (WebCore::RenderStyle::changeRequiresRepaint):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::initialShapeImageThreshold):
+ * rendering/style/ShapeValue.cpp:
+ * rendering/style/ShapeValue.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+ * style/StylePendingResources.cpp:
+ (WebCore::Style::loadPendingResources):
+
</ins><span class="cx"> 2016-10-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> convertDictionary<>() no longer needs to return an Optional<> type
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</span><del>-ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</del><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -202,4 +201,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(
ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENA
BLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE
_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(
ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(EN
ABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -381,9 +381,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> CSSPropertyWebkitTouchCallout,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> CSSPropertyWebkitShapeOutside,
</span><del>-#endif
</del><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> CSSPropertyWebkitTapHighlightColor,
</span><span class="cx"> #endif
</span><span class="lines">@@ -414,10 +412,8 @@
</span><span class="cx"> CSSPropertyWebkitRegionBreakInside,
</span><span class="cx"> CSSPropertyWebkitRegionFragment,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> CSSPropertyWebkitShapeMargin,
</span><span class="cx"> CSSPropertyWebkitShapeImageThreshold,
</span><del>-#endif
</del><span class="cx"> CSSPropertyBufferedRendering,
</span><span class="cx"> CSSPropertyClipPath,
</span><span class="cx"> CSSPropertyClipRule,
</span><span class="lines">@@ -2382,7 +2378,6 @@
</span><span class="cx"> return styledNode->computedStyle(styledNode->isPseudoElement() ? NOPSEUDO : pseudoElementSpecifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> static Ref<CSSValue> shapePropertyValue(const RenderStyle& style, const ShapeValue* shapeValue)
</span><span class="cx"> {
</span><span class="cx"> if (!shapeValue)
</span><span class="lines">@@ -2405,7 +2400,6 @@
</span><span class="cx"> list->append(CSSValuePool::singleton().createValue(shapeValue->cssBox()));
</span><span class="cx"> return list.releaseNonNull();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static Ref<CSSValueList> valueForItemPositionWithOverflowAlignment(const StyleSelfAlignmentData& data)
</span><span class="cx"> {
</span><span class="lines">@@ -3684,7 +3678,6 @@
</span><span class="cx"> case CSSPropertyWebkitRegionFragment:
</span><span class="cx"> return cssValuePool.createValue(style->regionFragment());
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><span class="cx"> return cssValuePool.createValue(style->shapeMargin(), *style);
</span><span class="cx"> case CSSPropertyWebkitShapeImageThreshold:
</span><span class="lines">@@ -3691,7 +3684,6 @@
</span><span class="cx"> return cssValuePool.createValue(style->shapeImageThreshold(), CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> return shapePropertyValue(*style, style->shapeOutside());
</span><del>-#endif
</del><span class="cx"> case CSSPropertyFilter:
</span><span class="cx"> return valueForFilter(*style, style->filter());
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -654,11 +654,9 @@
</span><span class="cx"> -webkit-region-break-before [Initial=initialBreakBetween, NameForMethods=BreakBefore, Converter=RegionBreakBetween]
</span><span class="cx"> -webkit-region-break-inside [Initial=initialBreakInside, NameForMethods=BreakInside, Converter=RegionBreakInside]
</span><span class="cx"> #endif
</span><del>-#if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES
</del><span class="cx"> -webkit-shape-outside [Converter=ShapeValue]
</span><span class="cx"> -webkit-shape-margin [Converter=Length]
</span><span class="cx"> -webkit-shape-image-threshold [Converter=NumberOrAuto<float>]
</span><del>-#endif
</del><span class="cx"> #if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
</span><span class="cx"> max-zoom [SkipBuilder]
</span><span class="cx"> min-zoom [SkipBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -852,7 +852,7 @@
</span><span class="cx"> region
</span><span class="cx"> verso
</span><span class="cx">
</span><del>-// CSS_SHAPES
</del><ins>+// CSS Shapes
</ins><span class="cx"> margin-box
</span><span class="cx">
</span><span class="cx"> // clip-path
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -93,9 +93,7 @@
</span><span class="cx"> static float convertTextStrokeWidth(StyleResolver&, CSSValue&);
</span><span class="cx"> static LineBoxContain convertLineBoxContain(StyleResolver&, CSSValue&);
</span><span class="cx"> static TextDecorationSkip convertTextDecorationSkip(StyleResolver&, CSSValue&);
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> static PassRefPtr<ShapeValue> convertShapeValue(StyleResolver&, CSSValue&);
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> static std::unique_ptr<ScrollSnapPoints> convertScrollSnapPoints(StyleResolver&, CSSValue&);
</span><span class="cx"> static LengthSize convertSnapCoordinatePair(StyleResolver&, CSSValue&, size_t offset = 0);
</span><span class="lines">@@ -732,7 +730,6 @@
</span><span class="cx"> return skip;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> static inline bool isImageShape(const CSSValue& value)
</span><span class="cx"> {
</span><span class="cx"> return is<CSSImageValue>(value) || is<CSSImageSetValue>(value) || is<CSSImageGeneratorValue>(value);
</span><span class="lines">@@ -774,7 +771,6 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>-#endif // ENABLE(CSS_SHAPES)
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> inline Length StyleBuilderConverter::parseSnapCoordinate(StyleResolver& styleResolver, const CSSValue& value)
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -500,9 +500,7 @@
</span><span class="cx"> case CSSPropertyGridColumnGap:
</span><span class="cx"> case CSSPropertyGridRowGap:
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><del>-#endif
</del><span class="cx"> acceptsNegativeNumbers = false;
</span><span class="cx"> return true;
</span><span class="cx"> case CSSPropertyBottom:
</span><span class="lines">@@ -2978,7 +2976,6 @@
</span><span class="cx"> case CSSPropertyWebkitClipPath:
</span><span class="cx"> parsedValue = parseClipPath();
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> parsedValue = parseShapeProperty(propId);
</span><span class="cx"> break;
</span><span class="lines">@@ -2988,7 +2985,6 @@
</span><span class="cx"> case CSSPropertyWebkitShapeImageThreshold:
</span><span class="cx"> validPrimitive = !id && validateUnit(valueWithCalculation, FNumber);
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> case CSSPropertyImageOrientation:
</span><span class="cx"> validPrimitive = !id && validateUnit(valueWithCalculation, FAngle);
</span><span class="lines">@@ -6675,7 +6671,6 @@
</span><span class="cx"> return WTFMove(list);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> RefPtr<CSSValue> CSSParser::parseShapeProperty(CSSPropertyID propId)
</span><span class="cx"> {
</span><span class="cx"> CSSParserValue& value = *m_valueList->current();
</span><span class="lines">@@ -6694,7 +6689,6 @@
</span><span class="cx">
</span><span class="cx"> return parseBasicShapeAndOrBox(propId);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> CSSParser::parseClipPath()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.h (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.h 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/css/parser/CSSParser.h 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -255,9 +255,7 @@
</span><span class="cx"> bool parseItemPositionOverflowPosition(CSSPropertyID, bool important);
</span><span class="cx"> RefPtr<CSSContentDistributionValue> parseContentDistributionOverflowPosition();
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> RefPtr<CSSValue> parseShapeProperty(CSSPropertyID);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RefPtr<CSSValueList> parseBasicShapeAndOrBox(CSSPropertyID propId);
</span><span class="cx"> RefPtr<CSSPrimitiveValue> parseBasicShape();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -588,7 +588,6 @@
</span><span class="cx"> return WTFMove(arrayOfFragments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> static FloatPoint localPointToRoot(RenderObject* renderer, const FrameView* mainView, const FrameView* view, const FloatPoint& point)
</span><span class="cx"> {
</span><span class="cx"> FloatPoint result = renderer->localToAbsolute(point);
</span><span class="lines">@@ -690,7 +689,6 @@
</span><span class="cx">
</span><span class="cx"> return WTFMove(shapeObject);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static RefPtr<Inspector::Protocol::OverlayTypes::ElementData> buildObjectForElementData(Node* node, HighlightType type)
</span><span class="cx"> {
</span><span class="lines">@@ -769,13 +767,11 @@
</span><span class="cx"> elementData->setContentFlowData(WTFMove(contentFlowData));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (is<RenderBox>(*renderer)) {
</span><span class="cx"> auto& renderBox = downcast<RenderBox>(*renderer);
</span><span class="cx"> if (RefPtr<Inspector::Protocol::OverlayTypes::ShapeOutsideData> shapeObject = buildObjectForShapeOutside(containingFrame, &renderBox))
</span><span class="cx"> elementData->setShapeOutsideData(WTFMove(shapeObject));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Need to enable AX to get the computed role.
</span><span class="cx"> if (!WebCore::AXObjectCache::accessibilityEnabled())
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -144,7 +144,6 @@
</span><span class="cx"> return ShapeClipPathOperation::create(toShape.blend(fromShape, progress));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> static inline PassRefPtr<ShapeValue> blendFunc(const AnimationBase*, ShapeValue* from, ShapeValue* to, double progress)
</span><span class="cx"> {
</span><span class="cx"> if (!from || !to)
</span><span class="lines">@@ -164,7 +163,6 @@
</span><span class="cx">
</span><span class="cx"> return ShapeValue::createShapeValue(toShape.blend(fromShape, progress), to->cssBox());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static inline PassRefPtr<FilterOperation> blendFunc(const AnimationBase* animation, FilterOperation* fromOp, FilterOperation* toOp, double progress, bool blendToPassthrough = false)
</span><span class="cx"> {
</span><span class="lines">@@ -562,7 +560,6 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> class PropertyWrapperShape : public RefCountedPropertyWrapper<ShapeValue> {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -589,7 +586,6 @@
</span><span class="cx"> return *shapeA == *shapeB;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> class StyleImagePropertyWrapper : public RefCountedPropertyWrapper<StyleImage> {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -1436,11 +1432,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath),
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> new PropertyWrapperShape(CSSPropertyWebkitShapeOutside, &RenderStyle::shapeOutside, &RenderStyle::setShapeOutside),
</span><span class="cx"> new LengthPropertyWrapper<Length>(CSSPropertyWebkitShapeMargin, &RenderStyle::shapeMargin, &RenderStyle::setShapeMargin),
</span><span class="cx"> new PropertyWrapper<float>(CSSPropertyWebkitShapeImageThreshold, &RenderStyle::shapeImageThreshold, &RenderStyle::setShapeImageThreshold),
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> new PropertyWrapperVisitedAffectedColor(CSSPropertyColumnRuleColor, MaybeInvalidColor, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::visitedLinkColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor),
</span><span class="cx"> new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitTextStrokeColor, MaybeInvalidColor, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::visitedLinkTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor),
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFloatingObjectscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FloatingObjects.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FloatingObjects.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/FloatingObjects.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -221,7 +221,6 @@
</span><span class="cx"> if (m_nextLogicalBottom < floatBottom)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (ShapeOutsideInfo* shapeOutside = floatingObject.renderer().shapeOutsideInfo()) {
</span><span class="cx"> LayoutUnit shapeBottom = m_renderer.logicalTopForFloat(floatingObject) + m_renderer.marginBeforeForChild(floatingObject.renderer()) + shapeOutside->shapeLogicalBottom();
</span><span class="cx"> // Use the shapeBottom unless it extends outside of the margin box, in which case it is clipped.
</span><span class="lines">@@ -228,7 +227,6 @@
</span><span class="cx"> m_nextShapeLogicalBottom = std::min(shapeBottom, floatBottom);
</span><span class="cx"> } else
</span><span class="cx"> m_nextShapeLogicalBottom = floatBottom;
</span><del>-#endif
</del><span class="cx"> m_nextLogicalBottom = floatBottom;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -477,7 +475,6 @@
</span><span class="cx"> inline bool ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatLeft>::updateOffsetIfNeeded(const FloatingObject& floatingObject)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit logicalRight = m_renderer.logicalRightForFloat(floatingObject);
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (ShapeOutsideInfo* shapeOutside = floatingObject.renderer().shapeOutsideInfo()) {
</span><span class="cx"> ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(m_renderer, floatingObject, m_lineTop, m_lineBottom - m_lineTop);
</span><span class="cx"> if (!shapeDeltas.lineOverlapsShape())
</span><span class="lines">@@ -485,7 +482,6 @@
</span><span class="cx">
</span><span class="cx"> logicalRight += shapeDeltas.rightMarginBoxDelta();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> if (logicalRight > m_offset) {
</span><span class="cx"> m_offset = logicalRight;
</span><span class="cx"> return true;
</span><span class="lines">@@ -498,7 +494,6 @@
</span><span class="cx"> inline bool ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatRight>::updateOffsetIfNeeded(const FloatingObject& floatingObject)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit logicalLeft = m_renderer.logicalLeftForFloat(floatingObject);
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (ShapeOutsideInfo* shapeOutside = floatingObject.renderer().shapeOutsideInfo()) {
</span><span class="cx"> ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(m_renderer, floatingObject, m_lineTop, m_lineBottom - m_lineTop);
</span><span class="cx"> if (!shapeDeltas.lineOverlapsShape())
</span><span class="lines">@@ -506,7 +501,6 @@
</span><span class="cx">
</span><span class="cx"> logicalLeft += shapeDeltas.leftMarginBoxDelta();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> if (logicalLeft < m_offset) {
</span><span class="cx"> m_offset = logicalLeft;
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><ins>+#include "ShapeOutsideInfo.h"
</ins><span class="cx"> #include <wtf/text/TextBreakIterator.h>
</span><span class="cx"> #include "TransformState.h"
</span><span class="cx">
</span><span class="lines">@@ -76,10 +77,6 @@
</span><span class="cx"> #include <wtf/StackStats.h>
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
-#include "ShapeOutsideInfo.h"
-#endif
-
</del><span class="cx"> using namespace WTF;
</span><span class="cx"> using namespace Unicode;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -2559,10 +2559,8 @@
</span><span class="cx">
</span><span class="cx"> m_floatingObjects->addPlacedObject(&floatingObject);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (ShapeOutsideInfo* shapeOutside = childBox.shapeOutsideInfo())
</span><span class="cx"> shapeOutside->setReferenceBoxLogicalSize(logicalSizeForChild(childBox));
</span><del>-#endif
</del><span class="cx"> // If the child moved, we have to repaint it.
</span><span class="cx"> if (childBox.checkForRepaintDuringLayout())
</span><span class="cx"> childBox.repaintDuringLayoutIfMoved(oldRect);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -167,9 +167,7 @@
</span><span class="cx">
</span><span class="cx"> RenderBlock::removePercentHeightDescendantIfNeeded(*this);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> ShapeOutsideInfo::removeInfo(*this);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> view().unscheduleLazyRepaint(*this);
</span><span class="cx"> removeControlStatesForRenderer(*this);
</span><span class="lines">@@ -460,10 +458,8 @@
</span><span class="cx"> view().compositor().rootOrBodyStyleChanged(*this, oldStyle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if ((oldStyle && oldStyle->shapeOutside()) || style().shapeOutside())
</span><span class="cx"> updateShapeOutsideInfoAfterStyleChange(style(), oldStyle);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBox::willBeRemovedFromTree()
</span><span class="lines">@@ -476,8 +472,6 @@
</span><span class="cx"> RenderBoxModelObject::willBeRemovedFromTree();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> void RenderBox::updateShapeOutsideInfoAfterStyleChange(const RenderStyle& style, const RenderStyle* oldStyle)
</span><span class="cx"> {
</span><span class="cx"> const ShapeValue* shapeOutside = style.shapeOutside();
</span><span class="lines">@@ -501,7 +495,6 @@
</span><span class="cx"> if (shapeOutside || shapeOutside != oldShapeOutside)
</span><span class="cx"> markShapeOutsideDependentsForLayout();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void RenderBox::updateFromStyle()
</span><span class="cx"> {
</span><span class="lines">@@ -1476,10 +1469,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (childStyle.visibility() != VISIBLE)
</span><span class="cx"> return false;
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (childStyle.shapeOutside())
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx"> if (!childBox.width() || !childBox.height())
</span><span class="cx"> return false;
</span><span class="cx"> if (RenderLayer* childLayer = childBox.layer()) {
</span><span class="lines">@@ -1709,13 +1700,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> ShapeValue* shapeOutsideValue = style().shapeOutside();
</span><span class="cx"> if (!view().frameView().isInRenderTreeLayout() && isFloating() && shapeOutsideValue && shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image) {
</span><span class="cx"> ShapeOutsideInfo::ensureInfo(*this).markShapeAsDirty();
</span><span class="cx"> markShapeOutsideDependentsForLayout();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool didFullRepaint = repaintLayerRectsForImage(image, style().backgroundLayers(), true);
</span><span class="cx"> if (!didFullRepaint)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -27,9 +27,7 @@
</span><span class="cx"> #include "RenderBoxModelObject.h"
</span><span class="cx"> #include "RenderOverflow.h"
</span><span class="cx"> #include "ScrollTypes.h"
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> #include "ShapeOutsideInfo.h"
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -604,7 +602,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> ShapeOutsideInfo* shapeOutsideInfo() const
</span><span class="cx"> {
</span><span class="cx"> return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr;
</span><span class="lines">@@ -615,7 +612,6 @@
</span><span class="cx"> if (isFloating())
</span><span class="cx"> removeFloatingOrPositionedChildFromBlockLists();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // True if this box can have a range in an outside fragmentation context.
</span><span class="cx"> bool canHaveOutsideRegionRange() const { return !isInFlowRenderFlowThread(); }
</span><span class="lines">@@ -666,9 +662,7 @@
</span><span class="cx"> RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> void updateShapeOutsideInfoAfterStyleChange(const RenderStyle&, const RenderStyle* oldStyle);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> bool isGridItem() const { return parent() && parent()->isRenderGrid(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -143,12 +143,10 @@
</span><span class="cx"> if (StyleImage* maskBoxImage = m_style.maskBoxImage().image())
</span><span class="cx"> maskBoxImage->removeClient(this);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (auto shapeValue = m_style.shapeOutside()) {
</span><span class="cx"> if (auto shapeImage = shapeValue->image())
</span><span class="cx"> shapeImage->removeClient(this);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> if (m_hasPausedImageAnimations)
</span><span class="cx"> view().removeRendererWithPausedImageAnimations(*this);
</span><span class="lines">@@ -367,13 +365,11 @@
</span><span class="cx"> newImage->addClient(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> void RenderElement::updateShapeImage(const ShapeValue* oldShapeValue, const ShapeValue* newShapeValue)
</span><span class="cx"> {
</span><span class="cx"> if (oldShapeValue || newShapeValue)
</span><span class="cx"> updateImage(oldShapeValue ? oldShapeValue->image() : nullptr, newShapeValue ? newShapeValue->image() : nullptr);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void RenderElement::initializeStyle()
</span><span class="cx"> {
</span><span class="lines">@@ -388,10 +384,7 @@
</span><span class="cx">
</span><span class="cx"> updateImage(nullptr, m_style.borderImage().image());
</span><span class="cx"> updateImage(nullptr, m_style.maskBoxImage().image());
</span><del>-
-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> updateShapeImage(nullptr, m_style.shapeOutside());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> styleDidChange(StyleDifferenceNewStyle, nullptr);
</span><span class="cx">
</span><span class="lines">@@ -430,10 +423,7 @@
</span><span class="cx">
</span><span class="cx"> updateImage(oldStyle.borderImage().image(), m_style.borderImage().image());
</span><span class="cx"> updateImage(oldStyle.maskBoxImage().image(), m_style.maskBoxImage().image());
</span><del>-
-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> updateShapeImage(oldStyle.shapeOutside(), m_style.shapeOutside());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool doesNotNeedLayout = !parent();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -189,11 +189,7 @@
</span><span class="cx"> bool hasBlendMode() const { return false; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> bool hasShapeOutside() const { return style().shapeOutside(); }
</span><del>-#else
- bool hasShapeOutside() const { return false; }
-#endif
</del><span class="cx">
</span><span class="cx"> void registerForVisibleInViewportCallback();
</span><span class="cx"> void unregisterForVisibleInViewportCallback();
</span><span class="lines">@@ -311,9 +307,7 @@
</span><span class="cx">
</span><span class="cx"> void updateFillImages(const FillLayer*, const FillLayer*);
</span><span class="cx"> void updateImage(StyleImage*, StyleImage*);
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> void updateShapeImage(const ShapeValue*, const ShapeValue*);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensitiveProperties) const;
</span><span class="cx"> const RenderStyle* cachedFirstLineStyle() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -327,12 +327,10 @@
</span><span class="cx">
</span><span class="cx"> for (auto& floatingObject : *flow.floatingObjectSet()) {
</span><span class="cx"> ASSERT(floatingObject);
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> // if a float has a shape, we cannot tell if content will need to be shifted until after we lay it out,
</span><span class="cx"> // since the amount of space is not uniform for the height of the float.
</span><span class="cx"> if (floatingObject->renderer().shapeOutsideInfo())
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasUnsupportedFloat, reasons, includeReasons);
</span><del>-#endif
</del><span class="cx"> float availableWidth = flow.availableLogicalWidthForLine(floatingObject->y(), DoNotIndentText);
</span><span class="cx"> if (availableWidth < minimumWidthNeeded)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasUnsupportedFloat, reasons, includeReasons);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -85,19 +85,16 @@
</span><span class="cx"> {
</span><span class="cx"> if (!newFloatShrinksLine(newFloat, m_block, m_isFirstLine))
</span><span class="cx"> return;
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> ShapeOutsideDeltas shapeDeltas;
</span><span class="cx"> if (ShapeOutsideInfo* shapeOutsideInfo = newFloat.renderer().shapeOutsideInfo()) {
</span><span class="cx"> LayoutUnit lineHeight = m_block.lineHeight(m_isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
</span><span class="cx"> shapeDeltas = shapeOutsideInfo->computeDeltasForContainingBlockLine(m_block, newFloat, m_block.logicalHeight(), lineHeight);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (newFloat.type() == FloatingObject::FloatLeft) {
</span><span class="cx"> float newLeft = m_block.logicalRightForFloat(newFloat);
</span><span class="cx"> if (shouldIndentText() == IndentText && m_block.style().isLeftToRightDirection())
</span><span class="cx"> newLeft += floorToInt(m_block.textIndentOffset());
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (shapeDeltas.isValid()) {
</span><span class="cx"> if (shapeDeltas.lineOverlapsShape())
</span><span class="cx"> newLeft += shapeDeltas.rightMarginBoxDelta();
</span><span class="lines">@@ -104,13 +101,11 @@
</span><span class="cx"> else // If the line doesn't overlap the shape, then we need to act as if this float didn't exist.
</span><span class="cx"> newLeft = m_left;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> m_left = std::max<float>(m_left, newLeft);
</span><span class="cx"> } else {
</span><span class="cx"> float newRight = m_block.logicalLeftForFloat(newFloat);
</span><span class="cx"> if (shouldIndentText() == IndentText && !m_block.style().isLeftToRightDirection())
</span><span class="cx"> newRight -= floorToInt(m_block.textIndentOffset());
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (shapeDeltas.isValid()) {
</span><span class="cx"> if (shapeDeltas.lineOverlapsShape())
</span><span class="cx"> newRight += shapeDeltas.leftMarginBoxDelta();
</span><span class="lines">@@ -117,7 +112,6 @@
</span><span class="cx"> else // If the line doesn't overlap the shape, then we need to act as if this float didn't exist.
</span><span class="cx"> newRight = m_right;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> m_right = std::min<float>(m_right, newRight);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -164,7 +158,6 @@
</span><span class="cx"> m_right = newLineRight;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> void LineWidth::wrapNextToShapeOutside(bool isFirstLine)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit lineHeight = m_block.lineHeight(isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
</span><span class="lines">@@ -187,14 +180,9 @@
</span><span class="cx"> }
</span><span class="cx"> updateLineDimension(newLineTop, newLineWidth, newLineLeft, newLineRight);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void LineWidth::fitBelowFloats(bool isFirstLine)
</span><span class="cx"> {
</span><del>-#if !ENABLE(CSS_SHAPES)
- UNUSED_PARAM(isFirstLine);
-#endif
-
</del><span class="cx"> ASSERT(!m_committedWidth);
</span><span class="cx"> ASSERT(!fitsOnLine());
</span><span class="cx">
</span><span class="lines">@@ -204,11 +192,9 @@
</span><span class="cx"> float newLineLeft = m_left;
</span><span class="cx"> float newLineRight = m_right;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> FloatingObject* lastFloatFromPreviousLine = (m_block.containsFloats() ? m_block.m_floatingObjects->set().last().get() : 0);
</span><span class="cx"> if (lastFloatFromPreviousLine && lastFloatFromPreviousLine->renderer().shapeOutsideInfo())
</span><span class="cx"> return wrapNextToShapeOutside(isFirstLine);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> while (true) {
</span><span class="cx"> floatLogicalBottom = m_block.nextFloatLogicalBottomBelow(lastFloatLogicalBottom);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.h (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.h 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/line/LineWidth.h 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -79,9 +79,7 @@
</span><span class="cx"> void computeAvailableWidthFromLeftAndRight();
</span><span class="cx"> bool fitsOnLineExcludingTrailingCollapsedWhitespace() const;
</span><span class="cx"> void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, float newLineLeft, float newLineRight);
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> void wrapNextToShapeOutside(bool isFirstLine);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RenderBlockFlow& m_block;
</span><span class="cx"> float m_uncommittedWidth { 0 };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
-
</del><span class="cx"> #include "ShapeOutsideInfo.h"
</span><span class="cx">
</span><span class="cx"> #include "BoxShape.h"
</span><span class="lines">@@ -340,5 +338,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -27,11 +27,8 @@
</span><span class="cx"> * SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef ShapeOutsideInfo_h
-#define ShapeOutsideInfo_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
-
</del><span class="cx"> #include "LayoutSize.h"
</span><span class="cx"> #include "Shape.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -144,5 +141,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-#endif
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -541,10 +541,8 @@
</span><span class="cx"> if (rareNonInheritedData->m_regionFragment != other.rareNonInheritedData->m_regionFragment)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData->m_shapeMargin)
</span><span class="cx"> return true;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (rareNonInheritedData->m_deprecatedFlexibleBox != other.rareNonInheritedData->m_deprecatedFlexibleBox)
</span><span class="cx"> return true;
</span><span class="lines">@@ -838,10 +836,8 @@
</span><span class="cx"> || rareInheritedData->m_imageRendering != other.rareInheritedData->m_imageRendering)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (rareNonInheritedData->m_shapeOutside != other.rareNonInheritedData->m_shapeOutside)
</span><span class="cx"> return true;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // FIXME: this should probably be moved to changeRequiresLayerRepaint().
</span><span class="cx"> if (rareNonInheritedData->m_clipPath != other.rareNonInheritedData->m_clipPath) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -1792,7 +1792,6 @@
</span><span class="cx"> SVGLength kerning() const { return svgStyle().kerning(); }
</span><span class="cx"> void setKerning(SVGLength k) { accessSVGStyle().setKerning(k); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> void setShapeOutside(PassRefPtr<ShapeValue> value)
</span><span class="cx"> {
</span><span class="cx"> if (rareNonInheritedData->m_shapeOutside == value)
</span><span class="lines">@@ -1814,7 +1813,6 @@
</span><span class="cx"> SET_VAR(rareNonInheritedData, m_shapeImageThreshold, clampedShapeImageThreshold);
</span><span class="cx"> }
</span><span class="cx"> static float initialShapeImageThreshold() { return 0; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void setClipPath(PassRefPtr<ClipPathOperation> operation)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleShapeValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ShapeValue.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ShapeValue.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/style/ShapeValue.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> #include "ShapeValue.h"
</span><span class="cx">
</span><span class="cx"> #include "CachedImage.h"
</span><span class="lines">@@ -64,5 +63,3 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_SHAPES)
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleShapeValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ShapeValue.h (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ShapeValue.h 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/style/ShapeValue.h 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
-
</del><span class="cx"> #include "BasicShapes.h"
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><span class="cx"> #include "StyleImage.h"
</span><span class="lines">@@ -113,5 +111,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(CSS_SHAPES)
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -64,11 +64,9 @@
</span><span class="cx"> , m_willChange(RenderStyle::initialWillChange())
</span><span class="cx"> , m_mask(FillLayer(MaskFillLayer))
</span><span class="cx"> , m_objectPosition(RenderStyle::initialObjectPosition())
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> , m_shapeOutside(RenderStyle::initialShapeOutside())
</span><span class="cx"> , m_shapeMargin(RenderStyle::initialShapeMargin())
</span><span class="cx"> , m_shapeImageThreshold(RenderStyle::initialShapeImageThreshold())
</span><del>-#endif
</del><span class="cx"> , m_clipPath(RenderStyle::initialClipPath())
</span><span class="cx"> , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
</span><span class="cx"> , m_order(RenderStyle::initialOrder())
</span><span class="lines">@@ -157,11 +155,9 @@
</span><span class="cx"> , m_maskBoxImage(o.m_maskBoxImage)
</span><span class="cx"> , m_pageSize(o.m_pageSize)
</span><span class="cx"> , m_objectPosition(o.m_objectPosition)
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> , m_shapeOutside(o.m_shapeOutside)
</span><span class="cx"> , m_shapeMargin(o.m_shapeMargin)
</span><span class="cx"> , m_shapeImageThreshold(o.m_shapeImageThreshold)
</span><del>-#endif
</del><span class="cx"> , m_clipPath(o.m_clipPath)
</span><span class="cx"> , m_textDecorationColor(o.m_textDecorationColor)
</span><span class="cx"> , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
</span><span class="lines">@@ -268,11 +264,9 @@
</span><span class="cx"> && m_maskBoxImage == o.m_maskBoxImage
</span><span class="cx"> && m_pageSize == o.m_pageSize
</span><span class="cx"> && m_objectPosition == o.m_objectPosition
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> && arePointingToEqualData(m_shapeOutside, o.m_shapeOutside)
</span><span class="cx"> && m_shapeMargin == o.m_shapeMargin
</span><span class="cx"> && m_shapeImageThreshold == o.m_shapeImageThreshold
</span><del>-#endif
</del><span class="cx"> && arePointingToEqualData(m_clipPath, o.m_clipPath)
</span><span class="cx"> && m_textDecorationColor == o.m_textDecorationColor
</span><span class="cx"> && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColor
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -155,11 +155,9 @@
</span><span class="cx"> LengthSize m_pageSize;
</span><span class="cx"> LengthPoint m_objectPosition;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> RefPtr<ShapeValue> m_shapeOutside;
</span><span class="cx"> Length m_shapeMargin;
</span><span class="cx"> float m_shapeImageThreshold;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RefPtr<ClipPathOperation> m_clipPath;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStylePendingResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StylePendingResources.cpp (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StylePendingResources.cpp 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebCore/style/StylePendingResources.cpp 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -87,10 +87,8 @@
</span><span class="cx"> for (auto* maskLayer = style.maskLayers(); maskLayer; maskLayer = maskLayer->next())
</span><span class="cx"> loadPendingImage(document, maskLayer->image(), element);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><span class="cx"> if (style.shapeOutside())
</span><span class="cx"> loadPendingImage(document, style.shapeOutside()->image(), element, LoadPolicy::ShapeOutside);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-18 Dean Jackson <dino@apple.com>
+
+ Remove CSS_SHAPES feature definition. This should always be on.
+ https://bugs.webkit.org/show_bug.cgi?id=163628
+ <rdar://problem/28834613>
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-10-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Leverage new union type support for HTMLSelectElement.add() / HTMLOptionsCollection.add()
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</span><del>-ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</del><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -202,4 +201,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(
ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENA
BLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE
_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(
ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(EN
ABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-18 Dean Jackson <dino@apple.com>
+
+ Remove CSS_SHAPES feature definition. This should always be on.
+ https://bugs.webkit.org/show_bug.cgi?id=163628
+ <rdar://problem/28834613>
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-10-18 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r207413.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</span><del>-ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</del><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -202,4 +201,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(
ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENA
BLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE
_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(
ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(EN
ABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/cmake/OptionsMac.cmake 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES PRIVATE ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PRIVATE OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWin.cmake (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWin.cmake 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/cmake/OptionsWin.cmake 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -17,7 +17,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES PUBLIC ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_ELEMENTS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PUBLIC OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -94,7 +94,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" PRIVATE OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" PRIVATE OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CURSOR_VISIBILITY "Toggle cursor visibility support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_ELEMENTS "Toggle custom elements support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" PRIVATE OFF)
</span></span></pre></div>
<a id="trunkSourcecmaketoolsvspropsFeatureDefinesprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/tools/vsprops/FeatureDefines.props (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -18,7 +18,6 @@
</span><span class="cx"> <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
</span><span class="cx"> <ENABLE_CSS_SELECTORS_LEVEL4>ENABLE_CSS_SELECTORS_LEVEL4</ENABLE_CSS_SELECTORS_LEVEL4>
</span><span class="cx"> <ENABLE_CSS_SHADERS />
</span><del>- <ENABLE_CSS_SHAPES>ENABLE_CSS_SHAPES</ENABLE_CSS_SHAPES>
</del><span class="cx"> <ENABLE_CSS_SHAPE_INSIDE>ENABLE_CSS_SHAPE_INSIDE</ENABLE_CSS_SHAPE_INSIDE>
</span><span class="cx"> <ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED</ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>
</span><span class="cx"> <ENABLE_CURSOR_VISIBILITY>ENABLE_CURSOR_VISIBILITY</ENABLE_CURSOR_VISIBILITY>
</span><span class="lines">@@ -92,7 +91,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_ES6_MODULES);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSC
REEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(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_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_READABLE_STREAM_API);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_
SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_WRITABLE_STREAM_API);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</del><ins>+ <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_ES6_MODULES);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAM
EPAD);$(ENABLE_GEOLOCATION);$(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_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_READABLE_STREAM_API);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VI
DEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_WRITABLE_STREAM_API);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -164,10 +163,6 @@
</span><span class="cx"> <Value>$(ENABLE_CSS_SHADERS)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><del>- <BuildMacro Include="ENABLE_CSS_SHAPES">
- <Value>$(ENABLE_CSS_SHAPES)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
</del><span class="cx"> <BuildMacro Include="ENABLE_CSS_SHAPE_INSIDE">
</span><span class="cx"> <Value>$(ENABLE_CSS_SHAPE_INSIDE)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span></span></pre></div>
<a id="trunkSourcecmaketoolsvspropsFeatureDefinesCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -18,7 +18,6 @@
</span><span class="cx"> <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
</span><span class="cx"> <ENABLE_CSS_SELECTORS_LEVEL4>ENABLE_CSS_SELECTORS_LEVEL4</ENABLE_CSS_SELECTORS_LEVEL4>
</span><span class="cx"> <ENABLE_CSS_SHADERS />
</span><del>- <ENABLE_CSS_SHAPES>ENABLE_CSS_SHAPES</ENABLE_CSS_SHAPES>
</del><span class="cx"> <ENABLE_CSS_SHAPE_INSIDE>ENABLE_CSS_SHAPE_INSIDE</ENABLE_CSS_SHAPE_INSIDE>
</span><span class="cx"> <ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED</ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>
</span><span class="cx"> <ENABLE_CURSOR_VISIBILITY>ENABLE_CURSOR_VISIBILITY</ENABLE_CURSOR_VISIBILITY>
</span><span class="lines">@@ -90,7 +89,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_ES6_MODULES);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSC
REEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(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_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(E
NABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</del><ins>+ <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_ES6_MODULES);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAM
EPAD);$(ENABLE_GEOLOCATION);$(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_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(E
NABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -162,10 +161,6 @@
</span><span class="cx"> <Value>$(ENABLE_CSS_SHADERS)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><del>- <BuildMacro Include="ENABLE_CSS_SHAPES">
- <Value>$(ENABLE_CSS_SHAPES)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
</del><span class="cx"> <BuildMacro Include="ENABLE_CSS_SHAPE_INSIDE">
</span><span class="cx"> <Value>$(ENABLE_CSS_SHAPE_INSIDE)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (207498 => 207499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-10-18 23:18:55 UTC (rev 207498)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-10-18 23:33:22 UTC (rev 207499)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</span><del>-ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</del><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -202,4 +201,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_VARIATION_FONTS = ENABLE_VARIATION_FONTS;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(
ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENA
BLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE
_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(
ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(EN
ABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_
WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT) $(ENABLE_VARIATION_FONTS);
</ins></span></pre>
</div>
</div>
</body>
</html>