Diff
Modified: trunk/LayoutTests/ChangeLog (214332 => 214333)
--- trunk/LayoutTests/ChangeLog 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/LayoutTests/ChangeLog 2017-03-24 03:20:18 UTC (rev 214333)
@@ -1,3 +1,13 @@
+2017-03-23 Antti Koivisto <an...@apple.com>
+
+ Revert r213712, caused iPad PLT regression
+ https://bugs.webkit.org/show_bug.cgi?id=170040
+
+ Unreviewed.
+
+ * http/tests/incremental/stylesheet-body-incremental-rendering-expected.html: Removed.
+ * http/tests/incremental/stylesheet-body-incremental-rendering.html: Removed.
+
2017-03-23 Chris Dumez <cdu...@apple.com>
SVG animations are not paused when their <svg> element is removed from the document
Deleted: trunk/LayoutTests/http/tests/incremental/stylesheet-body-incremental-rendering-expected.html (214332 => 214333)
--- trunk/LayoutTests/http/tests/incremental/stylesheet-body-incremental-rendering-expected.html 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/LayoutTests/http/tests/incremental/stylesheet-body-incremental-rendering-expected.html 2017-03-24 03:20:18 UTC (rev 214333)
@@ -1,6 +0,0 @@
-<div style="width:100px; height:100px; background-color:green"></div>
-<div style="width:100px; height:100px; background-color:green"></div>
-<p>
-Before stylesheet load: (repaint rects (rect 8 8 100 100) )<br>
-After stylesheet load: (repaint rects (rect 8 108 100 100) )<br>
-</p>
Deleted: trunk/LayoutTests/http/tests/incremental/stylesheet-body-incremental-rendering.html (214332 => 214333)
--- trunk/LayoutTests/http/tests/incremental/stylesheet-body-incremental-rendering.html 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/LayoutTests/http/tests/incremental/stylesheet-body-incremental-rendering.html 2017-03-24 03:20:18 UTC (rev 214333)
@@ -1,24 +0,0 @@
-<body>
-<script>
-document.body.offsetWidth;
-
-internals.startTrackingRepaints();
-let initialRects;
-setTimeout(() => {
- initialRects = internals.repaintRectsAsText();
- internals.stopTrackingRepaints();
- internals.startTrackingRepaints();
-}, 0);
-
-document.body._onload_ = () => {
- let finalRects = internals.repaintRectsAsText();
- internals.stopTrackingRepaints();
- document.body.innerHTML += `<p>
- Before stylesheet load: ${initialRects}<br>
- After stylesheet load: ${finalRects}<br>
- </p>`;
-};
-</script>
-<div style="width:100px; height:100px; background-color:green"></div>
-<link rel="stylesheet" href=""
-<div class=delayed style="width:100px; height:100px; background-color:red"></div>
Modified: trunk/Source/WebCore/ChangeLog (214332 => 214333)
--- trunk/Source/WebCore/ChangeLog 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/ChangeLog 2017-03-24 03:20:18 UTC (rev 214333)
@@ -1,3 +1,53 @@
+2017-03-23 Antti Koivisto <an...@apple.com>
+
+ Revert r213712, caused iPad PLT regression
+ https://bugs.webkit.org/show_bug.cgi?id=170040
+
+ Unreviewed.
+
+ A few subtests have big regressions.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::pseudoStyleRulesForElement):
+ * dom/Document.cpp:
+ (WebCore::Document::resolveStyle):
+ (WebCore::Document::updateLayoutIgnorePendingStylesheets):
+ (WebCore::Document::shouldScheduleLayout):
+ (WebCore::Document::didRemoveAllPendingStylesheet):
+ * dom/Document.h:
+ (WebCore::Document::didLayoutWithPendingStylesheets):
+ (WebCore::Document::hasNodesWithPlaceholderStyle):
+ (WebCore::Document::setHasNodesWithPlaceholderStyle):
+ (WebCore::Document::hasNodesWithNonFinalStyle): Deleted.
+ (WebCore::Document::setHasNodesWithNonFinalStyle): Deleted.
+ * html/HTMLFrameSetElement.cpp:
+ (WebCore::HTMLFrameSetElement::rendererIsNeeded):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::qualifiesAsVisuallyNonEmpty):
+ (WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintContents):
+ * rendering/RenderLayer.cpp:
+ (WebCore::shouldSuppressPaintingLayer):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresRepaint):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::isPlaceholderStyle):
+ (WebCore::RenderStyle::setIsPlaceholderStyle):
+ (WebCore::RenderStyle::isNotFinal): Deleted.
+ (WebCore::RenderStyle::setIsNotFinal): Deleted.
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+ * style/StyleScope.cpp:
+ (WebCore::Style::Scope::analyzeStyleSheetChange):
+ (WebCore::Style::Scope::updateActiveStyleSheets):
+ * style/StyleTreeResolver.cpp:
+ (WebCore::Style::makePlaceholderStyle):
+ (WebCore::Style::TreeResolver::styleForElement):
+ (WebCore::Style::TreeResolver::resolveElement):
+
2017-03-23 Wenson Hsieh <wenson_hs...@apple.com>
Dragging on a large image should not revert to a file icon if data interaction is enabled
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (214332 => 214333)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -1123,8 +1123,8 @@
Vector<RefPtr<StyleRule>> StyleResolver::pseudoStyleRulesForElement(const Element* element, PseudoId pseudoId, unsigned rulesToInclude)
{
- if (!element)
- return { };
+ if (!element || !element->document().haveStylesheetsLoaded())
+ return Vector<RefPtr<StyleRule>>();
m_state = State(*element, nullptr);
Modified: trunk/Source/WebCore/dom/Document.cpp (214332 => 214333)
--- trunk/Source/WebCore/dom/Document.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -1725,7 +1725,7 @@
if (type == ResolveStyleType::Rebuild) {
// This may get set again during style resolve.
- m_hasNodesWithNonFinalStyle = false;
+ m_hasNodesWithPlaceholderStyle = false;
auto documentStyle = Style::resolveForDocument(*this);
@@ -1761,9 +1761,6 @@
}
updatedCompositingLayers = frameView.updateCompositingLayersAfterStyleChange();
-
- if (m_renderView->needsLayout())
- frameView.scheduleRelayout();
}
// If we wanted to call implicitClose() during recalcStyle, do so now that we're finished.
@@ -1857,6 +1854,12 @@
frameView->layout();
}
+// FIXME: This is a bad idea and needs to be removed eventually.
+// Other browsers load stylesheets before they continue parsing the web page.
+// Since we don't, we can run _javascript_ code that needs answers before the
+// stylesheets are loaded. Doing a layout ignoring the pending stylesheets
+// lets us get reasonable answers. The long term solution to this problem is
+// to instead suspend _javascript_ execution.
void Document::updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks runPostLayoutTasks)
{
bool oldIgnore = m_ignorePendingStylesheets;
@@ -1863,9 +1866,22 @@
if (!haveStylesheetsLoaded()) {
m_ignorePendingStylesheets = true;
- // FIXME: This should just invalidate elements with non-final styles.
- if (m_hasNodesWithNonFinalStyle)
+ // FIXME: We are willing to attempt to suppress painting with outdated style info only once. Our assumption is that it would be
+ // dangerous to try to stop it a second time, after page content has already been loaded and displayed
+ // with accurate style information. (Our suppression involves blanking the whole page at the
+ // moment. If it were more refined, we might be able to do something better.)
+ // It's worth noting though that this entire method is a hack, since what we really want to do is
+ // suspend JS instead of doing a layout with inaccurate information.
+ HTMLElement* bodyElement = bodyOrFrameset();
+ if (bodyElement && !bodyElement->renderer() && m_pendingSheetLayout == NoLayoutWithPendingSheets) {
+ m_pendingSheetLayout = DidLayoutWithPendingSheets;
+ styleScope().didChangeActiveStyleSheetCandidates();
resolveStyle(ResolveStyleType::Rebuild);
+ } else if (m_hasNodesWithPlaceholderStyle)
+ // If new nodes have been added or style recalc has been done with style sheets still pending, some nodes
+ // may not have had their real style calculated yet. Normally this gets cleaned when style sheets arrive
+ // but here we need up-to-date style immediately.
+ resolveStyle(ResolveStyleType::Rebuild);
}
updateLayout();
@@ -2698,16 +2714,14 @@
bool Document::shouldScheduleLayout()
{
- if (!documentElement())
- return false;
- if (!is<HTMLHtmlElement>(*documentElement()))
- return true;
- if (!bodyOrFrameset())
- return false;
- if (styleScope().hasPendingSheetsBeforeBody())
- return false;
+ // This function will only be called when FrameView thinks a layout is needed.
+ // This enforces a couple extra rules.
+ //
+ // (a) Only schedule a layout once the stylesheets are loaded.
+ // (b) Only schedule layout once we have a body element.
- return true;
+ return (haveStylesheetsLoaded() && bodyOrFrameset())
+ || (documentElement() && !is<HTMLHtmlElement>(*documentElement()));
}
bool Document::isLayoutTimerActive()
@@ -3011,6 +3025,15 @@
void Document::didRemoveAllPendingStylesheet()
{
+ if (m_pendingSheetLayout == DidLayoutWithPendingSheets) {
+ // Painting is disabled when doing layouts with pending sheets to avoid FOUC.
+ // We need to force paint when coming out from this state.
+ // FIXME: This is not very elegant.
+ m_pendingSheetLayout = IgnoreLayoutWithPendingSheets;
+ if (renderView())
+ renderView()->repaintViewAndCompositedLayers();
+ }
+
if (auto* parser = scriptableDocumentParser())
parser->executeScriptsWaitingForStylesheetsSoon();
}
Modified: trunk/Source/WebCore/dom/Document.h (214332 => 214333)
--- trunk/Source/WebCore/dom/Document.h 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/dom/Document.h 2017-03-24 03:20:18 UTC (rev 214333)
@@ -936,9 +936,13 @@
WEBCORE_EXPORT Ref<XPathNSResolver> createNSResolver(Node* nodeResolver);
WEBCORE_EXPORT ExceptionOr<Ref<XPathResult>> evaluate(const String& _expression_, Node* contextNode, RefPtr<XPathNSResolver>&&, unsigned short type, XPathResult*);
- bool hasNodesWithNonFinalStyle() const { return m_hasNodesWithNonFinalStyle; }
- void setHasNodesWithNonFinalStyle() { m_hasNodesWithNonFinalStyle = true; }
+ enum PendingSheetLayout { NoLayoutWithPendingSheets, DidLayoutWithPendingSheets, IgnoreLayoutWithPendingSheets };
+ bool didLayoutWithPendingStylesheets() const { return m_pendingSheetLayout == DidLayoutWithPendingSheets; }
+
+ bool hasNodesWithPlaceholderStyle() const { return m_hasNodesWithPlaceholderStyle; }
+ void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; }
+
void updateFocusAppearanceSoon(SelectionRestorationMode);
void cancelFocusAppearanceUpdate();
@@ -1674,11 +1678,16 @@
bool m_wellFormed { false };
bool m_createRenderers { true };
- bool m_hasNodesWithNonFinalStyle { false };
+ bool m_hasNodesWithPlaceholderStyle { false };
// But sometimes you need to ignore pending stylesheet count to
// force an immediate layout when requested by JS.
bool m_ignorePendingStylesheets { false };
+ // If we do ignore the pending stylesheet count, then we need to add a boolean
+ // to track that this happened so that we can do a full repaint when the stylesheets
+ // do eventually load.
+ PendingSheetLayout m_pendingSheetLayout { NoLayoutWithPendingSheets };
+
bool m_hasElementUsingStyleBasedEditability { false };
bool m_focusNavigationStartingNodeIsRemoved { false };
Modified: trunk/Source/WebCore/html/HTMLFrameSetElement.cpp (214332 => 214333)
--- trunk/Source/WebCore/html/HTMLFrameSetElement.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/html/HTMLFrameSetElement.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -153,7 +153,7 @@
{
// For compatibility, frames render even when display: none is set.
// However, we delay creating a renderer until stylesheets have loaded.
- return !style.isNotFinal();
+ return !style.isPlaceholderStyle();
}
RenderPtr<RenderElement> HTMLFrameSetElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
Modified: trunk/Source/WebCore/page/FrameView.cpp (214332 => 214333)
--- trunk/Source/WebCore/page/FrameView.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/page/FrameView.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -4586,10 +4586,6 @@
if (!frame().document()->parsing() && frame().loader().stateMachine().committedFirstRealDocumentLoad())
return true;
- // FIXME: We should also ignore renderers with non-final style.
- if (frame().document()->styleScope().hasPendingSheetsBeforeBody())
- return false;
-
// Require the document to grow a bit.
// Using a value of 48 allows the header on Google's search page to render immediately before search results populate later.
static const int documentHeightThreshold = 48;
@@ -5132,7 +5128,7 @@
updateIsVisuallyNonEmpty();
// If the layout was done with pending sheets, we are not in fact visually non-empty yet.
- if (m_isVisuallyNonEmpty &&m_firstVisuallyNonEmptyLayoutCallbackPending) {
+ if (m_isVisuallyNonEmpty && !frame().document()->didLayoutWithPendingStylesheets() && m_firstVisuallyNonEmptyLayoutCallbackPending) {
m_firstVisuallyNonEmptyLayoutCallbackPending = false;
if (requestedMilestones & DidFirstVisuallyNonEmptyLayout)
milestonesAchieved |= DidFirstVisuallyNonEmptyLayout;
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (214332 => 214333)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -1579,10 +1579,10 @@
void RenderBlock::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
{
- // Style is non-final if the element has a pending stylesheet before it. We end up with renderers with such styles if a script
- // forces renderer construction by querying something layout dependent.
- // Avoid FOUC by not painting. Switching to final style triggers repaint.
- if (style().isNotFinal())
+ // Avoid painting descendants of the root element when stylesheets haven't loaded. This eliminates FOUC.
+ // It's ok not to draw, because later on, when all the stylesheets do load, styleResolverChanged() on the Document
+ // will do a full repaint.
+ if (document().didLayoutWithPendingStylesheets() && !isRenderView())
return;
if (childrenInline())
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (214332 => 214333)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -3939,7 +3939,10 @@
static inline bool shouldSuppressPaintingLayer(RenderLayer* layer)
{
- if (layer->renderer().style().isNotFinal() && !layer->isRootLayer() && !layer->renderer().isDocumentElementRenderer())
+ // Avoid painting descendants of the root layer when stylesheets haven't loaded. This eliminates FOUC.
+ // It's ok not to draw, because later on, when all the stylesheets do load, updateStyleSelector on the Document
+ // will do a full repaint().
+ if (layer->renderer().document().didLayoutWithPendingStylesheets() && !layer->isRootLayer() && !layer->renderer().isDocumentElementRenderer())
return true;
// Avoid painting all layers if the document is in a state where visual updates aren't allowed.
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (214332 => 214333)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -853,9 +853,6 @@
|| m_rareInheritedData->imageRendering != other.m_rareInheritedData->imageRendering)
return true;
- if (m_rareNonInheritedData->isNotFinal != other.m_rareNonInheritedData->isNotFinal)
- return true;
-
if (m_rareNonInheritedData->shapeOutside != other.m_rareNonInheritedData->shapeOutside)
return true;
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (214332 => 214333)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-03-24 03:20:18 UTC (rev 214333)
@@ -1653,9 +1653,8 @@
static Isolation initialIsolation() { return IsolationAuto; }
#endif
- // Indicates the style is likely to change due to a pending stylesheet load.
- bool isNotFinal() const { return m_rareNonInheritedData->isNotFinal; }
- void setIsNotFinal() { SET_VAR(m_rareNonInheritedData, isNotFinal, true); }
+ bool isPlaceholderStyle() const { return m_rareNonInheritedData->isPlaceholderStyle; }
+ void setIsPlaceholderStyle() { SET_VAR(m_rareNonInheritedData, isPlaceholderStyle, true); }
void setVisitedLinkColor(const Color&);
void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(m_rareNonInheritedData, visitedLinkBackgroundColor, v); }
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (214332 => 214333)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -107,7 +107,7 @@
, breakInside(RenderStyle::initialBreakInside())
, resize(RenderStyle::initialResize())
, hasAttrContent(false)
- , isNotFinal(false)
+ , isPlaceholderStyle(false)
{
maskBoxImage.setMaskDefaults();
}
@@ -200,7 +200,7 @@
, breakInside(o.breakInside)
, resize(o.resize)
, hasAttrContent(o.hasAttrContent)
- , isNotFinal(o.isNotFinal)
+ , isPlaceholderStyle(o.isPlaceholderStyle)
{
}
@@ -304,7 +304,7 @@
&& breakInside == o.breakInside
&& resize == o.resize
&& hasAttrContent == o.hasAttrContent
- && isNotFinal == o.isNotFinal;
+ && isPlaceholderStyle == o.isPlaceholderStyle;
}
bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& other) const
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (214332 => 214333)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2017-03-24 03:20:18 UTC (rev 214333)
@@ -220,7 +220,7 @@
unsigned hasAttrContent : 1;
- unsigned isNotFinal : 1;
+ unsigned isPlaceholderStyle : 1;
private:
StyleRareNonInheritedData();
Modified: trunk/Source/WebCore/style/StyleScope.cpp (214332 => 214333)
--- trunk/Source/WebCore/style/StyleScope.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/style/StyleScope.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -389,7 +389,7 @@
auto styleResolverUpdateType = hasInsertions ? Reset : Additive;
// If we are already parsing the body and so may have significant amount of elements, put some effort into trying to avoid style recalcs.
- if (!m_document.bodyOrFrameset() || m_document.hasNodesWithNonFinalStyle())
+ if (!m_document.bodyOrFrameset() || m_document.hasNodesWithPlaceholderStyle())
return styleResolverUpdateType;
StyleInvalidationAnalysis invalidationAnalysis(addedSheets, styleResolver.mediaQueryEvaluator());
@@ -440,7 +440,7 @@
// Don't bother updating, since we haven't loaded all our style info yet
// and haven't calculated the style resolver for the first time.
- if (!m_shadowRoot && !m_didUpdateActiveStyleSheets && hasPendingSheetsBeforeBody()) {
+ if (!m_shadowRoot && !m_didUpdateActiveStyleSheets && hasPendingSheets()) {
clearResolver();
return;
}
Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (214332 => 214333)
--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2017-03-24 02:28:33 UTC (rev 214332)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2017-03-24 03:20:18 UTC (rev 214333)
@@ -51,6 +51,24 @@
namespace Style {
+static std::unique_ptr<RenderStyle> makePlaceholderStyle(Document& document)
+{
+ auto placeholderStyle = RenderStyle::createPtr();
+ placeholderStyle->setDisplay(NONE);
+ placeholderStyle->setIsPlaceholderStyle();
+
+ FontCascadeDescription fontDescription;
+ fontDescription.setOneFamily(standardFamily);
+ fontDescription.setKeywordSizeFromIdentifier(CSSValueMedium);
+ float size = Style::fontSizeForKeyword(CSSValueMedium, false, document);
+ fontDescription.setSpecifiedSize(size);
+ fontDescription.setComputedSize(size);
+ placeholderStyle->setFontDescription(fontDescription);
+
+ placeholderStyle->fontCascade().update(&document.fontSelector());
+ return placeholderStyle;
+}
+
TreeResolver::TreeResolver(Document& document)
: m_document(document)
{
@@ -108,6 +126,11 @@
std::unique_ptr<RenderStyle> TreeResolver::styleForElement(Element& element, const RenderStyle& inheritedStyle)
{
+ if (m_didSeePendingStylesheet && !element.renderer() && !m_document.isIgnoringPendingStylesheets()) {
+ m_document.setHasNodesWithPlaceholderStyle();
+ return makePlaceholderStyle(m_document);
+ }
+
if (element.hasCustomStyleResolveCallbacks()) {
RenderStyle* shadowHostStyle = scope().shadowRoot ? m_update->elementStyle(*scope().shadowRoot->host()) : nullptr;
if (auto customStyle = element.resolveCustomStyle(inheritedStyle, shadowHostStyle)) {
@@ -168,25 +191,15 @@
ElementUpdate TreeResolver::resolveElement(Element& element)
{
- if (m_didSeePendingStylesheet && !element.renderer() && !m_document.isIgnoringPendingStylesheets()) {
- m_document.setHasNodesWithNonFinalStyle();
- return { };
- }
-
auto newStyle = styleForElement(element, parent().style);
if (!affectsRenderedSubtree(element, *newStyle))
return { };
+ auto update = createAnimatedElementUpdate(WTFMove(newStyle), element, parent().change);
+
auto* existingStyle = element.renderStyle();
- if (m_didSeePendingStylesheet && (!existingStyle || existingStyle->isNotFinal())) {
- newStyle->setIsNotFinal();
- m_document.setHasNodesWithNonFinalStyle();
- }
-
- auto update = createAnimatedElementUpdate(WTFMove(newStyle), element, parent().change);
-
if (&element == m_document.documentElement()) {
m_documentElementStyle = RenderStyle::clonePtr(*update.style);
scope().styleResolver.setOverrideDocumentElementStyle(m_documentElementStyle.get());
