Chromium Code Reviews| Index: Source/core/css/invalidation/DescendantInvalidationSet.cpp |
| diff --git a/Source/core/css/invalidation/DescendantInvalidationSet.cpp b/Source/core/css/invalidation/DescendantInvalidationSet.cpp |
| index 189882565a5ab123e12889f128a64ca8bb10b9f3..0de88406ea7c4f38fcaf3b05c7f2482251a4db46 100644 |
| --- a/Source/core/css/invalidation/DescendantInvalidationSet.cpp |
| +++ b/Source/core/css/invalidation/DescendantInvalidationSet.cpp |
| @@ -33,9 +33,24 @@ |
| #include "core/css/resolver/StyleResolver.h" |
| #include "core/dom/Element.h" |
| +#include "core/inspector/InspectorTraceEvents.h" |
| +#include "platform/TracedValue.h" |
| +#include "wtf/Compiler.h" |
| +#include "wtf/text/StringBuilder.h" |
| namespace blink { |
| +static const unsigned char* s_tracingEnabled = nullptr; |
| + |
| +#define TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART_IF_ENABLED(element, reason, singleSelectorPart) \ |
| + if (UNLIKELY(*s_tracingEnabled)) \ |
| + TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART(element, reason, singleSelectorPart); |
| + |
| +void DescendantInvalidationSet::cacheTracingFlag() |
| +{ |
| + s_tracingEnabled = TRACE_EVENT_API_GET_CATEGORY_ENABLED(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking")); |
| +} |
| + |
| DescendantInvalidationSet::DescendantInvalidationSet() |
| : m_allDescendantsMightBeInvalid(false) |
| , m_customPseudoInvalid(false) |
| @@ -48,24 +63,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_SELECTORPART_IF_ENABLED(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_SELECTORPART_IF_ENABLED(element, InvalidationSetMatchedId, element.idForStyleResolution()); |
| return true; |
| + } |
| if (element.hasClass() && m_classes) { |
| const SpaceSplitString& classNames = element.classNames(); |
| for (const auto& className : *m_classes) { |
| - if (classNames.contains(className)) |
| + if (classNames.contains(className)) { |
| + TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART_IF_ENABLED(element, InvalidationSetMatchedClass, className); |
| return true; |
| + } |
| } |
| } |
| if (element.hasAttributes() && m_attributes) { |
| for (const auto& attribute : *m_attributes) { |
| - if (element.hasAttribute(attribute)) |
| + if (element.hasAttribute(attribute)) { |
| + TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART_IF_ENABLED(element, InvalidationSetMatchedAttribute, attribute); |
| return true; |
| + } |
| } |
| } |
| @@ -189,33 +212,54 @@ void DescendantInvalidationSet::trace(Visitor* visitor) |
| #endif |
| } |
| -#ifndef NDEBUG |
| -void DescendantInvalidationSet::show() const |
| +void DescendantInvalidationSet::toTracedValue(TracedValue* value) const |
| { |
| - fprintf(stderr, "DescendantInvalidationSet { "); |
| + value->beginDictionary(); |
| + |
| if (m_allDescendantsMightBeInvalid) |
| - fprintf(stderr, "* "); |
| + value->setBoolean("allDescendantsMightBeInvalid", true); |
| if (m_customPseudoInvalid) |
| - fprintf(stderr, "::custom "); |
| + value->setBoolean("customPseudoInvalid", true); |
| if (m_treeBoundaryCrossing) |
| - fprintf(stderr, "::shadow/deep/ "); |
| + value->setBoolean("treeBoundaryCrossing", true); |
| + |
| if (m_ids) { |
| + value->beginArray("ids"); |
| for (const auto& id : *m_ids) |
| - fprintf(stderr, "#%s ", id.ascii().data()); |
| + value->pushString(id); |
| + value->endArray(); |
| } |
| + |
| if (m_classes) { |
| + value->beginArray("classes"); |
| for (const auto& className : *m_classes) |
| - fprintf(stderr, ".%s ", className.ascii().data()); |
| + value->pushString(className); |
| + value->endArray(); |
| } |
| + |
| if (m_tagNames) { |
| + value->beginArray("tagNames"); |
| for (const auto& tagName : *m_tagNames) |
| - fprintf(stderr, "<%s> ", tagName.ascii().data()); |
| + value->pushString(tagName); |
| + value->endArray(); |
| } |
| + |
| if (m_attributes) { |
| + value->beginArray("ids"); |
|
tasak
2014/10/14 04:35:53
Nit: attributes?
kouhei (in TOK)
2014/10/14 04:42:49
Indeed. Thanks for the catch!
|
| for (const auto& attribute : *m_attributes) |
| - fprintf(stderr, "[%s] ", attribute.ascii().data()); |
| + value->pushString(attribute); |
| + value->endArray(); |
| } |
| - fprintf(stderr, "}\n"); |
| + |
| + value->endDictionary(); |
| +} |
| + |
| +#ifndef NDEBUG |
| +void DescendantInvalidationSet::show() const |
| +{ |
| + RefPtr<TracedValue> value = TracedValue::create(); |
| + toTracedValue(value.get()); |
| + fprintf(stderr, "%s\n", value->asTraceFormat().ascii().data()); |
| } |
| #endif // NDEBUG |