<!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>[163333] 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/163333">163333</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 15:35:34 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Feature flag for shape-inside
https://bugs.webkit.org/show_bug.cgi?id=128001
Reviewed by Simon Fraser.
Source/JavaScriptCore:
Add CSS_SHAPE_INSIDE flag.
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
Add CSS_SHAPE_INSIDE flag.
I wrapped everything that is specific to shape-inside in
this flag. It is now possible to build with CSS Shapes enabled
but shape-inside disabled. CSS_SHAPE_INSIDE is dependent on
CSS_SHAPES, so disabling the latter should also disable the former.
* Configurations/FeatureDefines.xcconfig:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseShapeProperty):
* css/CSSPropertyNames.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::loadPendingImages):
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* rendering/LayoutState.cpp:
(WebCore::LayoutState::LayoutState):
* rendering/LayoutState.h:
(WebCore::LayoutState::LayoutState):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::styleDidChange):
(WebCore::RenderBlock::updateShapesBeforeBlockLayout):
(WebCore::RenderBlock::updateShapesAfterBlockLayout):
* rendering/RenderBlock.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutBlockChild):
(WebCore::RenderBlockFlow::computeLogicalLocationForFloat):
* rendering/RenderBlockFlow.h:
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForLine):
(WebCore::constructBidiRunsForLine):
(WebCore::RenderBlockFlow::layoutRunsAndFloatsInRange):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::~RenderElement):
(WebCore::RenderElement::initializeStyle):
(WebCore::RenderElement::setStyle):
* rendering/RenderNamedFlowFragment.cpp:
(WebCore::RenderNamedFlowFragment::createStyle):
* rendering/RenderView.h:
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor):
* rendering/line/BreakingContextInlineHeaders.h:
(WebCore::BreakingContext::handleText):
(WebCore::BreakingContext::handleEndOfLine):
* rendering/line/LineBreaker.cpp:
(WebCore::LineBreaker::nextLineBreak):
* rendering/line/LineWidth.cpp:
(WebCore::LineWidth::LineWidth):
(WebCore::LineWidth::updateAvailableWidth):
(WebCore::LineWidth::fitBelowFloats):
* rendering/line/LineWidth.h:
* rendering/shapes/ShapeInsideInfo.cpp:
* rendering/shapes/ShapeInsideInfo.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
Source/WebKit/mac:
Add CSS_SHAPE_INSIDE flag.
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
Add CSS_SHAPE_INSIDE flag.
* Configurations/FeatureDefines.xcconfig:
Tools:
Add CSS_SHAPE_INSIDE flag, and -css-shape-inside build
flag.
* Scripts/webkitperl/FeatureList.pm:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStatecpp">trunk/Source/WebCore/rendering/LayoutState.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStateh">trunk/Source/WebCore/rendering/LayoutState.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh">trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineBreakercpp">trunk/Source/WebCore/rendering/line/LineBreaker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthcpp">trunk/Source/WebCore/rendering/line/LineWidth.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthh">trunk/Source/WebCore/rendering/line/LineWidth.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-03 Dean Jackson <dino@apple.com>
+
+ Feature flag for shape-inside
+ https://bugs.webkit.org/show_bug.cgi?id=128001
+
+ Reviewed by Simon Fraser.
+
+ Add CSS_SHAPE_INSIDE flag.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-02-03 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Deconstructed parameters aren't being placed in the correct scope
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><ins>+ENABLE_CSS_SHAPE_INSIDE = ENABLE_CSS_SHAPE_INSIDE;
</ins><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="lines">@@ -195,4 +196,4 @@
</span><span class="cx"> ENABLE_FTL_JIT = ;
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -1,3 +1,77 @@
</span><ins>+2014-02-03 Dean Jackson <dino@apple.com>
+
+ Feature flag for shape-inside
+ https://bugs.webkit.org/show_bug.cgi?id=128001
+
+ Reviewed by Simon Fraser.
+
+ Add CSS_SHAPE_INSIDE flag.
+
+ I wrapped everything that is specific to shape-inside in
+ this flag. It is now possible to build with CSS Shapes enabled
+ but shape-inside disabled. CSS_SHAPE_INSIDE is dependent on
+ CSS_SHAPES, so disabling the latter should also disable the former.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseShapeProperty):
+ * css/CSSPropertyNames.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ (WebCore::StyleResolver::loadPendingImages):
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * rendering/LayoutState.cpp:
+ (WebCore::LayoutState::LayoutState):
+ * rendering/LayoutState.h:
+ (WebCore::LayoutState::LayoutState):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::styleDidChange):
+ (WebCore::RenderBlock::updateShapesBeforeBlockLayout):
+ (WebCore::RenderBlock::updateShapesAfterBlockLayout):
+ * rendering/RenderBlock.h:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::layoutBlockChild):
+ (WebCore::RenderBlockFlow::computeLogicalLocationForFloat):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::computeInlineDirectionPositionsForLine):
+ (WebCore::constructBidiRunsForLine):
+ (WebCore::RenderBlockFlow::layoutRunsAndFloatsInRange):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::~RenderElement):
+ (WebCore::RenderElement::initializeStyle):
+ (WebCore::RenderElement::setStyle):
+ * rendering/RenderNamedFlowFragment.cpp:
+ (WebCore::RenderNamedFlowFragment::createStyle):
+ * rendering/RenderView.h:
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseFor):
+ * rendering/line/BreakingContextInlineHeaders.h:
+ (WebCore::BreakingContext::handleText):
+ (WebCore::BreakingContext::handleEndOfLine):
+ * rendering/line/LineBreaker.cpp:
+ (WebCore::LineBreaker::nextLineBreak):
+ * rendering/line/LineWidth.cpp:
+ (WebCore::LineWidth::LineWidth):
+ (WebCore::LineWidth::updateAvailableWidth):
+ (WebCore::LineWidth::fitBelowFloats):
+ * rendering/line/LineWidth.h:
+ * rendering/shapes/ShapeInsideInfo.cpp:
+ * rendering/shapes/ShapeInsideInfo.h:
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class="cx"> 2014-02-03 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r163018): Can’t scroll in <select> lists
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><ins>+ENABLE_CSS_SHAPE_INSIDE = ENABLE_CSS_SHAPE_INSIDE;
</ins><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="lines">@@ -195,4 +196,4 @@
</span><span class="cx"> ENABLE_FTL_JIT = ;
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -338,8 +338,10 @@
</span><span class="cx"> // we should move it outside the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
</span><span class="cx"> CSSPropertyWebkitCompositionFillColor,
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ CSSPropertyWebkitShapeInside,
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- CSSPropertyWebkitShapeInside,
</del><span class="cx"> CSSPropertyWebkitShapeOutside,
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="lines">@@ -383,9 +385,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> CSSPropertyWebkitShapeMargin,
</span><ins>+ CSSPropertyWebkitShapeImageThreshold,
+#if ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> CSSPropertyWebkitShapePadding,
</span><del>- CSSPropertyWebkitShapeImageThreshold,
</del><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> CSSPropertyBufferedRendering,
</span><span class="cx"> CSSPropertyClipPath,
</span><span class="lines">@@ -2801,12 +2805,14 @@
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><span class="cx"> return cssValuePool().createValue(style->shapeMargin());
</span><ins>+ case CSSPropertyWebkitShapeImageThreshold:
+ return cssValuePool().createValue(style->shapeImageThreshold(), CSSPrimitiveValue::CSS_NUMBER);
+#if ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> case CSSPropertyWebkitShapePadding:
</span><span class="cx"> return cssValuePool().createValue(style->shapePadding());
</span><del>- case CSSPropertyWebkitShapeImageThreshold:
- return cssValuePool().createValue(style->shapeImageThreshold(), CSSPrimitiveValue::CSS_NUMBER);
</del><span class="cx"> case CSSPropertyWebkitShapeInside:
</span><span class="cx"> return shapePropertyValue(style.get(), style->shapeInside());
</span><ins>+#endif
</ins><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> return shapePropertyValue(style.get(), style->shapeOutside());
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -555,9 +555,11 @@
</span><span class="cx"> case CSSPropertyWebkitPaddingStart:
</span><span class="cx"> acceptsNegativeNumbers = false;
</span><span class="cx"> return true;
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ case CSSPropertyWebkitShapePadding:
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><del>- case CSSPropertyWebkitShapePadding:
</del><span class="cx"> acceptsNegativeNumbers = false;
</span><span class="cx"> return RuntimeEnabledFeatures::sharedFeatures().cssShapesEnabled();
</span><span class="cx"> #endif
</span><span class="lines">@@ -2895,13 +2897,17 @@
</span><span class="cx"> case CSSPropertyWebkitClipPath:
</span><span class="cx"> parsedValue = parseClipPath();
</span><span class="cx"> break;
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ case CSSPropertyWebkitShapeInside:
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- case CSSPropertyWebkitShapeInside:
</del><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> parsedValue = parseShapeProperty(propId);
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><ins>+#if ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> case CSSPropertyWebkitShapePadding:
</span><ins>+#endif
</ins><span class="cx"> validPrimitive = (RuntimeEnabledFeatures::sharedFeatures().cssShapesEnabled() && !id && validUnit(value, FLength | FNonNeg));
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyWebkitShapeImageThreshold:
</span><span class="lines">@@ -5877,7 +5883,11 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> shapeValue;
</span><span class="cx">
</span><span class="cx"> if (valueId == CSSValueNone
</span><del>- || (valueId == CSSValueOutsideShape && propId == CSSPropertyWebkitShapeInside)) {
</del><ins>+#if ENABLE(CSS_SHAPE_INSIDE)
+ || (valueId == CSSValueOutsideShape
+ && propId == CSSPropertyWebkitShapeInside)
+#endif
+ ) {
</ins><span class="cx"> keywordValue = parseValidPrimitive(valueId, value);
</span><span class="cx"> m_valueList->next();
</span><span class="cx"> return keywordValue.release();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -429,11 +429,13 @@
</span><span class="cx"> -webkit-region-break-before
</span><span class="cx"> -webkit-region-break-inside
</span><span class="cx"> #endif
</span><ins>+#if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES && defined(ENABLE_CSS_SHAPE_INSIDE) && ENABLE_CSS_SHAPE_INSIDE
+-webkit-shape-inside
+-webkit-shape-padding
+#endif
</ins><span class="cx"> #if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES
</span><del>--webkit-shape-inside
</del><span class="cx"> -webkit-shape-outside
</span><span class="cx"> -webkit-shape-margin
</span><del>--webkit-shape-padding
</del><span class="cx"> -webkit-shape-image-threshold
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -2601,11 +2601,13 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitWrapFlow, ApplyPropertyDefault<WrapFlow, &RenderStyle::wrapFlow, WrapFlow, &RenderStyle::setWrapFlow, WrapFlow, &RenderStyle::initialWrapFlow>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler());
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ setPropertyHandler(CSSPropertyWebkitShapeInside, ApplyPropertyShape<&RenderStyle::shapeInside, &RenderStyle::setShapeInside, &RenderStyle::initialShapeInside>::createHandler());
+ setPropertyHandler(CSSPropertyWebkitShapePadding, ApplyPropertyLength<&RenderStyle::shapePadding, &RenderStyle::setShapePadding, &RenderStyle::initialShapePadding>::createHandler());
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitShapePadding, ApplyPropertyLength<&RenderStyle::shapePadding, &RenderStyle::setShapePadding, &RenderStyle::initialShapePadding>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyDefault<float, &RenderStyle::shapeImageThreshold, float, &RenderStyle::setShapeImageThreshold, float, &RenderStyle::initialShapeImageThreshold>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitShapeInside, ApplyPropertyShape<&RenderStyle::shapeInside, &RenderStyle::setShapeInside, &RenderStyle::initialShapeInside>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyShape<&RenderStyle::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOutside>::createHandler());
</span><span class="cx"> #endif
</span><span class="cx"> setPropertyHandler(CSSPropertyWhiteSpace, ApplyPropertyDefault<EWhiteSpace, &RenderStyle::whiteSpace, EWhiteSpace, &RenderStyle::setWhiteSpace, EWhiteSpace, &RenderStyle::initialWhiteSpace>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -3027,11 +3027,13 @@
</span><span class="cx"> case CSSPropertyWebkitUserModify:
</span><span class="cx"> case CSSPropertyWebkitUserSelect:
</span><span class="cx"> case CSSPropertyWebkitClipPath:
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ case CSSPropertyWebkitShapeInside:
+ case CSSPropertyWebkitShapePadding:
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><del>- case CSSPropertyWebkitShapePadding:
</del><span class="cx"> case CSSPropertyWebkitShapeImageThreshold:
</span><del>- case CSSPropertyWebkitShapeInside:
</del><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_EXCLUSIONS)
</span><span class="lines">@@ -3628,10 +3630,12 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> case CSSPropertyWebkitShapeInside:
</span><span class="cx"> loadPendingShapeImage(m_state.style()->shapeInside());
</span><span class="cx"> break;
</span><ins>+#endif
+#if ENABLE(CSS_SHAPES)
</ins><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> loadPendingShapeImage(m_state.style()->shapeOutside());
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -1231,8 +1231,10 @@
</span><span class="cx">
</span><span class="cx"> new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath),
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ new PropertyWrapperShape(CSSPropertyWebkitShapeInside, &RenderStyle::shapeInside, &RenderStyle::setShapeInside),
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- new PropertyWrapperShape(CSSPropertyWebkitShapeInside, &RenderStyle::shapeInside, &RenderStyle::setShapeInside),
</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></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/LayoutState.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> : m_columnInfo(columnInfo)
</span><span class="cx"> , m_lineGrid(0)
</span><span class="cx"> , m_next(std::move(next))
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> , m_shapeInsideInfo(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> if (!m_columnInfo)
</span><span class="cx"> m_columnInfo = m_next->m_columnInfo;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> if (renderer->isRenderBlock()) {
</span><span class="cx"> const RenderBlock* renderBlock = toRenderBlock(renderer);
</span><span class="cx"> m_shapeInsideInfo = renderBlock->shapeInsideInfo();
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_columnInfo(0)
</span><span class="cx"> , m_lineGrid(0)
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> , m_shapeInsideInfo(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> , m_pageLogicalHeight(0)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.h (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.h 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/LayoutState.h 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_columnInfo(nullptr)
</span><span class="cx"> , m_lineGrid(nullptr)
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> , m_shapeInsideInfo(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> , m_pageLogicalHeight(0)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> bool needsBlockDirectionLocationSetBeforeLayout() const { return m_lineGrid || (m_isPaginated && m_pageLogicalHeight); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> ShapeInsideInfo* shapeInsideInfo() const { return m_shapeInsideInfo; }
</span><span class="cx"> #endif
</span><span class="cx"> private:
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> // The current line grid that we're snapping to and the offset of the start of the grid.
</span><span class="cx"> RenderBlockFlow* m_lineGrid;
</span><span class="cx"> std::unique_ptr<LayoutState> m_next;
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> ShapeInsideInfo* m_shapeInsideInfo;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -69,8 +69,10 @@
</span><span class="cx"> #include <wtf/StackStats.h>
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+#include "ShapeInsideInfo.h"
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>-#include "ShapeInsideInfo.h"
</del><span class="cx"> #include "ShapeOutsideInfo.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -118,7 +120,7 @@
</span><span class="cx"> LayoutUnit m_paginationStrut;
</span><span class="cx"> LayoutUnit m_pageLogicalOffset;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> std::unique_ptr<ShapeInsideInfo> m_shapeInsideInfo;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="lines">@@ -311,7 +313,7 @@
</span><span class="cx">
</span><span class="cx"> RenderStyle& newStyle = style();
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> updateShapeInsideInfoAfterStyleChange(newStyle.resolvedShapeInside(), oldStyle ? oldStyle->resolvedShapeInside() : 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1338,6 +1340,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><ins>+void RenderBlock::imageChanged(WrappedImagePtr image, const IntRect*)
+{
+ RenderBox::imageChanged(image);
+
+ if (!parent() || !everHadLayout())
+ return;
+
+#if ENABLE(CSS_SHAPE_INSIDE)
+ ShapeValue* shapeValue = style().shapeInside();
+ if (shapeValue && shapeValue->image() && shapeValue->image()->data() == image) {
+ ShapeInsideInfo& shapeInsideInfo = ensureShapeInsideInfo();
+ shapeInsideInfo.dirtyShapeSize();
+ markShapeInsideDescendantsForLayout();
+ }
+#endif
+
+ ShapeValue* shapeOutsideValue = style().shapeOutside();
+ if (isFloating() && shapeOutsideValue && shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image)
+ parent()->setNeedsLayoutAndPrefWidthsRecalc();
+}
+#endif
+
+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> void RenderBlock::relayoutShapeDescendantIfMoved(RenderBlock* child, LayoutSize offset)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit left = isHorizontalWritingMode() ? offset.width() : offset.height();
</span><span class="lines">@@ -1382,25 +1407,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBlock::imageChanged(WrappedImagePtr image, const IntRect*)
-{
- RenderBox::imageChanged(image);
-
- if (!parent() || !everHadLayout())
- return;
-
- ShapeValue* shapeValue = style().shapeInside();
- if (shapeValue && shapeValue->image() && shapeValue->image()->data() == image) {
- ShapeInsideInfo& shapeInsideInfo = ensureShapeInsideInfo();
- shapeInsideInfo.dirtyShapeSize();
- markShapeInsideDescendantsForLayout();
- }
-
- ShapeValue* shapeOutsideValue = style().shapeOutside();
- if (isFloating() && shapeOutsideValue && shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image)
- parent()->setNeedsLayoutAndPrefWidthsRecalc();
-}
-
</del><span class="cx"> void RenderBlock::updateShapeInsideInfoAfterStyleChange(const ShapeValue* shapeInside, const ShapeValue* oldShapeInside)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: A future optimization would do a deep comparison for equality.
</span><span class="lines">@@ -1499,7 +1505,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderBlock::updateShapesBeforeBlockLayout()
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> if (!flowThreadContainingBlock() && !shapeInsideInfo())
</span><span class="cx"> return shapeInfoRequiresRelayout(this);
</span><span class="cx">
</span><span class="lines">@@ -1524,7 +1530,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlock::updateShapesAfterBlockLayout(bool heightChanged)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> // A previous sibling has changed dimension, so we need to relayout the shape with the content
</span><span class="cx"> ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo();
</span><span class="cx"> if (heightChanged && shapeInsideInfo)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class LogicalSelectionOffsetCaches;
</span><span class="cx"> class RenderInline;
</span><span class="cx"> class RenderText;
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> class ShapeInsideInfo;
</span><span class="cx"> class ShapeValue;
</span><span class="cx"> #endif
</span><span class="lines">@@ -349,7 +349,12 @@
</span><span class="cx"> virtual void showLineTreeAndMark(const InlineBox* = nullptr, const char* = nullptr, const InlineBox* = nullptr, const char* = nullptr, const RenderObject* = nullptr) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><ins>+ virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
+#endif
+
+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> ShapeInsideInfo& ensureShapeInsideInfo();
</span><span class="cx"> ShapeInsideInfo* shapeInsideInfo() const;
</span><span class="cx"> void setShapeInsideInfo(std::unique_ptr<ShapeInsideInfo>);
</span><span class="lines">@@ -358,7 +363,6 @@
</span><span class="cx"> ShapeInsideInfo* layoutShapeInsideInfo() const;
</span><span class="cx"> bool allowsShapeInsideInfoSharing() const { return !isInline() && !isFloating(); }
</span><span class="cx"> LayoutSize logicalOffsetFromShapeAncestorContainer(const RenderBlock* container) const;
</span><del>- virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;
</span><span class="lines">@@ -457,7 +461,7 @@
</span><span class="cx"> LayoutUnit adjustLogicalRightOffsetForLine(LayoutUnit offsetFromFloats, bool applyTextIndent) const;
</span><span class="cx"> LayoutUnit adjustLogicalLeftOffsetForLine(LayoutUnit offsetFromFloats, bool applyTextIndent) const;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> void computeShapeSize();
</span><span class="cx"> void updateShapeInsideInfoAfterStyleChange(const ShapeValue*, const ShapeValue* oldShape);
</span><span class="cx"> void relayoutShapeDescendantIfMoved(RenderBlock* child, LayoutSize offset);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include "VerticalPositionCache.h"
</span><span class="cx"> #include "VisiblePosition.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> #include "ShapeInsideInfo.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -689,7 +689,7 @@
</span><span class="cx"> determineLogicalLeftPositionForChild(child, ApplyLayoutDelta);
</span><span class="cx">
</span><span class="cx"> LayoutSize childOffset = child.location() - oldRect.location();
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> relayoutShapeDescendantIfMoved(child.isRenderBlock() ? toRenderBlock(&child) : nullptr, childOffset);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2165,7 +2165,7 @@
</span><span class="cx"> RenderBox& childBox = floatingObject->renderer();
</span><span class="cx"> LayoutUnit logicalLeftOffset = logicalLeftOffsetForContent(logicalTopOffset); // Constant part of left offset.
</span><span class="cx"> LayoutUnit logicalRightOffset; // Constant part of right offset.
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> // FIXME Bug 102948: This only works for shape outside directly set on this block.
</span><span class="cx"> ShapeInsideInfo* shapeInsideInfo = this->layoutShapeInsideInfo();
</span><span class="cx"> // FIXME: Implement behavior for right floats.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> void layoutRunsAndFloats(LineLayoutState&, bool hasInlineChild);
</span><span class="cx"> const InlineIterator& restartLayoutRunsAndFloatsInRange(LayoutUnit oldLogicalHeight, LayoutUnit newLogicalHeight, FloatingObject* lastFloatFromPreviousLine, InlineBidiResolver&, const InlineIterator&);
</span><span class="cx"> void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&, const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiStatus, unsigned consecutiveHyphenatedLines);
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> void updateShapeAndSegmentsForCurrentLine(ShapeInsideInfo*&, const LayoutSize&, LineLayoutState&);
</span><span class="cx"> void updateShapeAndSegmentsForCurrentLineInFlowThread(ShapeInsideInfo*&, LineLayoutState&);
</span><span class="cx"> bool adjustLogicalLineTopAndLogicalHeightIfNeeded(ShapeInsideInfo*, LayoutUnit, LineLayoutState&, InlineBidiResolver&, FloatingObject*, InlineIterator&, WordMeasurements&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx"> float availableLogicalWidth;
</span><span class="cx"> updateLogicalInlinePositions(*this, lineLogicalLeft, lineLogicalRight, availableLogicalWidth, isFirstLine, shouldIndentText, 0);
</span><span class="cx"> bool needsWordSpacing;
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo();
</span><span class="cx"> if (shapeInsideInfo && shapeInsideInfo->hasSegments()) {
</span><span class="cx"> BidiRun* segmentStart = firstRun;
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx">
</span><span class="cx"> static inline void constructBidiRunsForLine(const RenderBlockFlow* block, InlineBidiResolver& topResolver, BidiRunList<BidiRun>& bidiRuns, const InlineIterator& endOfLine, VisualDirectionOverride override, bool previousLineBrokeCleanly)
</span><span class="cx"> {
</span><del>-#if !ENABLE(CSS_SHAPES)
</del><ins>+#if !ENABLE(CSS_SHAPES) || !ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> UNUSED_PARAM(block);
</span><span class="cx"> constructBidiRunsForSegment(topResolver, bidiRuns, endOfLine, override, previousLineBrokeCleanly);
</span><span class="cx"> #else
</span><span class="lines">@@ -1128,7 +1128,7 @@
</span><span class="cx"> return oldEnd;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> static inline void pushShapeContentOverflowBelowTheContentBox(RenderBlockFlow* block, ShapeInsideInfo* shapeInsideInfo, LayoutUnit lineTop, LayoutUnit lineHeight)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(shapeInsideInfo);
</span><span class="lines">@@ -1304,7 +1304,7 @@
</span><span class="cx">
</span><span class="cx"> LineBreaker lineBreaker(*this);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> LayoutSize logicalOffsetFromShapeContainer;
</span><span class="cx"> ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo();
</span><span class="cx"> if (shapeInsideInfo) {
</span><span class="lines">@@ -1343,7 +1343,7 @@
</span><span class="cx"> bool isNewUBAParagraph = layoutState.lineInfo().previousLineBrokeCleanly();
</span><span class="cx"> FloatingObject* lastFloatFromPreviousLine = (containsFloats()) ? m_floatingObjects->set().last().get() : 0;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> updateShapeAndSegmentsForCurrentLine(shapeInsideInfo, logicalOffsetFromShapeContainer, layoutState);
</span><span class="cx"> #endif
</span><span class="cx"> WordMeasurements wordMeasurements;
</span><span class="lines">@@ -1359,7 +1359,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> if (adjustLogicalLineTopAndLogicalHeightIfNeeded(shapeInsideInfo, logicalOffsetFromShapeContainer.height(), layoutState, resolver, lastFloatFromPreviousLine, end, wordMeasurements))
</span><span class="cx"> continue;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -105,11 +105,13 @@
</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><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> if (auto shapeValue = m_style->shapeInside()) {
</span><span class="cx"> if (auto shapeImage = shapeValue->image())
</span><span class="cx"> shapeImage->removeClient(this);
</span><span class="cx"> }
</span><ins>+#endif
+#if ENABLE(CSS_SHAPES)
</ins><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="lines">@@ -350,8 +352,10 @@
</span><span class="cx"> updateImage(nullptr, m_style->borderImage().image());
</span><span class="cx"> updateImage(nullptr, m_style->maskBoxImage().image());
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ updateShapeImage(nullptr, m_style->shapeInside());
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- updateShapeImage(nullptr, m_style->shapeInside());
</del><span class="cx"> updateShapeImage(nullptr, m_style->shapeOutside());
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -404,8 +408,10 @@
</span><span class="cx"> updateImage(oldStyle.get().borderImage().image(), m_style->borderImage().image());
</span><span class="cx"> updateImage(oldStyle.get().maskBoxImage().image(), m_style->maskBoxImage().image());
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ updateShapeImage(oldStyle.get().shapeInside(), m_style->shapeInside());
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- updateShapeImage(oldStyle.get().shapeInside(), m_style->shapeInside());
</del><span class="cx"> updateShapeImage(oldStyle.get().shapeOutside(), m_style->shapeOutside());
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> style.get().setRegionFragment(parentStyle.regionFragment());
</span><span class="cx"> style.get().setOverflowX(parentStyle.overflowX());
</span><span class="cx"> style.get().setOverflowY(parentStyle.overflowY());
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> style.get().setShapeInside(parentStyle.shapeInside());
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> // We push LayoutState even if layoutState is disabled because it stores layoutDelta too.
</span><span class="cx"> if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer.hasColumns() || renderer.flowThreadContainingBlock()
</span><span class="cx"> || m_layoutState->lineGrid() || (renderer.style().lineGrid() != RenderStyle::initialLineGrid() && renderer.isRenderBlockFlow())
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> || (renderer.isRenderBlock() && toRenderBlock(renderer).shapeInsideInfo())
</span><span class="cx"> || (m_layoutState->shapeInsideInfo() && renderer.isRenderBlock() && !toRenderBlock(renderer).allowsShapeInsideInfoSharing())
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> // These tests only works during layout. Outside layout this function may give false positives.
</span><span class="cx"> if (flow.view().layoutState()) {
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> if (flow.view().layoutState()->shapeInsideInfo())
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (style.textShadow())
</span><span class="cx"> return false;
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> if (style.resolvedShapeInside())
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include "RenderSVGInlineText.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> #include "ShapeInsideInfo.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> inline void updateSegmentsForShapes(RenderBlockFlow& block, const FloatingObject* lastFloatFromPreviousLine, const WordMeasurements& wordMeasurements, LineWidth& width, bool isFirstLine)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(lastFloatFromPreviousLine);
</span><span class="lines">@@ -785,7 +785,7 @@
</span><span class="cx"> m_appliedStartWidth = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> if (m_lastFloatFromPreviousLine)
</span><span class="cx"> updateSegmentsForShapes(m_block, m_lastFloatFromPreviousLine, wordMeasurements, m_width, m_lineInfo.isFirstLine());
</span><span class="cx"> #endif
</span><span class="lines">@@ -1086,7 +1086,7 @@
</span><span class="cx">
</span><span class="cx"> inline InlineIterator BreakingContext::handleEndOfLine()
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> ShapeInsideInfo* shapeInfo = m_block.layoutShapeInsideInfo();
</span><span class="cx"> bool segmentAllowsOverflow = !shapeInfo || !shapeInfo->hasSegments();
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineBreakercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineBreaker.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineBreaker.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/line/LineBreaker.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo& lineInfo, RenderTextInfo& renderTextInfo, FloatingObject* lastFloatFromPreviousLine, unsigned consecutiveHyphenatedLines, WordMeasurements& wordMeasurements)
</span><span class="cx"> {
</span><del>-#if !ENABLE(CSS_SHAPES)
</del><ins>+#if !ENABLE(CSS_SHAPES) || !ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> return nextSegmentBreak(resolver, lineInfo, renderTextInfo, lastFloatFromPreviousLine, consecutiveHyphenatedLines, wordMeasurements);
</span><span class="cx"> #else
</span><span class="cx"> ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "RenderRubyRun.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> #include "ShapeInsideInfo.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -49,13 +49,13 @@
</span><span class="cx"> , m_left(0)
</span><span class="cx"> , m_right(0)
</span><span class="cx"> , m_availableWidth(0)
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> , m_segment(0)
</span><span class="cx"> #endif
</span><span class="cx"> , m_isFirstLine(isFirstLine)
</span><span class="cx"> , m_shouldIndentText(shouldIndentText)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> updateCurrentShapeSegment();
</span><span class="cx"> #endif
</span><span class="cx"> updateAvailableWidth();
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> m_left = m_block.logicalLeftOffsetForLine(height, shouldIndentText(), logicalHeight);
</span><span class="cx"> m_right = m_block.logicalRightOffsetForLine(height, shouldIndentText(), logicalHeight);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> if (m_segment) {
</span><span class="cx"> m_left = std::max<float>(m_segment->logicalLeft, m_left);
</span><span class="cx"> m_right = std::min<float>(m_segment->logicalRight, m_right);
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> newLineWidth = std::max(0.0f, newLineRight - newLineLeft);
</span><span class="cx"> lastFloatLogicalBottom = floatLogicalBottom;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> // FIXME: This code should be refactored to incorporate with the code above.
</span><span class="cx"> ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo();
</span><span class="cx"> if (shapeInsideInfo) {
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> m_trailingWhitespaceWidth = collapsedWhitespace + borderPaddingMargin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> void LineWidth::updateCurrentShapeSegment()
</span><span class="cx"> {
</span><span class="cx"> if (ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.h (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.h 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/line/LineWidth.h 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> void fitBelowFloats();
</span><span class="cx"> void setTrailingWhitespaceWidth(float collapsedWhitespace, float borderPaddingMargin = 0);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> void updateCurrentShapeSegment();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> float m_left;
</span><span class="cx"> float m_right;
</span><span class="cx"> float m_availableWidth;
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> const LineSegment* m_segment;
</span><span class="cx"> #endif
</span><span class="cx"> bool m_isFirstLine;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ShapeInsideInfo.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx">
</span><span class="cx"> #include "InlineIterator.h"
</span><span class="cx"> #include "RenderBlock.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #ifndef ShapeInsideInfo_h
</span><span class="cx"> #define ShapeInsideInfo_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx">
</span><span class="cx"> #include "ShapeInfo.h"
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData->m_shapeInside)
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -1492,7 +1492,7 @@
</span><span class="cx"> void setKerning(SVGLength k) { accessSVGStyle().setKerning(k); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
</del><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</ins><span class="cx"> void setShapeInside(PassRefPtr<ShapeValue> value)
</span><span class="cx"> {
</span><span class="cx"> if (rareNonInheritedData->m_shapeInside == value)
</span><span class="lines">@@ -1508,6 +1508,9 @@
</span><span class="cx"> return shapeInside;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static ShapeValue* initialShapeInside() { return 0; }
+#endif
+#if ENABLE(CSS_SHAPES)
</ins><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">@@ -1516,7 +1519,6 @@
</span><span class="cx"> }
</span><span class="cx"> ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutside.get(); }
</span><span class="cx">
</span><del>- static ShapeValue* initialShapeInside() { return 0; }
</del><span class="cx"> static ShapeValue* initialShapeOutside() { return 0; }
</span><span class="cx">
</span><span class="cx"> const Length& shapePadding() const { return rareNonInheritedData->m_shapePadding; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -53,8 +53,10 @@
</span><span class="cx"> , m_gridItem(StyleGridItemData::create())
</span><span class="cx"> , m_mask(FillLayer(MaskFillLayer))
</span><span class="cx"> , m_pageSize()
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ , m_shapeInside(RenderStyle::initialShapeInside())
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- , m_shapeInside(RenderStyle::initialShapeInside())
</del><span class="cx"> , m_shapeOutside(RenderStyle::initialShapeOutside())
</span><span class="cx"> , m_shapeMargin(RenderStyle::initialShapeMargin())
</span><span class="cx"> , m_shapePadding(RenderStyle::initialShapePadding())
</span><span class="lines">@@ -124,8 +126,10 @@
</span><span class="cx"> , m_mask(o.m_mask)
</span><span class="cx"> , m_maskBoxImage(o.m_maskBoxImage)
</span><span class="cx"> , m_pageSize(o.m_pageSize)
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ , m_shapeInside(o.m_shapeInside)
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- , m_shapeInside(o.m_shapeInside)
</del><span class="cx"> , m_shapeOutside(o.m_shapeOutside)
</span><span class="cx"> , m_shapeMargin(o.m_shapeMargin)
</span><span class="cx"> , m_shapePadding(o.m_shapePadding)
</span><span class="lines">@@ -213,8 +217,10 @@
</span><span class="cx"> && m_mask == o.m_mask
</span><span class="cx"> && m_maskBoxImage == o.m_maskBoxImage
</span><span class="cx"> && m_pageSize == o.m_pageSize
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ && m_shapeInside == o.m_shapeInside
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- && m_shapeInside == o.m_shapeInside
</del><span class="cx"> && m_shapeOutside == o.m_shapeOutside
</span><span class="cx"> && m_shapeMargin == o.m_shapeMargin
</span><span class="cx"> && m_shapePadding == o.m_shapePadding
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -136,8 +136,10 @@
</span><span class="cx">
</span><span class="cx"> LengthSize m_pageSize;
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
+ RefPtr<ShapeValue> m_shapeInside;
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- RefPtr<ShapeValue> m_shapeInside;
</del><span class="cx"> RefPtr<ShapeValue> m_shapeOutside;
</span><span class="cx"> Length m_shapeMargin;
</span><span class="cx"> Length m_shapePadding;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-03 Dean Jackson <dino@apple.com>
+
+ Feature flag for shape-inside
+ https://bugs.webkit.org/show_bug.cgi?id=128001
+
+ Reviewed by Simon Fraser.
+
+ Add CSS_SHAPE_INSIDE flag.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-01-31 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove inline member functions of FrameSelection that access m_selection
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><ins>+ENABLE_CSS_SHAPE_INSIDE = ENABLE_CSS_SHAPE_INSIDE;
</ins><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="lines">@@ -195,4 +196,4 @@
</span><span class="cx"> ENABLE_FTL_JIT = ;
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-03 Dean Jackson <dino@apple.com>
+
+ Feature flag for shape-inside
+ https://bugs.webkit.org/show_bug.cgi?id=128001
+
+ Reviewed by Simon Fraser.
+
+ Add CSS_SHAPE_INSIDE flag.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-02-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> NavigationState should be a PageLoadState::Observer
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><ins>+ENABLE_CSS_SHAPE_INSIDE = ENABLE_CSS_SHAPE_INSIDE;
</ins><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="lines">@@ -195,4 +196,4 @@
</span><span class="cx"> ENABLE_FTL_JIT = ;
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Tools/ChangeLog 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-03 Dean Jackson <dino@apple.com>
+
+ Feature flag for shape-inside
+ https://bugs.webkit.org/show_bug.cgi?id=128001
+
+ Reviewed by Simon Fraser.
+
+ Add CSS_SHAPE_INSIDE flag, and -css-shape-inside build
+ flag.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
</ins><span class="cx"> 2014-02-03 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Reorder my e-mail addresses in contributors.json,
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (163332 => 163333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-02-03 23:33:20 UTC (rev 163332)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-02-03 23:35:34 UTC (rev 163333)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> $cssRegionsSupport,
</span><span class="cx"> $cssShadersSupport,
</span><span class="cx"> $cssShapesSupport,
</span><ins>+ $cssShapeInsideSupport,
</ins><span class="cx"> $cssStickyPositionSupport,
</span><span class="cx"> $cssCompositingSupport,
</span><span class="cx"> $cssAnimationsTransformsUnprefixedSupport,
</span><span class="lines">@@ -191,6 +192,9 @@
</span><span class="cx"> { option => "css-shapes", desc => "Toggle CSS Shapes support",
</span><span class="cx"> define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
</span><span class="cx">
</span><ins>+ { option => "css-shape-inside", desc => "Toggle CSS Shapes shape-inside support",
+ define => "ENABLE_CSS_SHAPE_INSIDE", default => 1, value => \$cssShapeInsideSupport },
+
</ins><span class="cx"> { option => "css-filters", desc => "Toggle CSS Filters support",
</span><span class="cx"> define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isIOSWebKit()), value => \$cssFiltersSupport },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>