Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(682)

Unified Diff: third_party/WebKit/Source/core/frame/DOMWindow.cpp

Issue 1374533002: Null out LocalDOMWindow::m_frame on navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try to fix crash-on-querying-event-path.html Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/DOMWindow.cpp
diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.cpp b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
index b514d469fe941be440f78783a670567f6b5e445a..9db02c90ab4c773cf4b08ae3d073bb313a219816 100644
--- a/third_party/WebKit/Source/core/frame/DOMWindow.cpp
+++ b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
@@ -120,7 +120,9 @@ DOMWindow* DOMWindow::anonymousIndexedGetter(uint32_t index) const
bool DOMWindow::isCurrentlyDisplayedInFrame() const
{
- return frame() && frame()->domWindow() == this && frame()->host();
+ if (frame())
+ RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(frame()->domWindow() == this);
+ return frame() && frame()->host();
}
bool DOMWindow::isInsecureScriptAccess(LocalDOMWindow& callingWindow, const String& urlString)

Powered by Google App Engine
This is Rietveld 408576698