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

Unified Diff: Source/core/css/invalidation/DescendantInvalidationSet.cpp

Issue 580373002: [Invalidation Tracking] Trace StyleInvalidator setNeedsStyleRecalc (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: minimize diff Created 6 years, 3 months 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/css/invalidation/DescendantInvalidationSet.cpp
diff --git a/Source/core/css/invalidation/DescendantInvalidationSet.cpp b/Source/core/css/invalidation/DescendantInvalidationSet.cpp
index 232f3cfe9b14348d607baf9ee7162d9ea459874d..4b20946b00ece2d98d5a2ed7f39a3e966ac5584c 100644
--- a/Source/core/css/invalidation/DescendantInvalidationSet.cpp
+++ b/Source/core/css/invalidation/DescendantInvalidationSet.cpp
@@ -33,6 +33,8 @@
#include "core/css/resolver/StyleResolver.h"
#include "core/dom/Element.h"
+#include "core/inspector/InspectorTraceEvents.h"
+#include "wtf/text/StringBuilder.h"
namespace blink {
@@ -48,24 +50,32 @@ bool DescendantInvalidationSet::invalidatesElement(Element& element) const
if (m_allDescendantsMightBeInvalid)
return true;
- if (m_tagNames && m_tagNames->contains(element.tagQName().localName()))
+ if (m_tagNames && m_tagNames->contains(element.tagQName().localName())) {
+ TRACE_STYLE_INVALIDATOR_INVALIDATION_EXTRADATA(element, InvalidationSetMatchedTagName, element.tagQName().localName());
return true;
+ }
- if (element.hasID() && m_ids && m_ids->contains(element.idForStyleResolution()))
+ if (element.hasID() && m_ids && m_ids->contains(element.idForStyleResolution())) {
+ TRACE_STYLE_INVALIDATOR_INVALIDATION_EXTRADATA(element, InvalidationSetMatchedId, element.idForStyleResolution());
return true;
+ }
if (element.hasClass() && m_classes) {
const SpaceSplitString& classNames = element.classNames();
for (WillBeHeapHashSet<AtomicString>::const_iterator it = m_classes->begin(); it != m_classes->end(); ++it) {
- if (classNames.contains(*it))
+ if (classNames.contains(*it)) {
+ TRACE_STYLE_INVALIDATOR_INVALIDATION_EXTRADATA(element, InvalidationSetMatchedClass, *it);
return true;
+ }
}
}
if (element.hasAttributes() && m_attributes) {
for (WillBeHeapHashSet<AtomicString>::const_iterator it = m_attributes->begin(); it != m_attributes->end(); ++it) {
- if (element.hasAttribute(*it))
+ if (element.hasAttribute(*it)) {
+ TRACE_STYLE_INVALIDATOR_INVALIDATION_EXTRADATA(element, InvalidationSetMatchedAttribute, *it);
return true;
+ }
}
}
@@ -193,33 +203,53 @@ void DescendantInvalidationSet::trace(Visitor* visitor)
#endif
}
-#ifndef NDEBUG
-void DescendantInvalidationSet::show() const
+String DescendantInvalidationSet::toString() const
{
- fprintf(stderr, "DescendantInvalidationSet { ");
+ StringBuilder builder;
+ builder.append("DescendantInvalidationSet { ");
if (m_allDescendantsMightBeInvalid)
- fprintf(stderr, "* ");
+ builder.append("* ");
if (m_customPseudoInvalid)
- fprintf(stderr, "::custom ");
+ builder.append("::custom ");
if (m_treeBoundaryCrossing)
- fprintf(stderr, "::shadow/deep/ ");
+ builder.append("::shadow/deep/ ");
if (m_ids) {
- for (WillBeHeapHashSet<AtomicString>::const_iterator it = m_ids->begin(); it != m_ids->end(); ++it)
- fprintf(stderr, "#%s ", (*it).ascii().data());
+ for (const auto& id : *m_ids) {
+ builder.append("#");
+ builder.append(id);
+ builder.append(" ");
+ }
}
if (m_classes) {
- for (WillBeHeapHashSet<AtomicString>::const_iterator it = m_classes->begin(); it != m_classes->end(); ++it)
- fprintf(stderr, ".%s ", (*it).ascii().data());
+ for (const auto& className : *m_classes) {
+ builder.append(".");
+ builder.append(className);
+ builder.append(" ");
+ }
}
if (m_tagNames) {
- for (WillBeHeapHashSet<AtomicString>::const_iterator it = m_tagNames->begin(); it != m_tagNames->end(); ++it)
- fprintf(stderr, "<%s> ", (*it).ascii().data());
+ for (const auto& tagName : *m_tagNames) {
+ builder.append("<");
+ builder.append(tagName);
+ builder.append("> ");
+ }
}
if (m_attributes) {
- for (WillBeHeapHashSet<AtomicString>::const_iterator it = m_attributes->begin(); it != m_attributes->end(); ++it)
- fprintf(stderr, "[%s] ", (*it).ascii().data());
+ for (const auto& attribute : *m_attributes) {
+ builder.append("[");
+ builder.append(attribute);
+ builder.append("] ");
+ }
}
- fprintf(stderr, "}\n");
+ builder.append("}");
+
+ return builder.toString();
+}
+
+#ifndef NDEBUG
+void DescendantInvalidationSet::show() const
+{
+ fprintf(stderr, "%s\n", toString().ascii().data());
}
#endif // NDEBUG

Powered by Google App Engine
This is Rietveld 408576698