From 273e8f71a3e785a03caab4759ea50d3427f911ef Mon Sep 17 00:00:00 2001 From: Bill McCloskey Date: Wed, 21 Jan 2015 16:19:07 -0800 Subject: [PATCH] Bug 1123008 - Make loadContext.topFrameElement work in non-e10s (r=smaug) --- docshell/base/nsDocShell.cpp | 13 ++++++++++--- docshell/base/nsILoadContext.idl | 7 +++++-- toolkit/devtools/webconsole/network-helper.js | 6 ++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 7c9cb71452e7..5e472872451b 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -12871,9 +12871,16 @@ nsDocShell::GetTopFrameElement(nsIDOMElement** aElement) win->GetScriptableTop(getter_AddRefs(top)); NS_ENSURE_TRUE(top, NS_ERROR_FAILURE); - // GetFrameElement, /not/ GetScriptableFrameElement -- if |top| is inside - //