Index: Source/core/frame/LocalDOMWindow.cpp |
diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp |
index 21ea7a4fd548428bda10d12abae0ed2e024e0215..b1333ea07cd107f7e82e756766deaef6d53e4e1b 100644 |
--- a/Source/core/frame/LocalDOMWindow.cpp |
+++ b/Source/core/frame/LocalDOMWindow.cpp |
@@ -632,13 +632,14 @@ void LocalDOMWindow::reset() |
m_console = nullptr; |
m_navigator = nullptr; |
m_performance = nullptr; |
- m_location = nullptr; |
m_media = nullptr; |
m_applicationCache = nullptr; |
#if ENABLE(ASSERT) |
m_hasBeenReset = true; |
#endif |
+ DOMWindow::reset(); |
+ |
LocalDOMWindow::notifyContextDestroyed(); |
} |
@@ -772,13 +773,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()) |
@@ -1817,7 +1811,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); |