Index: Source/core/inspector/InspectorTraceEvents.h |
diff --git a/Source/core/inspector/InspectorTraceEvents.h b/Source/core/inspector/InspectorTraceEvents.h |
index 62b9d77f9afea4f01d73231da2aad4fadb941842..e3d92c9b269103437e9482b07702800b02aa56df 100644 |
--- a/Source/core/inspector/InspectorTraceEvents.h |
+++ b/Source/core/inspector/InspectorTraceEvents.h |
@@ -16,7 +16,7 @@ |
namespace blink { |
class Animation; |
class CSSStyleSheetResource; |
-class DescendantInvalidationSet; |
+class InvalidationSet; |
class Document; |
class Element; |
class Event; |
@@ -44,6 +44,8 @@ class TracedValue; |
class WorkerThread; |
class XMLHttpRequest; |
+using InvalidationSetVector = WillBeHeapVector<RefPtrWillBeMember<InvalidationSet>, 8>; |
+ |
class InspectorLayoutEvent { |
STATIC_ONLY(InspectorLayoutEvent); |
public: |
@@ -59,13 +61,13 @@ public: |
static const char Id[]; |
static const char Pseudo[]; |
- static PassRefPtr<TraceEvent::ConvertableToTraceFormat> attributeChange(Element&, const DescendantInvalidationSet&, const QualifiedName&); |
- static PassRefPtr<TraceEvent::ConvertableToTraceFormat> classChange(Element&, const DescendantInvalidationSet&, const AtomicString&); |
- static PassRefPtr<TraceEvent::ConvertableToTraceFormat> idChange(Element&, const DescendantInvalidationSet&, const AtomicString&); |
- static PassRefPtr<TraceEvent::ConvertableToTraceFormat> pseudoChange(Element&, const DescendantInvalidationSet&, CSSSelector::PseudoType); |
+ static PassRefPtr<TraceEvent::ConvertableToTraceFormat> attributeChange(Element&, const InvalidationSet&, const QualifiedName&); |
+ static PassRefPtr<TraceEvent::ConvertableToTraceFormat> classChange(Element&, const InvalidationSet&, const AtomicString&); |
+ static PassRefPtr<TraceEvent::ConvertableToTraceFormat> idChange(Element&, const InvalidationSet&, const AtomicString&); |
+ static PassRefPtr<TraceEvent::ConvertableToTraceFormat> pseudoChange(Element&, const InvalidationSet&, CSSSelector::PseudoType); |
private: |
- static PassRefPtr<TracedValue> fillCommonPart(Element&, const DescendantInvalidationSet&, const char* invalidatedSelector); |
+ static PassRefPtr<TracedValue> fillCommonPart(Element&, const InvalidationSet&, const char* invalidatedSelector); |
}; |
#define TRACE_SCHEDULE_STYLE_INVALIDATION(element, invalidationSet, changeType, ...) \ |
@@ -82,7 +84,7 @@ public: |
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(Node*, const StyleChangeReasonForTracing&); |
}; |
-String descendantInvalidationSetToIdString(const DescendantInvalidationSet&); |
+String descendantInvalidationSetToIdString(const InvalidationSet&); |
class InspectorStyleInvalidatorInvalidateEvent { |
STATIC_ONLY(InspectorStyleInvalidatorInvalidateEvent); |
@@ -96,8 +98,8 @@ public: |
static const char PreventStyleSharingForParent[]; |
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(Element&, const char* reason); |
- static PassRefPtr<TraceEvent::ConvertableToTraceFormat> selectorPart(Element&, const char* reason, const DescendantInvalidationSet&, const String&); |
- static PassRefPtr<TraceEvent::ConvertableToTraceFormat> invalidationList(Element&, const WillBeHeapVector<RefPtrWillBeMember<DescendantInvalidationSet> >&); |
+ static PassRefPtr<TraceEvent::ConvertableToTraceFormat> selectorPart(Element&, const char* reason, const InvalidationSet&, const String&); |
+ static PassRefPtr<TraceEvent::ConvertableToTraceFormat> invalidationList(Element&, const InvalidationSetVector&); |
private: |
static PassRefPtr<TracedValue> fillCommonPart(Element&, const char* reason); |