Index: Source/core/dom/Element.cpp |
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp |
index 86a23892c2470b09a4449fbc7a2e06e2ec105089..2b933e18b200d4d2e221c0641fb45c7bb8a2de42 100644 |
--- a/Source/core/dom/Element.cpp |
+++ b/Source/core/dom/Element.cpp |
@@ -1324,10 +1324,6 @@ void Element::attach(const AttachContext& context) |
data->resetStyleState(); |
} |
- // FIXME: Remove this once we lazyAttach everywhere. |
- if (!document().inStyleRecalc() && (this == document().documentElement() || this == document().body())) |
- document().setNeedsStyleRecalc(LocalStyleChange); |
- |
NodeRenderingContext(this, context.resolvedStyle).createRendererForElementIfNeeded(); |
createPseudoElementIfNeeded(BEFORE); |
@@ -1353,11 +1349,7 @@ void Element::attach(const AttachContext& context) |
} |
} |
- // FIXME: It doesn't appear safe to call didRecalculateStyleForElement when |
- // not in a Document::recalcStyle. Since we're hopefully going to always |
- // lazyAttach in the future that problem should go away. |
- if (document().inStyleRecalc()) |
ojan
2013/09/08 23:02:56
Can we assert that we're in style recalc at the to
|
- InspectorInstrumentation::didRecalculateStyleForElement(this); |
+ InspectorInstrumentation::didRecalculateStyleForElement(this); |
} |
void Element::unregisterNamedFlowContentNode() |
@@ -1766,18 +1758,12 @@ void Element::removeAllEventListeners() |
void Element::beginParsingChildren() |
{ |
clearIsParsingChildrenFinished(); |
- StyleResolver* styleResolver = document().styleResolverIfExists(); |
- if (styleResolver && attached()) |
- styleResolver->pushParentElement(this); |
} |
void Element::finishParsingChildren() |
{ |
- ContainerNode::finishParsingChildren(); |
setIsParsingChildrenFinished(); |
checkForSiblingStyleChanges(this, renderStyle(), true, lastChild(), 0, 0); |
- if (StyleResolver* styleResolver = document().styleResolverIfExists()) |
- styleResolver->popParentElement(this); |
if (isCustomElement()) |
CustomElement::didFinishParsingChildren(this); |
} |