Diff
Modified: trunk/LayoutTests/ChangeLog (208997 => 208998)
--- trunk/LayoutTests/ChangeLog 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/LayoutTests/ChangeLog 2016-11-28 15:58:35 UTC (rev 208998)
@@ -1,3 +1,15 @@
+2016-11-28 Antti Koivisto <[email protected]>
+
+ Remove FIRST_LINE_INHERITED fake pseudo style
+ https://bugs.webkit.org/show_bug.cgi?id=165071
+
+ Reviewed by Andreas Kling.
+
+ Expand the test case a bit.
+
+ * fast/css/pseudo-cache-stale-expected.html:
+ * fast/css/pseudo-cache-stale.html:
+
2016-11-28 Per Arne Vollan <[email protected]>
[Win] WebCrypto tests are failing.
Modified: trunk/LayoutTests/fast/css/pseudo-cache-stale-expected.html (208997 => 208998)
--- trunk/LayoutTests/fast/css/pseudo-cache-stale-expected.html 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/LayoutTests/fast/css/pseudo-cache-stale-expected.html 2016-11-28 15:58:35 UTC (rev 208998)
@@ -10,5 +10,8 @@
<div id="first-line" style="font-size: xx-large;">
This sentence should be extra-extra-large.
</div>
+ <div id="first-line" style="font-size: xx-large;">
+ This sentence should be extra-extra-large too.
+ </div>
<input type="search" placeholder="This should be green">
</body>
Modified: trunk/LayoutTests/fast/css/pseudo-cache-stale.html (208997 => 208998)
--- trunk/LayoutTests/fast/css/pseudo-cache-stale.html 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/LayoutTests/fast/css/pseudo-cache-stale.html 2016-11-28 15:58:35 UTC (rev 208998)
@@ -15,6 +15,10 @@
font-size: xx-large;
}
+ .green #first-line-inherit:first-line {
+ font-size: xx-large;
+ }
+
.green input::placeholder {
color: green;
}
@@ -26,6 +30,9 @@
<div id="first-line">
This sentence should be extra-extra-large.
</div>
+ <div id="first-line-inherit">
+ <span>This sentence should be extra-extra-large too.</span>
+ </div>
<input type="search" placeholder="This should be green">
<script>
var target = document.body;
Modified: trunk/Source/WebCore/ChangeLog (208997 => 208998)
--- trunk/Source/WebCore/ChangeLog 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/Source/WebCore/ChangeLog 2016-11-28 15:58:35 UTC (rev 208998)
@@ -1,3 +1,48 @@
+2016-11-28 Antti Koivisto <[email protected]>
+
+ Remove FIRST_LINE_INHERITED fake pseudo style
+ https://bugs.webkit.org/show_bug.cgi?id=165071
+
+ Reviewed by Andreas Kling.
+
+ These are create during layout an then cached to the RenderStyle. Cache computed first line style to
+ RenderObject rare data instead, avoiding style mutation an other confusing messiness.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::RenderElement):
+ (WebCore::RenderElement::computeFirstLineStyle):
+ (WebCore::RenderElement::firstLineStyle):
+
+ Cache the first line style.
+
+ (WebCore::RenderElement::invalidateCachedFirstLineStyle):
+ (WebCore::RenderElement::styleWillChange):
+
+ Invalidate subtree if we have cached first line style.
+
+ (WebCore::RenderElement::getUncachedPseudoStyle):
+ (WebCore::RenderElement::uncachedFirstLineStyle): Deleted.
+ (WebCore::RenderElement::cachedFirstLineStyle): Deleted.
+ * rendering/RenderElement.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::rareDataMap):
+ (WebCore::RenderObject::rareData):
+ (WebCore::RenderObject::ensureRareData):
+ * rendering/RenderObject.h:
+
+ Stop copying rare data objects.
+
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout):
+
+ Use the normal mechanism for invalidating layout for first-line instead of a hack in pseudoStyleCacheIsInvalid.
+
+ * rendering/style/RenderStyleConstants.h:
+ * style/RenderTreeUpdater.cpp:
+ (WebCore::pseudoStyleCacheIsInvalid):
+
+ Simplify.
+
2016-11-28 Miguel Gomez <[email protected]>
[GTK] Dramatic increase on memory usage since 2.14.x
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (208997 => 208998)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-28 15:58:35 UTC (rev 208998)
@@ -104,6 +104,7 @@
, m_hasCounterNodeMap(false)
, m_isCSSAnimating(false)
, m_hasContinuation(false)
+ , m_hasValidCachedFirstLineStyle(false)
, m_renderBlockHasMarginBeforeQuirk(false)
, m_renderBlockHasMarginAfterQuirk(false)
, m_renderBlockShouldForceRelayoutChildren(false)
@@ -215,50 +216,46 @@
return nullptr;
}
-std::unique_ptr<RenderStyle> RenderElement::uncachedFirstLineStyle(RenderStyle* style) const
+std::unique_ptr<RenderStyle> RenderElement::computeFirstLineStyle() const
{
- if (!view().usesFirstLineRules())
- return nullptr;
+ ASSERT(view().usesFirstLineRules());
RenderElement& rendererForFirstLineStyle = isBeforeOrAfterContent() ? *parent() : const_cast<RenderElement&>(*this);
if (rendererForFirstLineStyle.isRenderBlockFlow() || rendererForFirstLineStyle.isRenderButton()) {
- if (RenderBlock* firstLineBlock = rendererForFirstLineStyle.firstLineBlock())
- return firstLineBlock->getUncachedPseudoStyle(PseudoStyleRequest(FIRST_LINE), style, firstLineBlock == this ? style : nullptr);
- } else if (!rendererForFirstLineStyle.isAnonymous() && rendererForFirstLineStyle.isRenderInline()) {
- auto& parentStyle = rendererForFirstLineStyle.parent()->firstLineStyle();
- if (&parentStyle != &rendererForFirstLineStyle.parent()->style())
- return rendererForFirstLineStyle.getUncachedPseudoStyle(PseudoStyleRequest(FIRST_LINE_INHERITED), &parentStyle, style);
+ RenderBlock* firstLineBlock = rendererForFirstLineStyle.firstLineBlock();
+ if (!firstLineBlock)
+ return nullptr;
+ auto* firstLineStyle = firstLineBlock->getCachedPseudoStyle(FIRST_LINE, &style());
+ if (!firstLineStyle)
+ return nullptr;
+ return RenderStyle::clonePtr(*firstLineStyle);
}
- return nullptr;
+
+ if (rendererForFirstLineStyle.isAnonymous() || !rendererForFirstLineStyle.isRenderInline())
+ return nullptr;
+
+ auto& parentStyle = rendererForFirstLineStyle.parent()->firstLineStyle();
+ if (&parentStyle == &rendererForFirstLineStyle.parent()->style())
+ return nullptr;
+ return rendererForFirstLineStyle.element()->styleResolver().styleForElement(*element(), &parentStyle).renderStyle;
}
-const RenderStyle* RenderElement::cachedFirstLineStyle() const
+const RenderStyle& RenderElement::firstLineStyle() const
{
- ASSERT(view().usesFirstLineRules());
+ if (!view().usesFirstLineRules())
+ return style();
- RenderElement& rendererForFirstLineStyle = isBeforeOrAfterContent() ? *parent() : const_cast<RenderElement&>(*this);
-
- if (rendererForFirstLineStyle.isRenderBlockFlow() || rendererForFirstLineStyle.isRenderButton()) {
- if (RenderBlock* firstLineBlock = rendererForFirstLineStyle.firstLineBlock())
- return firstLineBlock->getCachedPseudoStyle(FIRST_LINE, &style());
- } else if (!rendererForFirstLineStyle.isAnonymous() && rendererForFirstLineStyle.isRenderInline()) {
- auto& parentStyle = rendererForFirstLineStyle.parent()->firstLineStyle();
- if (&parentStyle != &rendererForFirstLineStyle.parent()->style()) {
- // A first-line style is in effect. Cache a first-line style for ourselves.
- rendererForFirstLineStyle.m_style.setHasPseudoStyle(FIRST_LINE_INHERITED);
- return rendererForFirstLineStyle.getCachedPseudoStyle(FIRST_LINE_INHERITED, &parentStyle);
- }
+ if (!m_hasValidCachedFirstLineStyle) {
+ auto firstLineStyle = computeFirstLineStyle();
+ if (firstLineStyle || hasRareData())
+ const_cast<RenderElement&>(*this).ensureRareData().cachedFirstLineStyle = WTFMove(firstLineStyle);
+ m_hasValidCachedFirstLineStyle = true;
}
- return &style();
+ return (hasRareData() && rareData().cachedFirstLineStyle) ? *rareData().cachedFirstLineStyle : style();
}
-const RenderStyle& RenderElement::firstLineStyle() const
-{
- return view().usesFirstLineRules() ? *cachedFirstLineStyle() : style();
-}
-
StyleDifference RenderElement::adjustStyleDifference(StyleDifference diff, unsigned contextSensitiveProperties) const
{
// If transform changed, and we are not composited, need to do a layout.
@@ -818,6 +815,16 @@
return renderer && renderer->hasBackground();
}
+void RenderElement::invalidateCachedFirstLineStyle()
+{
+ if (!m_hasValidCachedFirstLineStyle)
+ return;
+ m_hasValidCachedFirstLineStyle = false;
+ // Invalidate the subtree as descendant's first line style may depend on ancestor's.
+ for (auto& descendant : descendantsOfType<RenderElement>(*this))
+ descendant.m_hasValidCachedFirstLineStyle = false;
+}
+
void RenderElement::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
{
auto* oldStyle = hasInitializedStyle() ? &style() : nullptr;
@@ -877,6 +884,9 @@
setFloating(false);
clearPositionedState();
}
+ if (newStyle.hasPseudoStyle(FIRST_LINE) || oldStyle->hasPseudoStyle(FIRST_LINE))
+ invalidateCachedFirstLineStyle();
+
setHorizontalWritingMode(true);
setHasVisibleBoxDecorations(false);
setHasOverflowClip(false);
@@ -1545,12 +1555,7 @@
auto& styleResolver = element()->styleResolver();
- std::unique_ptr<RenderStyle> style;
- if (pseudoStyleRequest.pseudoId == FIRST_LINE_INHERITED) {
- style = styleResolver.styleForElement(*element(), parentStyle).renderStyle;
- style->setStyleType(FIRST_LINE_INHERITED);
- } else
- style = styleResolver.pseudoStyleForElement(*element(), pseudoStyleRequest, *parentStyle);
+ std::unique_ptr<RenderStyle> style = styleResolver.pseudoStyleForElement(*element(), pseudoStyleRequest, *parentStyle);
if (style)
Style::loadPendingResources(*style, document(), element());
Modified: trunk/Source/WebCore/rendering/RenderElement.h (208997 => 208998)
--- trunk/Source/WebCore/rendering/RenderElement.h 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-11-28 15:58:35 UTC (rev 208998)
@@ -131,10 +131,6 @@
// Return the renderer whose background style is used to paint the root background. Should only be called on the renderer for which isDocumentElementRenderer() is true.
RenderElement& rendererForRootBackground();
- // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style based off of a
- // given new style, without accessing the cache.
- std::unique_ptr<RenderStyle> uncachedFirstLineStyle(RenderStyle*) const;
-
// Updates only the local style ptr of the object. Does not update the state of the object,
// and so only should be called when the style is known not to have changed (or from setStyle).
void setStyleInternal(RenderStyle&& style) { m_style = WTFMove(style); }
@@ -306,7 +302,8 @@
void updateShapeImage(const ShapeValue*, const ShapeValue*);
StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensitiveProperties) const;
- const RenderStyle* cachedFirstLineStyle() const;
+ std::unique_ptr<RenderStyle> computeFirstLineStyle() const;
+ void invalidateCachedFirstLineStyle();
void newImageAnimationFrameAvailable(CachedImage&) final;
@@ -328,6 +325,7 @@
unsigned m_hasCounterNodeMap : 1;
unsigned m_isCSSAnimating : 1;
unsigned m_hasContinuation : 1;
+ mutable unsigned m_hasValidCachedFirstLineStyle : 1;
unsigned m_renderBlockHasMarginBeforeQuirk : 1;
unsigned m_renderBlockHasMarginAfterQuirk : 1;
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (208997 => 208998)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2016-11-28 15:58:35 UTC (rev 208998)
@@ -1978,24 +1978,22 @@
ensureRareData().setVisibleInViewportState(visible);
}
-RenderObject::RareDataHash& RenderObject::rareDataMap()
+RenderObject::RareDataMap& RenderObject::rareDataMap()
{
- static NeverDestroyed<RareDataHash> map;
+ static NeverDestroyed<RareDataMap> map;
return map;
}
-RenderObject::RenderObjectRareData RenderObject::rareData() const
+const RenderObject::RenderObjectRareData& RenderObject::rareData() const
{
- if (!hasRareData())
- return RenderObjectRareData();
-
- return rareDataMap().get(this);
+ ASSERT(hasRareData());
+ return *rareDataMap().get(this);
}
RenderObject::RenderObjectRareData& RenderObject::ensureRareData()
{
setHasRareData(true);
- return rareDataMap().add(this, RenderObjectRareData()).iterator->value;
+ return *rareDataMap().ensure(this, [] { return std::make_unique<RenderObjectRareData>(); }).iterator->value;
}
void RenderObject::removeRareData()
Modified: trunk/Source/WebCore/rendering/RenderObject.h (208997 => 208998)
--- trunk/Source/WebCore/rendering/RenderObject.h 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2016-11-28 15:58:35 UTC (rev 208998)
@@ -970,6 +970,7 @@
RenderObjectBitfields m_bitfields;
+ // FIXME: This should be RenderElementRareData.
class RenderObjectRareData {
public:
RenderObjectRareData()
@@ -989,17 +990,16 @@
// From RenderElement
ADD_BOOLEAN_BITFIELD(isRegisteredForVisibleInViewportCallback, IsRegisteredForVisibleInViewportCallback);
ADD_ENUM_BITFIELD(visibleInViewportState, VisibleInViewportState, VisibleInViewportState, 2);
-
+ std::unique_ptr<RenderStyle> cachedFirstLineStyle;
};
- RenderObjectRareData rareData() const;
+ const RenderObject::RenderObjectRareData& rareData() const;
RenderObjectRareData& ensureRareData();
void removeRareData();
- // Note: RenderObjectRareData is stored by value.
- typedef HashMap<const RenderObject*, RenderObjectRareData> RareDataHash;
+ typedef HashMap<const RenderObject*, std::unique_ptr<RenderObjectRareData>> RareDataMap;
- static RareDataHash& rareDataMap();
+ static RareDataMap& rareDataMap();
#undef ADD_BOOLEAN_BITFIELD
};
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (208997 => 208998)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-11-28 15:58:35 UTC (rev 208998)
@@ -759,7 +759,22 @@
return true;
}
}
-
+
+ bool hasFirstLineStyle = hasPseudoStyle(FIRST_LINE);
+ if (hasFirstLineStyle != other.hasPseudoStyle(FIRST_LINE))
+ return true;
+ if (hasFirstLineStyle) {
+ auto* firstLineStyle = getCachedPseudoStyle(FIRST_LINE);
+ if (!firstLineStyle)
+ return true;
+ auto* otherFirstLineStyle = other.getCachedPseudoStyle(FIRST_LINE);
+ if (!otherFirstLineStyle)
+ return true;
+ // FIXME: Not all first line style changes actually need layout.
+ if (*firstLineStyle != *otherFirstLineStyle)
+ return true;
+ }
+
return false;
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (208997 => 208998)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-11-28 15:58:35 UTC (rev 208998)
@@ -77,7 +77,7 @@
// Static pseudo styles. Dynamic ones are produced on the fly.
enum PseudoId : unsigned char {
// The order must be NOP ID, public IDs, and then internal IDs.
- NOPSEUDO, FIRST_LINE, FIRST_LETTER, BEFORE, AFTER, SELECTION, FIRST_LINE_INHERITED, SCROLLBAR,
+ NOPSEUDO, FIRST_LINE, FIRST_LETTER, BEFORE, AFTER, SELECTION, SCROLLBAR,
// Internal IDs follow:
SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER, RESIZER,
AFTER_LAST_INTERNAL_PSEUDOID,
Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (208997 => 208998)
--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-11-28 15:00:41 UTC (rev 208997)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-11-28 15:58:35 UTC (rev 208998)
@@ -235,24 +235,12 @@
return false;
for (auto& cache : *pseudoStyleCache) {
- std::unique_ptr<RenderStyle> newPseudoStyle;
PseudoId pseudoId = cache->styleType();
- if (pseudoId == FIRST_LINE || pseudoId == FIRST_LINE_INHERITED)
- newPseudoStyle = renderer->uncachedFirstLineStyle(newStyle);
- else
- newPseudoStyle = renderer->getUncachedPseudoStyle(PseudoStyleRequest(pseudoId), newStyle, newStyle);
+ std::unique_ptr<RenderStyle> newPseudoStyle = renderer->getUncachedPseudoStyle(PseudoStyleRequest(pseudoId), newStyle, newStyle);
if (!newPseudoStyle)
return true;
if (*newPseudoStyle != *cache) {
- if (pseudoId < FIRST_INTERNAL_PSEUDOID)
- newStyle->setHasPseudoStyle(pseudoId);
newStyle->addCachedPseudoStyle(WTFMove(newPseudoStyle));
- if (pseudoId == FIRST_LINE || pseudoId == FIRST_LINE_INHERITED) {
- // FIXME: We should do an actual diff to determine whether a repaint vs. layout
- // is needed, but for now just assume a layout will be required. The diff code
- // in RenderObject::setStyle would need to be factored out so that it could be reused.
- renderer->setNeedsLayoutAndPrefWidthsRecalc();
- }
return true;
}
}