corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1633488 - Fire zoom change events directly in the parent process instead of roundabouting through the child process. r=nika

Browse Source 
This ensures that chrome code can always react to the state the browsing
context the parent process observes properly. It's also simpler.

We fix one test that was relying on the event being fired at the
browser. For the same reason as the previous patch in this bug, we can
use resize events instead.

Differential Revision: https://phabricator.services.mozilla.com/D72712
This commit is contained in:
Emilio Cobos Álvarez
2020-04-29 21:44:13 +00:00
parent 864f819ba9
commit e68eab3ffd
5 changed files with 43 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
docshell/base/BrowsingContext.cpp
View File

@@ -30,6 +30,7 @@
#include "mozilla/dom/SyncedContextInlines.h"
#include "mozilla/net/DocumentLoadListener.h"
#include "mozilla/Assertions.h"
#include "mozilla/AsyncEventDispatcher.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/Components.h"
#include "mozilla/HashTable.h"
@@ -2069,29 +2070,29 @@ void BrowsingContext::DidSet(FieldIndex<IDX_AncestorLoading>) {
}
void BrowsingContext::DidSet(FieldIndex<IDX_TextZoom>, float aOldValue) {
if (!IsInProcess() || GetTextZoom() == aOldValue) {
if (GetTextZoom() == aOldValue) {
return;
}
RefPtr<Document> doc;
if (auto* win = GetDOMWindow()) {
doc = win->GetExtantDoc();
}
if (IsInProcess()) {
if (nsIDocShell* shell = GetDocShell()) {
if (nsPresContext* pc = shell->GetPresContext()) {
pc->RecomputeBrowsingContextDependentData();
}
}
if (nsIDocShell* shell = GetDocShell()) {
if (nsPresContext* pc = shell->GetPresContext()) {
pc->RecomputeBrowsingContextDependentData();
for (BrowsingContext* child : Children()) {
child->SetTextZoom(GetTextZoom());
}
}
for (BrowsingContext* child : Children()) {
child->SetTextZoom(GetTextZoom());
}
if (doc) {
nsContentUtils::DispatchChromeEvent(doc, ToSupports(doc),
NS_LITERAL_STRING("TextZoomChange"),
CanBubble::eYes, Cancelable::eYes);
if (IsTop() && XRE_IsParentProcess()) {
if (Element* element = GetEmbedderElement()) {
auto dispatcher = MakeRefPtr<AsyncEventDispatcher>(
element, NS_LITERAL_STRING("TextZoomChange"), CanBubble::eYes,
ChromeOnlyDispatch::eYes);
dispatcher->RunDOMEventWhenSafe();
}
}
}
@@ -2099,29 +2100,29 @@ void BrowsingContext::DidSet(FieldIndex<IDX_TextZoom>, float aOldValue) {
// on the Top() browsing context, but there are a lot of tests that rely on
// zooming a subframe so...
void BrowsingContext::DidSet(FieldIndex<IDX_FullZoom>, float aOldValue) {
if (!IsInProcess() || GetFullZoom() == aOldValue) {
if (GetFullZoom() == aOldValue) {
return;
}
RefPtr<Document> doc;
if (auto* win = GetDOMWindow()) {
doc = win->GetExtantDoc();
}
if (IsInProcess()) {
if (nsIDocShell* shell = GetDocShell()) {
if (nsPresContext* pc = shell->GetPresContext()) {
pc->RecomputeBrowsingContextDependentData();
}
}
if (nsIDocShell* shell = GetDocShell()) {
if (nsPresContext* pc = shell->GetPresContext()) {
pc->RecomputeBrowsingContextDependentData();
for (BrowsingContext* child : Children()) {
child->SetFullZoom(GetFullZoom());
}
}
for (BrowsingContext* child : Children()) {
child->SetFullZoom(GetFullZoom());
}
if (doc) {
nsContentUtils::DispatchChromeEvent(doc, ToSupports(doc),
NS_LITERAL_STRING("FullZoomChange"),
CanBubble::eYes, Cancelable::eYes);
if (IsTop() && XRE_IsParentProcess()) {
if (Element* element = GetEmbedderElement()) {
auto dispatcher = MakeRefPtr<AsyncEventDispatcher>(
element, NS_LITERAL_STRING("FullZoomChange"), CanBubble::eYes,
ChromeOnlyDispatch::eYes);
dispatcher->RunDOMEventWhenSafe();
}
}
}