| Index: third_party/WebKit/Source/core/timing/Performance.cpp
|
| diff --git a/third_party/WebKit/Source/core/timing/Performance.cpp b/third_party/WebKit/Source/core/timing/Performance.cpp
|
| index 7137b1a18193c88bebab5984ea8c3bb4c291ef9a..abae0a17e72d92f137232a2230b0c36c2ba35712 100644
|
| --- a/third_party/WebKit/Source/core/timing/Performance.cpp
|
| +++ b/third_party/WebKit/Source/core/timing/Performance.cpp
|
| @@ -100,16 +100,16 @@ static double toTimeOrigin(LocalFrame* frame) {
|
| }
|
|
|
| Performance::Performance(LocalFrame* frame)
|
| - : PerformanceBase(toTimeOrigin(frame)), DOMWindowProperty(frame) {}
|
| + : PerformanceBase(toTimeOrigin(frame)),
|
| + ContextLifecycleObserver(frame ? frame->document() : nullptr) {}
|
|
|
| Performance::~Performance() {
|
| if (frame())
|
| frame()->performanceMonitor()->unsubscribeAll(this);
|
| }
|
|
|
| -void Performance::frameDestroyed() {
|
| +void Performance::contextDestroyed() {
|
| frame()->performanceMonitor()->unsubscribeAll(this);
|
| - DOMWindowProperty::frameDestroyed();
|
| }
|
|
|
| ExecutionContext* Performance::getExecutionContext() const {
|
| @@ -161,7 +161,7 @@ ScriptValue Performance::toJSONForBinding(ScriptState* scriptState) const {
|
| DEFINE_TRACE(Performance) {
|
| visitor->trace(m_navigation);
|
| visitor->trace(m_timing);
|
| - DOMWindowProperty::trace(visitor);
|
| + ContextLifecycleObserver::trace(visitor);
|
| PerformanceBase::trace(visitor);
|
| PerformanceMonitor::Client::trace(visitor);
|
| }
|
|
|