<!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>[199151] 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/199151">199151</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-04-07 03:11:39 -0700 (Thu, 07 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>
Source/WebCore:
Shadow DOM: Implement display: contents for slots
https://bugs.webkit.org/show_bug.cgi?id=149439
<rdar://problem/22731922>
Reviewed by Ryosuke Niwa.
This patch adds support for value 'contents' of the 'display' property for <slot> elements only. The value is ignored
for other elements for now. With this display value the element does not generate a box for itself but its descendants
generate them normally.
Slots already have implicit "display: contents". With this patch the value comes from the user agent stylesheet and can
be overriden by the author.
* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
* css/CSSValueKeywords.in:
Suport parsing display: contents.
* css/StyleResolver.cpp:
(WebCore::equivalentBlockDisplay):
(WebCore::StyleResolver::adjustRenderStyle):
Disallow for non-slots for now.
* css/html.css:
(slot):
Add "slot { display: contents }" to the UA sheet.
* dom/Element.cpp:
(WebCore::Element::resolveStyle):
(WebCore::Element::hasDisplayContents):
(WebCore::Element::setHasDisplayContents):
Add a rare data bit for elements with display:contents (as we don't save the RenderStyle for them).
(WebCore::Element::rendererIsNeeded):
Don't need renderer for display:contents.
(WebCore::Element::createElementRenderer):
* dom/Element.h:
(WebCore::Element::isVisibleInViewportChanged):
* dom/ElementAndTextDescendantIterator.h:
(WebCore::ElementAndTextDescendantIterator::operator!):
(WebCore::ElementAndTextDescendantIterator::operator bool):
(WebCore::ElementAndTextDescendantIterator::ElementAndTextDescendantIterator):
(WebCore::ElementAndTextDescendantIterator::operator==):
(WebCore::ElementAndTextDescendantIterator::operator!=):
Support initializing ElementAndTextDescendantIterator with root==current so that m_current is not nulled.
This is needed for ComposedTreeIterator to be initialized correctly when root is a slot and the current node
is a slotted node. The case happens in RenderTreePosition::previousSiblingRenderer when slot display is overriden
to something else than 'contents'.
* dom/ElementRareData.h:
(WebCore::ElementRareData::hasDisplayContents):
(WebCore::ElementRareData::setHasDisplayContents):
(WebCore::ElementRareData::ElementRareData):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor):
* rendering/style/RenderStyleConstants.h:
* style/RenderTreePosition.cpp:
(WebCore::RenderTreePosition::nextSiblingRenderer):
Test for dynamic display:contents.
* style/RenderTreeUpdater.cpp:
(WebCore::findRenderingRoot):
(WebCore::RenderTreeUpdater::updateRenderTree):
(WebCore::RenderTreeUpdater::updateElementRenderer):
Test for dynamic display:contents.
* style/StyleTreeResolver.cpp:
(WebCore::Style::affectsRenderedSubtree):
No need for special case.
(WebCore::Style::TreeResolver::resolveComposedTree):
Test for dynamic display:contents.
LayoutTests:
REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/188591">r188591</a>): thingiverse.com direct messaging UI is not rendered properly
https://bugs.webkit.org/show_bug.cgi?id=156241
<rdar://problem/25262213>
Patch by Myles C. Maxfield <mmaxfield@apple.com> on 2016-04-06
Reviewed by Simon Fraser.
* fast/text/zero-sized-fonts-expected.txt: Added.
* fast/text/zero-sized-fonts.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementAndTextDescendantIteratorh">trunk/Source/WebCore/dom/ElementAndTextDescendantIterator.h</a></li>
<li><a href="#trunkSourceWebCoredomElementRareDatah">trunk/Source/WebCore/dom/ElementRareData.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSlotElementh">trunk/Source/WebCore/html/HTMLSlotElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreePositioncpp">trunk/Source/WebCore/style/RenderTreePosition.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreeUpdatercpp">trunk/Source/WebCore/style/RenderTreeUpdater.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/LayoutTests/ChangeLog 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -210,6 +210,18 @@
</span><span class="cx">
</span><span class="cx"> 2016-04-06 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Shadow DOM: Implement display: contents for slots
+ https://bugs.webkit.org/show_bug.cgi?id=149439
+ <rdar://problem/22731922>
+
+ Reviewed by Ryosuke Niwa.
+
+ * platform/mac/TestExpectations:
+
+ Enable fast/shadow-dom/css-scoping-shadow-slot-display-override.html, the test for overriding slot display value.
+
+2016-04-06 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> REGRESSION(r196629): Messages text size only changes for sending text, conversation text size does not change
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156287
</span><span class="cx"> <rdar://problem/24264756>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -1229,7 +1229,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/148695 fast/shadow-dom [ Pass ]
</span><span class="cx"> webkit.org/b/149440 fast/shadow-dom/css-scoping-shadow-host-functional-rule.html [ ImageOnlyFailure ]
</span><del>-webkit.org/b/149441 fast/shadow-dom/css-scoping-shadow-slot-display-override.html [ ImageOnlyFailure ]
</del><span class="cx">
</span><span class="cx"> # Touch events is not enabled on Mac
</span><span class="cx"> webkit.org/b/149592 fast/shadow-dom/touch-event-ios.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/ChangeLog 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -1,3 +1,91 @@
</span><ins>+2016-04-06 Antti Koivisto <antti@apple.com>
+
+ Shadow DOM: Implement display: contents for slots
+ https://bugs.webkit.org/show_bug.cgi?id=149439
+ <rdar://problem/22731922>
+
+ Reviewed by Ryosuke Niwa.
+
+ This patch adds support for value 'contents' of the 'display' property for <slot> elements only. The value is ignored
+ for other elements for now. With this display value the element does not generate a box for itself but its descendants
+ generate them normally.
+
+ Slots already have implicit "display: contents". With this patch the value comes from the user agent stylesheet and can
+ be overriden by the author.
+
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ * css/CSSValueKeywords.in:
+
+ Suport parsing display: contents.
+
+ * css/StyleResolver.cpp:
+ (WebCore::equivalentBlockDisplay):
+ (WebCore::StyleResolver::adjustRenderStyle):
+
+ Disallow for non-slots for now.
+
+ * css/html.css:
+ (slot):
+
+ Add "slot { display: contents }" to the UA sheet.
+
+ * dom/Element.cpp:
+ (WebCore::Element::resolveStyle):
+ (WebCore::Element::hasDisplayContents):
+ (WebCore::Element::setHasDisplayContents):
+
+ Add a rare data bit for elements with display:contents (as we don't save the RenderStyle for them).
+
+ (WebCore::Element::rendererIsNeeded):
+
+ Don't need renderer for display:contents.
+
+ (WebCore::Element::createElementRenderer):
+ * dom/Element.h:
+ (WebCore::Element::isVisibleInViewportChanged):
+ * dom/ElementAndTextDescendantIterator.h:
+ (WebCore::ElementAndTextDescendantIterator::operator!):
+ (WebCore::ElementAndTextDescendantIterator::operator bool):
+ (WebCore::ElementAndTextDescendantIterator::ElementAndTextDescendantIterator):
+ (WebCore::ElementAndTextDescendantIterator::operator==):
+ (WebCore::ElementAndTextDescendantIterator::operator!=):
+
+ Support initializing ElementAndTextDescendantIterator with root==current so that m_current is not nulled.
+ This is needed for ComposedTreeIterator to be initialized correctly when root is a slot and the current node
+ is a slotted node. The case happens in RenderTreePosition::previousSiblingRenderer when slot display is overriden
+ to something else than 'contents'.
+
+ * dom/ElementRareData.h:
+ (WebCore::ElementRareData::hasDisplayContents):
+ (WebCore::ElementRareData::setHasDisplayContents):
+ (WebCore::ElementRareData::ElementRareData):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::createFor):
+ * rendering/style/RenderStyleConstants.h:
+ * style/RenderTreePosition.cpp:
+ (WebCore::RenderTreePosition::nextSiblingRenderer):
+
+ Test for dynamic display:contents.
+
+ * style/RenderTreeUpdater.cpp:
+ (WebCore::findRenderingRoot):
+ (WebCore::RenderTreeUpdater::updateRenderTree):
+ (WebCore::RenderTreeUpdater::updateElementRenderer):
+
+ Test for dynamic display:contents.
+
+ * style/StyleTreeResolver.cpp:
+ (WebCore::Style::affectsRenderedSubtree):
+
+ No need for special case.
+
+ (WebCore::Style::TreeResolver::resolveComposedTree):
+
+ Test for dynamic display:contents.
+
</ins><span class="cx"> 2016-04-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r188591): thingiverse.com direct messaging UI is not rendered properly
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -669,8 +669,8 @@
</span><span class="cx"> // inline | block | list-item | inline-block | table |
</span><span class="cx"> // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
</span><span class="cx"> // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none | inherit
</span><del>- // flex | -webkit-flex | inline-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid
- if ((valueID >= CSSValueInline && valueID <= CSSValueWebkitInlineFlex) || valueID == CSSValueNone)
</del><ins>+ // flex | -webkit-flex | inline-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid | contents
+ if ((valueID >= CSSValueInline && valueID <= CSSValueContents) || valueID == CSSValueNone)
</ins><span class="cx"> return true;
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> if (valueID == CSSValueWebkitGrid || valueID == CSSValueWebkitInlineGrid)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -1388,6 +1388,9 @@
</span><span class="cx"> case NONE:
</span><span class="cx"> m_value.valueID = CSSValueNone;
</span><span class="cx"> break;
</span><ins>+ case CONTENTS:
+ m_value.valueID = CSSValueContents;
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -417,6 +417,7 @@
</span><span class="cx"> -webkit-flex
</span><span class="cx"> inline-flex
</span><span class="cx"> -webkit-inline-flex
</span><ins>+contents
</ins><span class="cx"> -webkit-grid
</span><span class="cx"> -webkit-inline-grid
</span><span class="cx"> //none
</span><span class="lines">@@ -1184,7 +1185,7 @@
</span><span class="cx">
</span><span class="cx"> // will-change
</span><span class="cx"> scroll-position
</span><del>-contents
</del><ins>+//contents
</ins><span class="cx">
</span><span class="cx"> #if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
</span><span class="cx"> // touch-action
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -723,6 +723,7 @@
</span><span class="cx"> case TABLE_COLUMN:
</span><span class="cx"> case TABLE_CELL:
</span><span class="cx"> case TABLE_CAPTION:
</span><ins>+ case CONTENTS:
</ins><span class="cx"> return BLOCK;
</span><span class="cx"> case NONE:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -765,6 +766,15 @@
</span><span class="cx"> style.setOriginalDisplay(style.display());
</span><span class="cx">
</span><span class="cx"> if (style.display() != NONE) {
</span><ins>+ if (style.display() == CONTENTS) {
+ // FIXME: Enable for all elements.
+ bool elementSupportsDisplayContents = false;
+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ elementSupportsDisplayContents = is<HTMLSlotElement>(e);
+#endif
+ if (!elementSupportsDisplayContents)
+ style.setDisplay(INLINE);
+ }
</ins><span class="cx"> // If we have a <td> that specifies a float property, in quirks mode we just drop the float
</span><span class="cx"> // property.
</span><span class="cx"> // Sites also commonly use display:inline/block on <td>s and <table>s. In quirks mode we force
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/css/html.css 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -1223,6 +1223,10 @@
</span><span class="cx"> unicode-bidi: bidi-override;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+slot {
+ display: contents;
+}
+
</ins><span class="cx"> #if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
</span><span class="cx"> applet, embed, object, img {
</span><span class="cx"> -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -1375,6 +1375,18 @@
</span><span class="cx"> return styleResolver().styleForElement(*this, parentStyle);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Element::hasDisplayContents() const
+{
+ return hasRareData() && elementRareData()->hasDisplayContents();
+}
+
+void Element::setHasDisplayContents(bool value)
+{
+ if (hasDisplayContents() == value)
+ return;
+ ensureElementRareData().setHasDisplayContents(value);
+}
+
</ins><span class="cx"> // Returns true is the given attribute is an event handler.
</span><span class="cx"> // We consider an event handler any attribute that begins with "on".
</span><span class="cx"> // It is a simple solution that has the advantage of not requiring any
</span><span class="lines">@@ -1478,7 +1490,7 @@
</span><span class="cx">
</span><span class="cx"> bool Element::rendererIsNeeded(const RenderStyle& style)
</span><span class="cx"> {
</span><del>- return style.display() != NONE;
</del><ins>+ return style.display() != NONE && style.display() != CONTENTS;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> Element::createElementRenderer(Ref<RenderStyle>&& style, const RenderTreePosition&)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/dom/Element.h 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -501,6 +501,9 @@
</span><span class="cx"> StyleResolver& styleResolver();
</span><span class="cx"> ElementStyle resolveStyle(RenderStyle* parentStyle);
</span><span class="cx">
</span><ins>+ bool hasDisplayContents() const;
+ void setHasDisplayContents(bool);
+
</ins><span class="cx"> virtual void isVisibleInViewportChanged() { }
</span><span class="cx">
</span><span class="cx"> using ContainerNode::setAttributeEventListener;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementAndTextDescendantIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementAndTextDescendantIterator.h (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementAndTextDescendantIterator.h 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/dom/ElementAndTextDescendantIterator.h 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> bool operator==(const ElementAndTextDescendantIterator& other) const;
</span><span class="cx"> bool operator!=(const ElementAndTextDescendantIterator& other) const;
</span><span class="cx">
</span><del>- bool operator!() const { return !m_current; }
- explicit operator bool() const { return m_current; }
</del><ins>+ bool operator!() const { return !m_depth; }
+ explicit operator bool() const { return m_depth; }
</ins><span class="cx">
</span><span class="cx"> void dropAssertions();
</span><span class="cx">
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline ElementAndTextDescendantIterator::ElementAndTextDescendantIterator(ContainerNode& root, Node* current)
</span><del>- : m_current(current != &root ? current : nullptr)
</del><ins>+ : m_current(current)
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> , m_assertions(m_current)
</span><span class="cx"> #endif
</span><span class="lines">@@ -123,6 +123,8 @@
</span><span class="cx"> if (!m_current)
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(isElementOrText(*m_current));
</span><ins>+ if (m_current == &root)
+ return;
</ins><span class="cx">
</span><span class="cx"> Vector<Node*, 20> ancestorStack;
</span><span class="cx"> auto* ancestor = m_current->parentNode();
</span><span class="lines">@@ -285,7 +287,7 @@
</span><span class="cx"> inline bool ElementAndTextDescendantIterator::operator==(const ElementAndTextDescendantIterator& other) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_assertions.domTreeHasMutated());
</span><del>- return m_current == other.m_current;
</del><ins>+ return m_current == other.m_current || (!m_depth && !other.m_depth);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool ElementAndTextDescendantIterator::operator!=(const ElementAndTextDescendantIterator& other) const
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementRareData.h (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementRareData.h 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/dom/ElementRareData.h 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -107,6 +107,9 @@
</span><span class="cx"> bool hasPendingResources() const { return m_hasPendingResources; }
</span><span class="cx"> void setHasPendingResources(bool has) { m_hasPendingResources = has; }
</span><span class="cx">
</span><ins>+ bool hasDisplayContents() const { return m_hasDisplayContents; }
+ void setHasDisplayContents(bool value) { m_hasDisplayContents = value; }
+
</ins><span class="cx"> private:
</span><span class="cx"> int m_tabIndex;
</span><span class="cx"> unsigned short m_childIndex;
</span><span class="lines">@@ -126,6 +129,7 @@
</span><span class="cx"> unsigned m_childrenAffectedByLastChildRules : 1;
</span><span class="cx"> unsigned m_childrenAffectedByBackwardPositionalRules : 1;
</span><span class="cx"> unsigned m_childrenAffectedByPropertyBasedBackwardPositionalRules : 1;
</span><ins>+ unsigned m_hasDisplayContents : 1;
</ins><span class="cx">
</span><span class="cx"> RegionOversetState m_regionOversetState;
</span><span class="cx">
</span><span class="lines">@@ -166,6 +170,7 @@
</span><span class="cx"> , m_childrenAffectedByLastChildRules(false)
</span><span class="cx"> , m_childrenAffectedByBackwardPositionalRules(false)
</span><span class="cx"> , m_childrenAffectedByPropertyBasedBackwardPositionalRules(false)
</span><ins>+ , m_hasDisplayContents(false)
</ins><span class="cx"> , m_regionOversetState(RegionUndefined)
</span><span class="cx"> , m_minimumSizeForResizing(defaultMinimumSizeForResizing())
</span><span class="cx"> {
</span><span class="lines">@@ -193,6 +198,7 @@
</span><span class="cx"> inline void ElementRareData::resetComputedStyle()
</span><span class="cx"> {
</span><span class="cx"> m_computedStyle = nullptr;
</span><ins>+ m_hasDisplayContents = false;
</ins><span class="cx"> setStyleAffectedByEmpty(false);
</span><span class="cx"> setChildIndex(0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSlotElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSlotElement.h (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSlotElement.h 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/html/HTMLSlotElement.h 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -53,18 +53,7 @@
</span><span class="cx"> bool m_hasEnqueuedSlotChangeEvent { false };
</span><span class="cx"> };
</span><span class="cx">
</span><del>-// Slots have implicit display:contents until it is supported for reals.
-inline bool hasImplicitDisplayContents(const Element& element) { return is<HTMLSlotElement>(element); }
-
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#else
-
-namespace WebCore {
-
-inline bool hasImplicitDisplayContents(const Element&) { return false; }
-
-}
-
</del><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -161,6 +161,7 @@
</span><span class="cx">
</span><span class="cx"> switch (style.get().display()) {
</span><span class="cx"> case NONE:
</span><ins>+ case CONTENTS:
</ins><span class="cx"> return nullptr;
</span><span class="cx"> case INLINE:
</span><span class="cx"> return createRenderer<RenderInline>(element, WTFMove(style));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -563,6 +563,7 @@
</span><span class="cx"> TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL,
</span><span class="cx"> TABLE_CAPTION, BOX, INLINE_BOX,
</span><span class="cx"> FLEX, WEBKIT_FLEX, INLINE_FLEX, WEBKIT_INLINE_FLEX,
</span><ins>+ CONTENTS,
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> GRID, INLINE_GRID,
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreePositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreePosition.cpp (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreePosition.cpp 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/style/RenderTreePosition.cpp 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> while (it != end) {
</span><span class="cx"> auto& node = *it;
</span><del>- bool hasDisplayContents = is<Element>(node) && hasImplicitDisplayContents(downcast<Element>(node));
</del><ins>+ bool hasDisplayContents = is<Element>(node) && downcast<Element>(node).hasDisplayContents();
</ins><span class="cx"> if (hasDisplayContents) {
</span><span class="cx"> it.traverseNext();
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> for (auto& ancestor : composedTreeAncestors(node)) {
</span><span class="cx"> if (ancestor.renderer())
</span><span class="cx"> return &ancestor;
</span><del>- if (!hasImplicitDisplayContents(ancestor))
</del><ins>+ if (!ancestor.hasDisplayContents())
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return &node.document();
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> updateElementRenderer(element, *elementUpdate);
</span><span class="cx">
</span><del>- bool mayHaveRenderedDescendants = element.renderer() || (hasImplicitDisplayContents(element) && shouldCreateRenderer(element, renderTreePosition().parent()));
</del><ins>+ bool mayHaveRenderedDescendants = element.renderer() || (element.hasDisplayContents() && shouldCreateRenderer(element, renderTreePosition().parent()));
</ins><span class="cx"> if (!mayHaveRenderedDescendants) {
</span><span class="cx"> it.traverseNextSkippingChildren();
</span><span class="cx"> continue;
</span><span class="lines">@@ -244,7 +244,10 @@
</span><span class="cx"> if (shouldTearDownRenderers)
</span><span class="cx"> tearDownRenderers(element, TeardownType::KeepHoverAndActive);
</span><span class="cx">
</span><del>- bool shouldCreateNewRenderer = !element.renderer() && update.style && !hasImplicitDisplayContents(element);
</del><ins>+ bool hasDisplayContest = update.style && update.style->display() == CONTENTS;
+ element.setHasDisplayContents(hasDisplayContest);
+
+ bool shouldCreateNewRenderer = !element.renderer() && update.style && !hasDisplayContest;
</ins><span class="cx"> if (shouldCreateNewRenderer) {
</span><span class="cx"> if (element.hasCustomStyleResolveCallbacks())
</span><span class="cx"> element.willAttachRenderers();
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (199150 => 199151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-04-07 05:19:52 UTC (rev 199150)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-04-07 10:11:39 UTC (rev 199151)
</span><span class="lines">@@ -172,9 +172,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> if (newStyle.display() != NONE)
</span><span class="cx"> return true;
</span><del>- // FIXME: Make 'contents' an actual display property value.
- if (hasImplicitDisplayContents(element))
- return true;
</del><span class="cx"> if (element.rendererIsNeeded(newStyle))
</span><span class="cx"> return true;
</span><span class="cx"> if (element.shouldMoveToFlowThread(newStyle))
</span><span class="lines">@@ -376,7 +373,7 @@
</span><span class="cx"> ElementUpdate update;
</span><span class="cx"> update.style = element.renderStyle();
</span><span class="cx">
</span><del>- bool shouldResolve = parent.change >= Inherit || element.needsStyleRecalc() || shouldResolveForPseudoElement || affectedByPreviousSibling || hasImplicitDisplayContents(element);
</del><ins>+ bool shouldResolve = parent.change >= Inherit || element.needsStyleRecalc() || shouldResolveForPseudoElement || affectedByPreviousSibling || element.hasDisplayContents();
</ins><span class="cx"> if (shouldResolve) {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> CheckForVisibilityChangeOnRecalcStyle checkForVisibilityChange(&element, element.renderStyle());
</span></span></pre>
</div>
</div>
</body>
</html>