Index: Source/core/frame/LocalDOMWindow.cpp |
diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp |
index 4c418fe7af9bad03d3bcf06d6fabc33475395ba9..2d84951bead700acfccc160b9f3e06cd50b9b9d6 100644 |
--- a/Source/core/frame/LocalDOMWindow.cpp |
+++ b/Source/core/frame/LocalDOMWindow.cpp |
@@ -643,13 +643,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 |
+ resetLocation(); |
+ |
LocalDOMWindow::notifyContextDestroyed(); |
} |
@@ -783,13 +784,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()) |
@@ -1832,7 +1826,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); |