Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Unified Diff: Source/core/dom/Node.cpp

Issue 684633006: Reattach whitespace siblings only when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/Node.cpp
diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp
index 60e09a205ed5da49f28b78bc9f696885e66f7f40..c5cda1929e190464d847b43d4e94ebd1504c2541 100644
--- a/Source/core/dom/Node.cpp
+++ b/Source/core/dom/Node.cpp
@@ -953,17 +953,22 @@ void Node::detach(const AttachContext& context)
#endif
}
-void Node::reattachWhitespaceSiblings(Text* start)
+void Node::reattachWhitespaceSiblingsIfNeeded(Text* start)
{
+ if (!start)
+ return;
+
+ RenderObject* parentRenderer = NodeRenderingTraversal::parent(start)->renderer();
esprehn 2014/11/04 22:03:55 This function can probably be called in situations
+ ASSERT(parentRenderer && parentRenderer->style());
esprehn 2014/11/04 22:03:55 asserting ->style() on a RenderObject doesn't make
for (Node* sibling = start; sibling; sibling = sibling->nextSibling()) {
if (sibling->isTextNode() && toText(sibling)->containsOnlyWhitespace()) {
bool hadRenderer = !!sibling->renderer();
- sibling->reattach();
- // If the reattach didn't toggle the visibility of the whitespace we don't
- // need to continue reattaching siblings since they won't toggle visibility
- // either.
- if (hadRenderer == !!sibling->renderer())
+ bool rendererIsNeeded = toText(sibling)->textRendererIsNeeded(*parentRenderer->style(), *parentRenderer);
esprehn 2014/11/04 22:03:55 This is going to be a perf regression, calling tex
Xianzhu 2014/11/05 01:30:13 To avoid the twice calling to textRendererIsNeeded
+ // If rendererIsNeeded didn't change we don't need to continue checking
+ // siblings since their rendererIsNeeded won't change either.
+ if (hadRenderer == rendererIsNeeded)
return;
+ sibling->reattach();
} else if (sibling->renderer()) {
return;
}
« no previous file with comments | « Source/core/dom/Node.h ('k') | Source/core/dom/Text.cpp » ('j') | Source/core/dom/Text.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698