forked from mirrors/gecko-dev
93173eaebd
The reasoning behind this is that with this change, removing a non-dynamic docshell from the document dynamically shouldn't affect the indexes which we use for both recording and restoring data in child docshells. MozReview-Commit-ID: JIK8GBSWDEF * * * fixup From c2cb8e33211348c36b1ce18bb62e6465fa46d3ae Mon Sep 17 00:00:00 2001
126 lines
3.4 KiB
C++
126 lines
3.4 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsSessionStoreUtils.h"
|
|
|
|
#include "mozilla/dom/Event.h"
|
|
#include "nsPIDOMWindow.h"
|
|
#include "nsIDocShell.h"
|
|
|
|
using namespace mozilla::dom;
|
|
|
|
namespace {
|
|
|
|
class DynamicFrameEventFilter final : public nsIDOMEventListener
|
|
{
|
|
public:
|
|
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
|
NS_DECL_CYCLE_COLLECTION_CLASS(DynamicFrameEventFilter)
|
|
|
|
explicit DynamicFrameEventFilter(nsIDOMEventListener* aListener)
|
|
: mListener(aListener)
|
|
{ }
|
|
|
|
NS_IMETHODIMP HandleEvent(nsIDOMEvent* aEvent) override
|
|
{
|
|
if (mListener && TargetInNonDynamicDocShell(aEvent)) {
|
|
mListener->HandleEvent(aEvent);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
~DynamicFrameEventFilter() { }
|
|
|
|
bool TargetInNonDynamicDocShell(nsIDOMEvent* aEvent)
|
|
{
|
|
EventTarget* target = aEvent->InternalDOMEvent()->GetTarget();
|
|
if (!target) {
|
|
return false;
|
|
}
|
|
|
|
nsPIDOMWindowOuter* outer = target->GetOwnerGlobalForBindings();
|
|
if (!outer) {
|
|
return false;
|
|
}
|
|
|
|
nsIDocShell* docShell = outer->GetDocShell();
|
|
if (!docShell) {
|
|
return false;
|
|
}
|
|
|
|
bool isDynamic = false;
|
|
nsresult rv = docShell->GetCreatedDynamically(&isDynamic);
|
|
return NS_SUCCEEDED(rv) && !isDynamic;
|
|
}
|
|
|
|
nsCOMPtr<nsIDOMEventListener> mListener;
|
|
};
|
|
|
|
NS_IMPL_CYCLE_COLLECTION(DynamicFrameEventFilter, mListener)
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DynamicFrameEventFilter)
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(DynamicFrameEventFilter)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(DynamicFrameEventFilter)
|
|
|
|
} // anonymous namespace
|
|
|
|
NS_IMPL_ISUPPORTS(nsSessionStoreUtils, nsISessionStoreUtils)
|
|
|
|
NS_IMETHODIMP
|
|
nsSessionStoreUtils::ForEachNonDynamicChildFrame(mozIDOMWindowProxy* aWindow,
|
|
nsISessionStoreUtilsFrameCallback* aCallback)
|
|
{
|
|
NS_ENSURE_TRUE(aWindow, NS_ERROR_INVALID_ARG);
|
|
|
|
nsCOMPtr<nsPIDOMWindowOuter> outer = nsPIDOMWindowOuter::From(aWindow);
|
|
NS_ENSURE_TRUE(outer, NS_ERROR_FAILURE);
|
|
|
|
nsCOMPtr<nsIDocShell> docShell = outer->GetDocShell();
|
|
NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
|
|
|
|
int32_t length;
|
|
nsresult rv = docShell->GetChildCount(&length);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
for (int32_t i = 0; i < length; ++i) {
|
|
nsCOMPtr<nsIDocShellTreeItem> item;
|
|
docShell->GetChildAt(i, getter_AddRefs(item));
|
|
NS_ENSURE_TRUE(item, NS_ERROR_FAILURE);
|
|
|
|
nsCOMPtr<nsIDocShell> childDocShell(do_QueryInterface(item));
|
|
NS_ENSURE_TRUE(childDocShell, NS_ERROR_FAILURE);
|
|
|
|
bool isDynamic = false;
|
|
nsresult rv = childDocShell->GetCreatedDynamically(&isDynamic);
|
|
if (NS_SUCCEEDED(rv) && isDynamic) {
|
|
continue;
|
|
}
|
|
|
|
int32_t childOffset = 0;
|
|
rv = childDocShell->GetChildOffset(&childOffset);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
aCallback->HandleFrame(item->GetWindow(), childOffset);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsSessionStoreUtils::CreateDynamicFrameEventFilter(nsIDOMEventListener* aListener,
|
|
nsIDOMEventListener** aResult)
|
|
{
|
|
NS_ENSURE_TRUE(aListener, NS_ERROR_INVALID_ARG);
|
|
|
|
nsCOMPtr<nsIDOMEventListener> filter(new DynamicFrameEventFilter(aListener));
|
|
filter.forget(aResult);
|
|
|
|
return NS_OK;
|
|
}
|