Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-08 12:22:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 86e87b18a282 (bug 1451455) for mochitest failures at dom/html/test/test_ignoreuserfocus.html on a CLOSED TREE

Browse Source
This commit is contained in:
Coroiu Cristina 2019-06-04 01:23:12 +03:00
parent 27a615f9f1
commit d075308d70
10 changed files with 19 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
dom/base/nsGlobalWindowInner.cpp
View File

@ -261,7 +261,6 @@
#include "mozilla/dom/ClientState.h"
#include "mozilla/dom/WindowGlobalChild.h"
#include "mozilla/dom/BrowserChild.h"
#include "mozilla/net/CookieSettings.h"
@ -1918,54 +1917,6 @@ bool nsGlobalWindowInner::DialogsAreBeingAbused() {
return false;
}
void nsGlobalWindowInner::FireFrameLoadEvent(bool aIsTrusted) {
// If we're not in a content frame, or are at a BrowsingContext tree boundary,
// such as the content-chrome boundary, don't fire the "load" event.
if (!GetBrowsingContext()->GetParent() ||
!GetBrowsingContext()->IsContent()) {
return;
}
// If embedder is same-process, fire the event on our embedder element.
//
// XXX: Bug 1440212 is looking into potentially changing this behaviour to act
// more like the remote case when in-process.
RefPtr<Element> element = GetBrowsingContext()->GetEmbedderElement();
if (element) {
nsEventStatus status = nsEventStatus_eIgnore;
WidgetEvent event(aIsTrusted, eLoad);
event.mFlags.mBubbles = false;
event.mFlags.mCancelable = false;
// Most of the time we could get a pres context to pass in here,
// but not always (i.e. if this window is not shown there won't
// be a pres context available). Since we're not firing a GUI
// event we don't need a pres context anyway so we just pass
// null as the pres context all the time here.
EventDispatcher::Dispatch(element, nullptr, &event, nullptr, &status);
return;
}
// We don't have an in-process embedder. Try to get our `BrowserChild` actor
// to send a message to that embedder. We want to double-check that our outer
// window is actually the one at the root of this browserChild though, just in
// case.
RefPtr<BrowserChild> browserChild =
BrowserChild::GetFrom(static_cast<nsPIDOMWindowInner*>(this));
if (browserChild) {
// Double-check that our outer window is actually at the root of this
// `BrowserChild`, in case we're in an odd maybe-unhosted situation like a
// print preview dialog.
nsCOMPtr<nsPIDOMWindowOuter> rootOuter =
do_GetInterface(browserChild->WebNavigation());
if (!rootOuter || rootOuter != GetOuterWindow()) {
return;
}
mozilla::Unused << browserChild->SendFireFrameLoadEvent(aIsTrusted);
}
}
nsresult nsGlobalWindowInner::PostHandleEvent(EventChainPostVisitor& aVisitor) {
// Return early if there is nothing to do.
switch (aVisitor.mEvent->mMessage) {
@ -2026,7 +1977,25 @@ nsresult nsGlobalWindowInner::PostHandleEvent(EventChainPostVisitor& aVisitor) {
mTimeoutManager->OnDocumentLoaded();
FireFrameLoadEvent(aVisitor.mEvent->IsTrusted());
nsCOMPtr<Element> element = GetOuterWindow()->GetFrameElementInternal();
nsIDocShell* docShell = GetDocShell();
if (element && GetParentInternal() && docShell &&
docShell->ItemType() != nsIDocShellTreeItem::typeChrome) {
// If we're not in chrome, or at a chrome boundary, fire the
// onload event for the frame element.
nsEventStatus status = nsEventStatus_eIgnore;
WidgetEvent event(aVisitor.mEvent->IsTrusted(), eLoad);
event.mFlags.mBubbles = false;
event.mFlags.mCancelable = false;
// Most of the time we could get a pres context to pass in here,
// but not always (i.e. if this window is not shown there won't
// be a pres context available). Since we're not firing a GUI
// event we don't need a pres context anyway so we just pass
// null as the pres context all the time here.
EventDispatcher::Dispatch(element, nullptr, &event, nullptr, &status);
}
if (mVREventObserver) {
mVREventObserver->NotifyAfterLoad();
@ -7113,7 +7082,6 @@ nsPIDOMWindowInner::nsPIDOMWindowInner(nsPIDOMWindowOuter* aOuterWindow)
mNumOfOpenWebSockets(0),
mEvent(nullptr) {
MOZ_ASSERT(aOuterWindow);
mBrowsingContext = aOuterWindow->GetBrowsingContext();
}
void nsPIDOMWindowInner::RegisterReportingObserver(ReportingObserver* aObserver,

3
dom/base/nsGlobalWindowInner.h
View File

@ -1197,9 +1197,6 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
// activation flag.
bool ShouldResetBrowsingContextUserGestureActivation();
// Try to fire the "load" event on our content embedder if we're an iframe.
void FireFrameLoadEvent(bool aIsTrusted);
public:
// Dispatch a runnable related to the global.
virtual nsresult Dispatch(mozilla::TaskCategory aCategory,

7
dom/base/nsPIDOMWindow.h
View File

@ -388,11 +388,6 @@ class nsPIDOMWindowInner : public mozIDOMWindow {
*/
inline nsIDocShell* GetDocShell() const;
/**
* Get the browsing context in this window.
*/
inline mozilla::dom::BrowsingContext* GetBrowsingContext() const;
/**
* Call this to indicate that some node (this window, its document,
* or content in that document) has a paint event listener.
@ -632,8 +627,6 @@ class nsPIDOMWindowInner : public mozIDOMWindow {
RefPtr<mozilla::dom::TabGroup> mTabGroup;
RefPtr<mozilla::dom::BrowsingContext> mBrowsingContext;
// A unique (as long as our 64-bit counter doesn't roll over) id for
// this window.
uint64_t mWindowID;

4
dom/base/nsPIDOMWindowInlines.h
View File

@ -72,10 +72,6 @@ mozilla::dom::BrowsingContext* nsPIDOMWindowOuter::GetBrowsingContext() const {
return mBrowsingContext;
}
mozilla::dom::BrowsingContext* nsPIDOMWindowInner::GetBrowsingContext() const {
return mBrowsingContext;
}
mozilla::dom::Element* nsPIDOMWindowOuter::GetFocusedElement() const {
return mInnerWindow ? mInnerWindow->GetFocusedElement() : nullptr;
}

17
dom/ipc/BrowserBridgeChild.cpp
View File

@ -138,23 +138,6 @@ BrowserBridgeChild::RecvSetEmbeddedDocAccessibleCOMProxy(
return IPC_OK();
}
mozilla::ipc::IPCResult BrowserBridgeChild::RecvFireFrameLoadEvent(
bool aIsTrusted) {
RefPtr<Element> owner = mFrameLoader->GetOwnerContent();
if (!owner) {
return IPC_OK();
}
// Fire the `load` event on our embedder element.
nsEventStatus status = nsEventStatus_eIgnore;
WidgetEvent event(aIsTrusted, eLoad);
event.mFlags.mBubbles = false;
event.mFlags.mCancelable = false;
EventDispatcher::Dispatch(owner, nullptr, &event, nullptr, &status);
return IPC_OK();
}
void BrowserBridgeChild::ActorDestroy(ActorDestroyReason aWhy) {
mIPCOpen = false;
}

2
dom/ipc/BrowserBridgeChild.h
View File

@ -77,8 +77,6 @@ class BrowserBridgeChild : public PBrowserBridgeChild {
mozilla::ipc::IPCResult RecvSetEmbeddedDocAccessibleCOMProxy(
const IDispatchHolder& aCOMProxy);
mozilla::ipc::IPCResult RecvFireFrameLoadEvent(bool aIsTrusted);
void ActorDestroy(ActorDestroyReason aWhy) override;
private:

11
dom/ipc/BrowserParent.cpp
View File

@ -3684,17 +3684,6 @@ mozilla::ipc::IPCResult BrowserParent::RecvGetSystemFont(nsCString* aFontName) {
return IPC_OK();
}
mozilla::ipc::IPCResult BrowserParent::RecvFireFrameLoadEvent(bool aIsTrusted) {
BrowserBridgeParent* bridge = GetBrowserBridgeParent();
if (!bridge) {
NS_WARNING("Received `load` event on unbridged BrowserParent!");
return IPC_OK();
}
Unused << bridge->SendFireFrameLoadEvent(aIsTrusted);
return IPC_OK();
}
NS_IMETHODIMP
FakeChannel::OnAuthAvailable(nsISupports* aContext,
nsIAuthInformation* aAuthInfo) {

2
dom/ipc/BrowserParent.h
View File

@ -751,8 +751,6 @@ class BrowserParent final : public PBrowserParent,
mozilla::ipc::IPCResult RecvQueryVisitedState(
InfallibleTArray<URIParams>&& aURIs);
mozilla::ipc::IPCResult RecvFireFrameLoadEvent(bool aIsTrusted);
private:
void SuppressDisplayport(bool aEnabled);

5
dom/ipc/PBrowser.ipdl
View File

@ -661,11 +661,6 @@ parent:
sync SetPrefersReducedMotionOverrideForTest(bool aValue);
sync ResetPrefersReducedMotionOverrideForTest();
/**
* Fire a `load` event on this PBrowser's embedding frame element.
*/
async FireFrameLoadEvent(bool aIsTrusted);
child:
/**
* Notify the remote browser that it has been Show()n on this

5
dom/ipc/PBrowserBridge.ipdl
View File

@ -51,11 +51,6 @@ child:
*/
async SetEmbeddedDocAccessibleCOMProxy(IDispatchHolder aCOMProxy);
/**
* Fire a `load` event on this PBrowserBridge's embedding frame element.
*/
async FireFrameLoadEvent(bool aIsTrusted);
parent:
// Destroy the remote web browser due to the nsFrameLoader going away.
async __delete__();