| Index: Source/core/frame/LocalDOMWindow.cpp
|
| diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp
|
| index c10d324c965985153d8efb6d241f5bb3396ea0ec..5a36116da25b17f47fcfc8bd9dc86438315ced2d 100644
|
| --- a/Source/core/frame/LocalDOMWindow.cpp
|
| +++ b/Source/core/frame/LocalDOMWindow.cpp
|
| @@ -611,32 +611,9 @@ void LocalDOMWindow::willDetachFrameHost()
|
| LocalDOMWindow::notifyContextDestroyed();
|
| }
|
|
|
| -void LocalDOMWindow::willDestroyDocumentInFrame()
|
| -{
|
| - for (const auto& domWindowProperty : m_properties)
|
| - domWindowProperty->willDestroyGlobalObjectInFrame();
|
| -}
|
| -
|
| -void LocalDOMWindow::willDetachDocumentFromFrame()
|
| -{
|
| - for (const auto& domWindowProperty : m_properties)
|
| - domWindowProperty->willDetachGlobalObjectFromFrame();
|
| -}
|
| -
|
| -void LocalDOMWindow::registerProperty(DOMWindowProperty* property)
|
| -{
|
| - m_properties.add(property);
|
| -}
|
| -
|
| -void LocalDOMWindow::unregisterProperty(DOMWindowProperty* property)
|
| -{
|
| - m_properties.remove(property);
|
| -}
|
| -
|
| void LocalDOMWindow::reset()
|
| {
|
| - willDestroyDocumentInFrame();
|
| - m_properties.clear();
|
| + DOMWindow::reset();
|
|
|
| m_screen = nullptr;
|
| m_history = nullptr;
|
| @@ -649,7 +626,6 @@ void LocalDOMWindow::reset()
|
| m_console = nullptr;
|
| m_navigator = nullptr;
|
| m_performance = nullptr;
|
| - m_location = nullptr;
|
| m_media = nullptr;
|
| m_applicationCache = nullptr;
|
| #if ENABLE(ASSERT)
|
| @@ -789,13 +765,6 @@ Performance* LocalDOMWindow::performance() const
|
| return m_performance.get();
|
| }
|
|
|
| -Location* LocalDOMWindow::location() const
|
| -{
|
| - if (!m_location)
|
| - m_location = Location::create(frame());
|
| - return m_location.get();
|
| -}
|
| -
|
| void LocalDOMWindow::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, const String& targetOrigin, LocalDOMWindow* source, ExceptionState& exceptionState)
|
| {
|
| if (!isCurrentlyDisplayedInFrame())
|
| @@ -1834,7 +1803,6 @@ void LocalDOMWindow::trace(Visitor* visitor)
|
| visitor->trace(m_toolbar);
|
| visitor->trace(m_console);
|
| visitor->trace(m_navigator);
|
| - visitor->trace(m_location);
|
| visitor->trace(m_media);
|
| visitor->trace(m_applicationCache);
|
| visitor->trace(m_performance);
|
|
|