| Index: third_party/WebKit/Source/core/frame/PerformanceMonitor.h
|
| diff --git a/third_party/WebKit/Source/core/frame/PerformanceMonitor.h b/third_party/WebKit/Source/core/frame/PerformanceMonitor.h
|
| index 813ddaed3a049afe86a67df92915ce828622e590..1c705d4de8848263d18b85cab9d47c502d74288b 100644
|
| --- a/third_party/WebKit/Source/core/frame/PerformanceMonitor.h
|
| +++ b/third_party/WebKit/Source/core/frame/PerformanceMonitor.h
|
| @@ -57,10 +57,10 @@ class CORE_EXPORT PerformanceMonitor final
|
|
|
| class CORE_EXPORT Client : public GarbageCollectedMixin {
|
| public:
|
| - virtual void reportLongTask(
|
| - double startTime,
|
| - double endTime,
|
| - const HeapHashSet<Member<Frame>>& contextFrames){};
|
| + virtual void reportLongTask(double startTime,
|
| + double endTime,
|
| + ExecutionContext* taskContext,
|
| + bool hasMultipleContexts){};
|
| virtual void reportLongLayout(double duration){};
|
| virtual void reportGenericViolation(Violation,
|
| const String& text,
|
| @@ -89,6 +89,7 @@ class CORE_EXPORT PerformanceMonitor final
|
| // Direct API for core.
|
| void subscribe(Violation, double threshold, Client*);
|
| void unsubscribeAll(Client*);
|
| + void shutdown();
|
|
|
| explicit PerformanceMonitor(LocalFrame*);
|
| ~PerformanceMonitor();
|
| @@ -104,10 +105,10 @@ class CORE_EXPORT PerformanceMonitor final
|
|
|
| void updateInstrumentation();
|
|
|
| - void innerWillExecuteScript(ExecutionContext*);
|
| - void didExecuteScript();
|
| - void innerWillCallFunction(ExecutionContext*);
|
| - void didCallFunction(v8::Local<v8::Function>);
|
| + void alwaysWillExecuteScript(ExecutionContext*);
|
| + void alwaysDidExecuteScript();
|
| + void alwaysWillCallFunction(ExecutionContext*);
|
| + void alwaysDidCallFunction(v8::Local<v8::Function>);
|
| void willUpdateLayout();
|
| void didUpdateLayout();
|
| void willRecalculateStyle();
|
| @@ -146,7 +147,8 @@ class CORE_EXPORT PerformanceMonitor final
|
| double m_thresholds[kAfterLast];
|
|
|
| Member<LocalFrame> m_localRoot;
|
| - HeapHashSet<Member<Frame>> m_frameContexts;
|
| + Member<ExecutionContext> m_taskExecutionContext;
|
| + bool m_taskHasMultipleContexts = false;
|
| using ClientThresholds = HeapHashMap<Member<Client>, double>;
|
| HeapHashMap<Violation,
|
| Member<ClientThresholds>,
|
|
|