mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out 2 changesets (bug 1595491) for causing build bustages in docshell/base/BrowsingContext.cpp CLOSED TREE 

Backed out changeset 3687b7153c44 (bug 1595491)
Backed out changeset 91d87de145e3 (bug 1595491)
This commit is contained in:
Sandor Molnar 2022-08-12 19:50:20 +03:00
Родитель 5af4144f3e
Коммит 8aada8ee04
42 изменённых файлов: 85 добавлений и 822 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

40
accessible/tests/mochitest/elm/test_HTMLSpec.html
Просмотреть файл

@ -23,8 +23,6 @@
src="../name.js"></script>
<script type="application/javascript">
const syntheticBrowsingContexts = SpecialPowers.getBoolPref("browser.opaqueResponseBlocking.syntheticBrowsingContext", false);
async function doTest() {
// ////////////////////////////////////////////////////////////////////////
// HTML:a@href
@ -463,21 +461,10 @@
// ////////////////////////////////////////////////////////////////////////
// HTML:embed
if (syntheticBrowsingContexts) {
obj = {
INTERNAL_FRAME: [ {
DOCUMENT: [ {
role: ROLE_GRAPHIC,
interfaces: [ nsIAccessibleImage ],
} ],
} ],
};
} else {
obj = {
role: ROLE_GRAPHIC,
interfaces: [ nsIAccessibleImage ],
};
}
obj = {
role: ROLE_GRAPHIC,
interfaces: [ nsIAccessibleImage ],
};
testElm("embed_png", obj);
obj = {
@ -1133,21 +1120,10 @@
// ////////////////////////////////////////////////////////////////////////
// HTML:object and HTML:param
if (syntheticBrowsingContexts) {
obj = {
INTERNAL_FRAME: [ {
DOCUMENT: [ {
role: ROLE_GRAPHIC,
interfaces: [ nsIAccessibleImage ],
} ],
} ],
};
} else {
obj = {
role: ROLE_GRAPHIC,
interfaces: [ nsIAccessibleImage ],
};
}
obj = {
role: ROLE_GRAPHIC,
interfaces: [ nsIAccessibleImage ],
};
testElm("object_png", obj);
obj = {

12
devtools/server/actors/accessibility/audit/text-label.js
Просмотреть файл

@ -262,21 +262,15 @@ const internalFrameRule = function(accessible) {
return title && title === name
? null
: { score: FAIL, issue: IFRAME_NO_NAME_FROM_TITLE };
case "OBJECT": {
case "OBJECT":
const type = DOMNode.getAttribute("type");
if (!type || !type.startsWith("image/")) {
return null;
}
return imageRule(accessible);
}
case "EMBED": {
const type = DOMNode.getAttribute("type");
if (!type || !type.startsWith("image/")) {
return mustHaveNonEmptyNameRule(EMBED_NO_NAME, accessible);
}
return imageRule(accessible);
}
case "EMBED":
return mustHaveNonEmptyNameRule(EMBED_NO_NAME, accessible);
default:
return null;
}

33
docshell/base/BrowsingContext.cpp
Просмотреть файл

@ -737,22 +737,9 @@ void BrowsingContext::SetEmbedderElement(Element* aEmbedder) {
obs->NotifyWhenScriptSafe(ToSupports(this),
"browsing-context-did-set-embedder", nullptr);
}
if (IsEmbedderTypeObjectOrEmbed()) {
if (WindowContext* context = GetParentWindowContext()) {
Unused << SetSyntheticDocumentContainer(true);
}
}
}
}
bool BrowsingContext::IsEmbedderTypeObjectOrEmbed() {
if (const Maybe<nsString>& type = GetEmbedderElementType()) {
return nsGkAtoms::object->Equals(*type) || nsGkAtoms::embed->Equals(*type);
}
return false;
}
void BrowsingContext::Embed() {
if (auto* frame = HTMLIFrameElement::FromNode(mEmbedderElement)) {
frame->BindToBrowsingContext(this);
@ -1072,13 +1059,6 @@ void BrowsingContext::GetChildren(
aChildren.AppendElements(Children());
}
Span<RefPtr<BrowsingContext>> BrowsingContext::NonSyntheticChildren() const {
if (WindowContext* current = mCurrentWindowContext) {
return current->NonSyntheticChildren();
}
return Span<RefPtr<BrowsingContext>>();
}
void BrowsingContext::GetWindowContexts(
nsTArray<RefPtr<WindowContext>>& aWindows) {
aWindows.AppendElements(mWindowContexts);
@ -1229,7 +1209,7 @@ BrowsingContext* BrowsingContext::FindWithName(
found = parent;
break;
} else {
siblings = parent->NonSyntheticChildren();
siblings = parent->Children();
}
for (BrowsingContext* sibling : siblings) {
@ -1264,7 +1244,7 @@ BrowsingContext* BrowsingContext::FindChildWithName(
return nullptr;
}
for (BrowsingContext* child : NonSyntheticChildren()) {
for (BrowsingContext* child : Children()) {
if (child->NameEquals(aName) && aRequestingContext.CanAccess(child) &&
child->IsTargetable()) {
return child;
@ -1308,7 +1288,7 @@ BrowsingContext* BrowsingContext::FindWithNameInSubtree(
return this;
}
for (BrowsingContext* child : NonSyntheticChildren()) {
for (BrowsingContext* child : Children()) {
if (BrowsingContext* found =
child->FindWithNameInSubtree(aName, aRequestingContext)) {
return found;
@ -2986,13 +2966,6 @@ void BrowsingContext::DidSet(FieldIndex<IDX_IsInBFCache>) {
}
}
void BrowsingContext::DidSet(FieldIndex<IDX_SyntheticDocumentContainer>) {
if (WindowContext* parentWindowContext = GetParentWindowContext()) {
parentWindowContext->UpdateChildSynthetic(this,
GetSyntheticDocumentContainer());
}
}
void BrowsingContext::SetCustomPlatform(const nsAString& aPlatform,
ErrorResult& aRv) {
Top()->SetPlatformOverride(aPlatform, aRv);

13
docshell/base/BrowsingContext.h
Просмотреть файл

@ -234,10 +234,7 @@ enum class ExplicitActiveStatus : uint8_t {
/* This field only gets incrememented when we start navigations in the \
* parent process. This is used for keeping track of the racing navigations \
* between the parent and content processes. */ \
FIELD(ParentInitiatedNavigationEpoch, uint64_t) \
/* This browsing context is for a synthetic image document wrapping an \
* image embedded in <object> or <embed>. */ \
FIELD(SyntheticDocumentContainer, bool)
FIELD(ParentInitiatedNavigationEpoch, uint64_t)
// BrowsingContext, in this context, is the cross process replicated
// environment in which information about documents is stored. In
@ -369,10 +366,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
Element* GetEmbedderElement() const { return mEmbedderElement; }
void SetEmbedderElement(Element* aEmbedder);
// Return true if the type of the embedder element is either object
// or embed, false otherwise.
bool IsEmbedderTypeObjectOrEmbed();
// Called after the BrowingContext has been embedded in a FrameLoader. This
// happens after `SetEmbedderElement` is called on the BrowsingContext and
// after the BrowsingContext has been set on the FrameLoader.
@ -495,8 +488,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
Span<RefPtr<BrowsingContext>> Children() const;
void GetChildren(nsTArray<RefPtr<BrowsingContext>>& aChildren);
Span<RefPtr<BrowsingContext>> NonSyntheticChildren() const;
const nsTArray<RefPtr<WindowContext>>& GetWindowContexts() {
return mWindowContexts;
}
@ -1203,8 +1194,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
bool CanSet(FieldIndex<IDX_IsInBFCache>, bool, ContentParent* aSource);
void DidSet(FieldIndex<IDX_IsInBFCache>);
void DidSet(FieldIndex<IDX_SyntheticDocumentContainer>);
// Allow if the process attemping to set field is the same as the owning
// process. Deprecated. New code that might use this should generally be moved
// to WindowContext or be settable only by the parent process.

19
docshell/base/WindowContext.cpp
Просмотреть файл

@ -122,9 +122,6 @@ void WindowContext::AppendChildBrowsingContext(
MOZ_DIAGNOSTIC_ASSERT(!mChildren.Contains(aBrowsingContext));
mChildren.AppendElement(aBrowsingContext);
if (!aBrowsingContext->IsEmbedderTypeObjectOrEmbed()) {
mNonSyntheticChildren.AppendElement(aBrowsingContext);
}
// If we're the current WindowContext in our BrowsingContext, make sure to
// clear any cached `children` value.
@ -139,7 +136,6 @@ void WindowContext::RemoveChildBrowsingContext(
"Mismatched groups?");
mChildren.RemoveElement(aBrowsingContext);
mNonSyntheticChildren.RemoveElement(aBrowsingContext);
// If we're the current WindowContext in our BrowsingContext, make sure to
// clear any cached `children` value.
@ -148,19 +144,6 @@ void WindowContext::RemoveChildBrowsingContext(
}
}
void WindowContext::UpdateChildSynthetic(BrowsingContext* aBrowsingContext,
bool aIsSynthetic) {
if (aIsSynthetic) {
mNonSyntheticChildren.RemoveElement(aBrowsingContext);
} else {
// The same BrowsingContext will be reused for error pages, so it can be in
// the list already.
if (!mNonSyntheticChildren.Contains(aBrowsingContext)) {
mNonSyntheticChildren.AppendElement(aBrowsingContext);
}
}
}
void WindowContext::SendCommitTransaction(ContentParent* aParent,
const BaseTransaction& aTxn,
uint64_t aEpoch) {
@ -586,14 +569,12 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(WindowContext)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mBrowsingContext)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mChildren)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mNonSyntheticChildren)
NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(WindowContext)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBrowsingContext)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mChildren)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNonSyntheticChildren)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(WindowContext)

21
docshell/base/WindowContext.h
Просмотреть файл

@ -147,12 +147,6 @@ class WindowContext : public nsISupports, public nsWrapperCache {
Span<RefPtr<BrowsingContext>> Children() { return mChildren; }
// The filtered version of `Children()`, which contains no browsing contexts
// for synthetic documents as created by object loading content.
Span<RefPtr<BrowsingContext>> NonSyntheticChildren() {
return mNonSyntheticChildren;
}
// Cast this object to it's parent-process canonical form.
WindowGlobalParent* Canonical();
@ -225,12 +219,6 @@ class WindowContext : public nsISupports, public nsWrapperCache {
void AppendChildBrowsingContext(BrowsingContext* aBrowsingContext);
void RemoveChildBrowsingContext(BrowsingContext* aBrowsingContext);
// Update non-synthetic children based on whether `aBrowsingContext`
// is synthetic or not. Regardless the synthetic of `aBrowsingContext`, it is
// kept in this WindowContext's all children list.
void UpdateChildSynthetic(BrowsingContext* aBrowsingContext,
bool aIsSynthetic);
// Send a given `BaseTransaction` object to the correct remote.
void SendCommitTransaction(ContentParent* aParent,
const BaseTransaction& aTxn, uint64_t aEpoch);
@ -343,15 +331,6 @@ class WindowContext : public nsISupports, public nsWrapperCache {
// `AppendChildBrowsingContext` and `RemoveChildBrowsingContext` methods.
nsTArray<RefPtr<BrowsingContext>> mChildren;
// --- NEVER CHANGE `mNonSyntheticChildren` DIRECTLY! ---
// Same reason as for mChildren.
// mNonSyntheticChildren contains the same browsing contexts except browsing
// contexts created by the synthetic document for object loading contents
// loading images. This is used to discern browsing contexts created when
// loading images in <object> or <embed> elements, so that they can be hidden
// from named targeting, `Window.frames` etc.
nsTArray<RefPtr<BrowsingContext>> mNonSyntheticChildren;
bool mIsDiscarded = false;
bool mIsInProcess = false;

10
dom/base/Document.cpp
Просмотреть файл

@ -16520,16 +16520,6 @@ Selection* Document::GetSelection(ErrorResult& aRv) {
return nsGlobalWindowInner::Cast(window)->GetSelection(aRv);
}
void Document::MakeBrowsingContextNonSynthetic() {
if (nsContentUtils::ShouldHideObjectOrEmbedImageDocument()) {
if (BrowsingContext* bc = GetBrowsingContext()) {
if (bc->GetSyntheticDocumentContainer()) {
Unused << bc->SetSyntheticDocumentContainer(false);
}
}
}
}
nsresult Document::HasStorageAccessSync(bool& aHasStorageAccess) {
// Step 1: check if cookie permissions are available or denied to this
// document's principal

12
dom/base/Document.h
Просмотреть файл

@ -271,7 +271,6 @@ class SVGDocument;
class SVGElement;
class SVGSVGElement;
class SVGUseElement;
class ImageDocument;
class Touch;
class TouchList;
class TreeWalker;
@ -1257,7 +1256,6 @@ class Document : public nsINode,
Selection* GetSelection(ErrorResult& aRv);
void MakeBrowsingContextNonSynthetic();
nsresult HasStorageAccessSync(bool& aHasStorageAccess);
already_AddRefed<Promise> HasStorageAccess(ErrorResult& aRv);
@ -2197,9 +2195,6 @@ class Document : public nsINode,
*/
bool IsHTMLDocument() const { return mType == eHTML; }
bool IsHTMLOrXHTML() const { return mType == eHTML || mType == eXHTML; }
bool IsImageDocument() const {
return MediaDocumentKind() == MediaDocumentKind::Image;
}
bool IsXMLDocument() const { return !IsHTMLDocument(); }
bool IsSVGDocument() const { return mType == eSVG; }
bool IsUnstyledDocument() { return IsLoadedAsData(); }
@ -3575,13 +3570,6 @@ class Document : public nsINode,
inline SVGDocument* AsSVGDocument();
inline const SVGDocument* AsSVGDocument() const;
/**
* Asserts IsImageDocument, and can't return null.
* Defined inline in ImageDocument.h
*/
inline ImageDocument* AsImageDocument();
inline const ImageDocument* AsImageDocument() const;
/*
* Given a node, get a weak reference to it and append that reference to
* mBlockedNodesByClassifier. Can be used later on to look up a node in it.

25
dom/base/nsContentUtils.cpp
Просмотреть файл

@ -109,7 +109,6 @@
#include "mozilla/ScrollbarPreferences.h"
#include "mozilla/Span.h"
#include "mozilla/StaticAnalysisFunctions.h"
#include "mozilla/StaticPrefs_browser.h"
#include "mozilla/StaticPrefs_dom.h"
#ifdef FUZZING
# include "mozilla/StaticPrefs_fuzzing.h"
@ -10252,7 +10251,7 @@ uint32_t nsContentUtils::HtmlObjectContentTypeForMIMEType(
}
if (imgLoader::SupportImageWithMimeType(aMIMEType)) {
return ResolveObjectType(nsIObjectLoadingContent::TYPE_IMAGE);
return nsIObjectLoadingContent::TYPE_IMAGE;
}
// Faking support of the PDF content as a document for EMBED tags
@ -10971,28 +10970,6 @@ nsresult nsContentUtils::AnonymizeId(nsAString& aId,
return NS_OK;
}
/* static */
bool nsContentUtils::ShouldHideObjectOrEmbedImageDocument() {
return StaticPrefs::
browser_opaqueResponseBlocking_syntheticBrowsingContext_AtStartup() &&
StaticPrefs::
browser_opaqueResponseBlocking_syntheticBrowsingContext_filter_AtStartup_DoNotUseDirectly();
}
/* static */
uint32_t nsContentUtils::ResolveObjectType(uint32_t aType) {
if (!StaticPrefs::
browser_opaqueResponseBlocking_syntheticBrowsingContext_AtStartup()) {
return aType;
}
if (aType != nsIObjectLoadingContent::TYPE_IMAGE) {
return aType;
}
return nsIObjectLoadingContent::TYPE_DOCUMENT;
}
namespace mozilla {
std::ostream& operator<<(std::ostream& aOut,
const PreventDefaultResult aPreventDefaultResult) {

13
dom/base/nsContentUtils.h
Просмотреть файл

@ -3359,19 +3359,6 @@ class nsContentUtils {
static nsresult AnonymizeId(nsAString& aId, const nsACString& aOriginKey,
OriginFormat aFormat = OriginFormat::Base64);
/**
* Return true if we should hide the synthetic browsing context for <object>
* or <embed> images in synthetic documents.
*/
static bool ShouldHideObjectOrEmbedImageDocument();
/**
* Returns the object type that the object loading content will actually use
* to load the resource. Used for ORB and loading images into synthetic
* documents.
*/
static uint32_t ResolveObjectType(uint32_t aType);
private:
static bool InitializeEventTable();

9
dom/base/nsFrameLoader.cpp
Просмотреть файл

@ -2495,15 +2495,6 @@ void nsFrameLoader::PropagateIsUnderHiddenEmbedderElement(
}
}
void nsFrameLoader::UpdateRemoteStyle(
mozilla::StyleImageRendering aImageRendering) {
MOZ_DIAGNOSTIC_ASSERT(IsRemoteFrame());
if (auto* browserBridgeChild = GetBrowserBridgeChild()) {
browserBridgeChild->SendUpdateRemoteStyle(aImageRendering);
}
}
void nsFrameLoader::UpdateBaseWindowPositionAndSize(
nsSubDocumentFrame* aIFrame) {
nsCOMPtr<nsIBaseWindow> baseWindow = GetDocShell(IgnoreErrors());

2
dom/base/nsFrameLoader.h
Просмотреть файл

@ -147,8 +147,6 @@ class nsFrameLoader final : public nsStubMutationObserver,
void PropagateIsUnderHiddenEmbedderElement(
bool aIsUnderHiddenEmbedderElement);
void UpdateRemoteStyle(mozilla::StyleImageRendering aImageRendering);
// When creating a nsFrameLoaderOwner which is a static clone, a
// `nsFrameLoader` is not immediately attached to it. Instead, it is added to
// the static clone document's `PendingFrameStaticClones` list.

5
dom/base/nsGlobalWindowOuter.cpp
Просмотреть файл

@ -3366,8 +3366,7 @@ Nullable<WindowProxyHolder> nsGlobalWindowOuter::IndexedGetterOuter(
BrowsingContext* bc = GetBrowsingContext();
NS_ENSURE_TRUE(bc, nullptr);
Span<RefPtr<BrowsingContext>> children = bc->NonSyntheticChildren();
Span<RefPtr<BrowsingContext>> children = bc->Children();
if (aIndex < children.Length()) {
return WindowProxyHolder(children[aIndex]);
}
@ -3995,7 +3994,7 @@ double nsGlobalWindowOuter::GetScrollYOuter() { return GetScrollXY(false).y; }
uint32_t nsGlobalWindowOuter::Length() {
BrowsingContext* bc = GetBrowsingContext();
return bc ? bc->NonSyntheticChildren().Length() : 0;
return bc ? bc->Children().Length() : 0;
}
Nullable<WindowProxyHolder> nsGlobalWindowOuter::GetTopOuter() {

70
dom/base/nsObjectLoadingContent.cpp
Просмотреть файл

@ -391,8 +391,7 @@ nsObjectLoadingContent::nsObjectLoadingContent()
mIsStopping(false),
mIsLoading(false),
mScriptRequested(false),
mRewrittenYoutubeEmbed(false),
mLoadingSyntheticDocument(false) {}
mRewrittenYoutubeEmbed(false) {}
nsObjectLoadingContent::~nsObjectLoadingContent() {
// Should have been unbound from the tree at this point, and
@ -821,17 +820,11 @@ ElementState nsObjectLoadingContent::ObjectState() const {
case eType_Image:
return ImageState();
case eType_FakePlugin:
case eType_Document: {
case eType_Document:
// These are OK. If documents start to load successfully, they display
// something, and are thus not broken in this sense. The same goes for
// plugins.
ElementState states = ElementState();
if (mLoadingSyntheticDocument) {
states |= ElementState::LOADING;
states |= ImageState();
}
return states;
}
return ElementState();
case eType_Fallback:
// This may end up handled as TYPE_NULL or as a "special" type, as
// chosen by the layout.use-plugin-fallback pref.
@ -1306,12 +1299,6 @@ nsObjectLoadingContent::UpdateObjectParameters() {
LOG(("OBJLC [%p]: NewType #4: %u", this, newType));
}
mLoadingSyntheticDocument =
newType == eType_Document &&
StaticPrefs::
browser_opaqueResponseBlocking_syntheticBrowsingContext_AtStartup() &&
imgLoader::SupportImageWithMimeType(newMime);
///
/// Handle existing channels
///
@ -1421,7 +1408,7 @@ nsresult nsObjectLoadingContent::LoadObject(bool aNotify, bool aForceLoad,
ObjectType oldType = mType;
mType = eType_Fallback;
ConfigureFallback();
NotifyStateChanged(oldType, ObjectState(), true, false);
NotifyStateChanged(oldType, ObjectState(), true);
return NS_OK;
}
@ -1708,7 +1695,7 @@ nsresult nsObjectLoadingContent::LoadObject(bool aNotify, bool aForceLoad,
}
// Notify of our final state
NotifyStateChanged(oldType, oldState, aNotify, false);
NotifyStateChanged(oldType, oldState, aNotify);
NS_ENSURE_TRUE(mIsLoading, NS_OK);
//
@ -1738,7 +1725,7 @@ nsresult nsObjectLoadingContent::LoadObject(bool aNotify, bool aForceLoad,
}
}
if ((NS_FAILED(rv) && rv != NS_ERROR_PARSED_DATA_CACHED) && mIsLoading) {
if (NS_FAILED(rv) && mIsLoading) {
// Since we've already notified of our transition, we can just Unload and
// call ConfigureFallback (which will notify again)
oldType = mType;
@ -1747,7 +1734,7 @@ nsresult nsObjectLoadingContent::LoadObject(bool aNotify, bool aForceLoad,
NS_ENSURE_TRUE(mIsLoading, NS_OK);
CloseChannel();
ConfigureFallback();
NotifyStateChanged(oldType, ObjectState(), true, false);
NotifyStateChanged(oldType, ObjectState(), true);
}
return NS_OK;
@ -1977,7 +1964,7 @@ void nsObjectLoadingContent::Unlink(nsObjectLoadingContent* tmp) {
void nsObjectLoadingContent::UnloadObject(bool aResetState) {
// Don't notify in CancelImageRequests until we transition to a new loaded
// state, but not if we've loaded the image in a synthetic browsing context.
// state
CancelImageRequests(false);
if (mFrameLoader) {
mFrameLoader->Destroy();
@ -2010,14 +1997,14 @@ void nsObjectLoadingContent::UnloadObject(bool aResetState) {
void nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType,
ElementState aOldState,
bool aNotify,
bool aForceRestyle) {
bool aNotify) {
LOG(("OBJLC [%p]: NotifyStateChanged: (%u, %" PRIx64 ") -> (%u, %" PRIx64 ")"
" (notify %i)",
this, aOldType, aOldState.GetInternalValue(), mType,
ObjectState().GetInternalValue(), aNotify));
nsCOMPtr<dom::Element> thisEl = AsContent()->AsElement();
nsCOMPtr<dom::Element> thisEl =
do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
MOZ_ASSERT(thisEl, "must be an element");
// XXX(johns): A good bit of the code below replicates UpdateState(true)
@ -2025,7 +2012,7 @@ void nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType,
// Unfortunately, we do some state changes without notifying
// (e.g. in Fallback when canceling image requests), so we have to
// manually notify object state changes.
thisEl->UpdateState(aForceRestyle);
thisEl->UpdateState(false);
if (!aNotify) {
// We're done here
@ -2043,12 +2030,6 @@ void nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType,
}
RefPtr<PresShell> presShell = doc->GetPresShell();
// If there is no PresShell or it hasn't been initialized there isn't much to
// do.
if (!presShell || !presShell->DidInitialize()) {
return;
}
if (presShell && (aOldType != mType)) {
presShell->PostRecreateFramesFor(thisEl);
}
@ -2065,13 +2046,13 @@ nsObjectLoadingContent::ObjectType nsObjectLoadingContent::GetTypeOfContent(
(eSupportImages | eSupportDocuments | eSupportPlugins));
LOG(
("OBJLC [%p]: calling HtmlObjectContentTypeForMIMEType: aMIMEType: %s - "
("OBJLC[%p]: calling HtmlObjectContentTypeForMIMEType: aMIMEType: %s - "
"thisContent: %p\n",
this, aMIMEType.get(), thisContent.get()));
auto ret =
static_cast<ObjectType>(nsContentUtils::HtmlObjectContentTypeForMIMEType(
aMIMEType, aNoFakePlugin));
LOG(("OBJLC [%p]: called HtmlObjectContentTypeForMIMEType\n", this));
LOG(("OBJLC[%p]: called HtmlObjectContentTypeForMIMEType\n", this));
return ret;
}
@ -2378,29 +2359,14 @@ void nsObjectLoadingContent::SubdocumentIntrinsicSizeOrRatioChanged(
mSubdocumentIntrinsicSize = aIntrinsicSize;
mSubdocumentIntrinsicRatio = aIntrinsicRatio;
if (nsSubDocumentFrame* sdf = do_QueryFrame(AsContent()->GetPrimaryFrame())) {
nsCOMPtr<nsIContent> thisContent =
do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
if (nsSubDocumentFrame* sdf = do_QueryFrame(thisContent->GetPrimaryFrame())) {
sdf->SubdocumentIntrinsicSizeOrRatioChanged();
}
}
void nsObjectLoadingContent::SubdocumentImageLoadComplete(nsresult aResult) {
ElementState oldState = ObjectState();
ObjectType oldType = mType;
mLoadingSyntheticDocument = false;
if (NS_FAILED(aResult)) {
UnloadObject();
mType = eType_Fallback;
ConfigureFallback();
NotifyStateChanged(oldType, oldState, true, false);
return;
}
MOZ_DIAGNOSTIC_ASSERT(mType == eType_Document);
NotifyStateChanged(oldType, oldState, true, true);
}
void nsObjectLoadingContent::MaybeStoreCrossOriginFeaturePolicy() {
MOZ_DIAGNOSTIC_ASSERT(mFrameLoader);

7
dom/base/nsObjectLoadingContent.h
Просмотреть файл

@ -189,8 +189,6 @@ class nsObjectLoadingContent : public nsImageLoadingContent,
const mozilla::Maybe<mozilla::IntrinsicSize>& aIntrinsicSize,
const mozilla::Maybe<mozilla::AspectRatio>& aIntrinsicRatio);
void SubdocumentImageLoadComplete(nsresult aResult);
protected:
/**
* Begins loading the object when called
@ -450,8 +448,7 @@ class nsObjectLoadingContent : public nsImageLoadingContent,
* @param aNotify if false, only need to update the state of our element.
*/
void NotifyStateChanged(ObjectType aOldType,
mozilla::dom::ElementState aOldState, bool aNotify,
bool aForceRestyle);
mozilla::dom::ElementState aOldState, bool aNotify);
/**
* Returns a ObjectType value corresponding to the type of content we would
@ -577,8 +574,6 @@ class nsObjectLoadingContent : public nsImageLoadingContent,
// videos.
bool mRewrittenYoutubeEmbed : 1;
bool mLoadingSyntheticDocument : 1;
nsTArray<mozilla::dom::MozPluginParameter> mCachedAttributes;
nsTArray<mozilla::dom::MozPluginParameter> mCachedParameters;

34
dom/base/test/test_embed_xorigin_document.html
Просмотреть файл

@ -13,12 +13,6 @@
// Get the path of the current test, without hostname or filename.
const testPath = window.location.href.replace("http://mochi.test:8888", "");
const testDir = testPath.substring(0, testPath.lastIndexOf('/') + 1);
const embedHasBrowsingContext = SpecialPowers.getBoolPref("browser.opaqueResponseBlocking.syntheticBrowsingContext", false);
const imageTypeORB = embedHasBrowsingContext
? SpecialPowers.Ci.nsIObjectLoadingContent.TYPE_DOCUMENT
: SpecialPowers.Ci.nsIObjectLoadingContent.TYPE_IMAGE;
const imageTypeStringORB = embedHasBrowsingContext ? "document" : "image";
add_task(async function() {
// FIXME: Remove when bug 1658342 is fixed
@ -35,17 +29,11 @@ add_task(async function() {
await new Promise(resolve => embed.addEventListener("load", resolve, { once: true }));
is(
SpecialPowers.wrap(embed).displayedType,
imageTypeORB,
`image load should have ${imageTypeStringORB} type`
SpecialPowers.Ci.nsIObjectLoadingContent.TYPE_IMAGE,
"image load should have image type"
);
if (!embedHasBrowsingContext) {
ok(!SpecialPowers.wrap(embed).frameLoader, "should not have frameloader");
ok(!SpecialPowers.wrap(embed).browsingContext, "should not have bc");
} else {
ok(SpecialPowers.wrap(embed).frameLoader, "should have frameloader");
ok(SpecialPowers.wrap(embed).browsingContext, "should have bc");
}
ok(!SpecialPowers.wrap(embed).frameLoader, "should not have frameloader");
ok(!SpecialPowers.wrap(embed).browsingContext, "should not have bc");
info("x-site document load from element");
embed.setAttribute("src", "http://example.com" + testDir + "file_empty.html");
@ -86,17 +74,11 @@ add_task(async function() {
await new Promise(resolve => embed.addEventListener("load", resolve, { once: true }));
is(
SpecialPowers.wrap(embed).displayedType,
imageTypeORB,
`image load should have ${imageTypeStringORB} type`
SpecialPowers.Ci.nsIObjectLoadingContent.TYPE_IMAGE,
"image load should have image type"
);
if (!embedHasBrowsingContext) {
ok(!SpecialPowers.wrap(embed).frameLoader, "should not have frameloader");
ok(!SpecialPowers.wrap(embed).browsingContext, "should not have bc");
} else {
ok(SpecialPowers.wrap(embed).frameLoader, "should have frameloader");
ok(SpecialPowers.wrap(embed).browsingContext, "should have bc");
}
ok(!SpecialPowers.wrap(embed).frameLoader, "should not have frameloader");
ok(!SpecialPowers.wrap(embed).browsingContext, "should not have bc");
});
</script>
</body>

81
dom/html/ImageDocument.cpp
Просмотреть файл

@ -7,7 +7,6 @@
#include "ImageDocument.h"
#include "mozilla/AutoRestore.h"
#include "mozilla/ComputedStyle.h"
#include "mozilla/dom/BrowserChild.h"
#include "mozilla/dom/Element.h"
#include "mozilla/dom/Event.h"
#include "mozilla/dom/ImageDocumentBinding.h"
@ -17,8 +16,6 @@
#include "mozilla/PresShell.h"
#include "mozilla/StaticPrefs_browser.h"
#include "mozilla/StaticPrefs_privacy.h"
#include "nsICSSDeclaration.h"
#include "nsObjectLoadingContent.h"
#include "nsRect.h"
#include "nsIImageLoadingContent.h"
#include "nsGenericHTMLElement.h"
@ -140,7 +137,6 @@ ImageDocument::ImageDocument()
mObservingImageLoader(false),
mTitleUpdateInProgress(false),
mHasCustomTitle(false),
mIsInObjectOrEmbed(false),
mOriginalZoomLevel(1.0),
mOriginalResolution(1.0) {}
@ -179,10 +175,6 @@ nsresult ImageDocument::StartDocumentLoad(
mOriginalZoomLevel = IsSiteSpecific() ? 1.0 : GetZoomLevel();
mOriginalResolution = GetResolution();
if (BrowsingContext* context = GetBrowsingContext()) {
mIsInObjectOrEmbed = context->IsEmbedderTypeObjectOrEmbed();
}
NS_ASSERTION(aDocListener, "null aDocListener");
*aDocListener = new ImageListener(this);
NS_ADDREF(*aDocListener);
@ -352,9 +344,7 @@ void ImageDocument::RestoreImage() {
imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::width, true);
imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::height, true);
if (mIsInObjectOrEmbed) {
SetModeClass(eIsInObjectOrEmbed);
} else if (ImageIsOverflowing()) {
if (ImageIsOverflowing()) {
if (!ImageIsOverflowingVertically()) {
SetModeClass(eOverflowingHorizontalOnly);
} else {
@ -432,10 +422,6 @@ void ImageDocument::SetModeClass(eModeClasses mode) {
} else {
classList->Remove(u"overflowingHorizontalOnly"_ns, IgnoreErrors());
}
if (mode == eIsInObjectOrEmbed) {
classList->Add(u"isInObjectOrEmbed"_ns, IgnoreErrors());
}
}
void ImageDocument::OnSizeAvailable(imgIRequest* aRequest,
@ -476,8 +462,6 @@ void ImageDocument::OnLoadComplete(imgIRequest* aRequest, nsresult aStatus) {
mImageContent->SetAttr(kNameSpaceID_None, nsGkAtoms::alt, errorMsg, false);
}
MaybeSendResultToEmbedder(aStatus);
}
NS_IMETHODIMP
@ -487,8 +471,7 @@ ImageDocument::HandleEvent(Event* aEvent) {
if (eventType.EqualsLiteral("resize")) {
CheckOverflowing(false);
} else if (eventType.EqualsLiteral("click") &&
StaticPrefs::browser_enable_click_image_resizing() &&
!mIsInObjectOrEmbed) {
StaticPrefs::browser_enable_click_image_resizing()) {
ResetZoomLevel();
mShouldResize = true;
if (mImageIsResized) {
@ -543,31 +526,6 @@ void ImageDocument::UpdateSizeFromLayout() {
}
}
void ImageDocument::UpdateRemoteStyle(StyleImageRendering aImageRendering) {
if (!mImageContent) {
return;
}
nsCOMPtr<nsICSSDeclaration> style = mImageContent->Style();
switch (aImageRendering) {
case StyleImageRendering::Auto:
case StyleImageRendering::Smooth:
case StyleImageRendering::Optimizequality:
style->SetProperty("image-rendering"_ns, "auto"_ns, ""_ns,
IgnoreErrors());
break;
case StyleImageRendering::Optimizespeed:
case StyleImageRendering::Pixelated:
style->SetProperty("image-rendering"_ns, "pixelated"_ns, ""_ns,
IgnoreErrors());
break;
case StyleImageRendering::CrispEdges:
style->SetProperty("image-rendering"_ns, "crisp-edges"_ns, ""_ns,
IgnoreErrors());
break;
}
}
nsresult ImageDocument::CreateSyntheticDocument() {
// Synthesize an html document that refers to the image
nsresult rv = MediaDocument::CreateSyntheticDocument();
@ -633,9 +591,7 @@ nsresult ImageDocument::CheckOverflowing(bool changeState) {
if (changeState || mShouldResize || mFirstResize || windowBecameBigEnough ||
verticalOverflowChanged) {
if (mIsInObjectOrEmbed) {
SetModeClass(eIsInObjectOrEmbed);
} else if (ImageIsOverflowing() && (changeState || mShouldResize)) {
if (ImageIsOverflowing() && (changeState || mShouldResize)) {
ShrinkToFit();
} else if (mImageIsResized || mFirstResize || windowBecameBigEnough) {
RestoreImage();
@ -738,37 +694,6 @@ float ImageDocument::GetResolution() {
return mOriginalResolution;
}
void ImageDocument::MaybeSendResultToEmbedder(nsresult aResult) {
if (!mIsInObjectOrEmbed) {
return;
}
BrowsingContext* context = GetBrowsingContext();
if (!context) {
return;
}
if (context->GetParent() && context->GetParent()->IsInProcess()) {
if (Element* embedder = context->GetEmbedderElement()) {
if (nsCOMPtr<nsIObjectLoadingContent> objectLoadingContent =
do_QueryInterface(embedder)) {
NS_DispatchToMainThread(NS_NewRunnableFunction(
"nsObjectLoadingContent::SubdocumentImageLoadComplete",
[objectLoadingContent, aResult]() {
static_cast<nsObjectLoadingContent*>(objectLoadingContent.get())
->SubdocumentImageLoadComplete(aResult);
}));
}
return;
}
}
if (BrowserChild* browserChild =
BrowserChild::GetFrom(context->GetDocShell())) {
browserChild->SendImageLoadComplete(aResult);
}
}
} // namespace mozilla::dom
nsresult NS_NewImageDocument(mozilla::dom::Document** aResult) {

28
dom/html/ImageDocument.h
Просмотреть файл

@ -8,15 +8,11 @@
#include "mozilla/Attributes.h"
#include "imgINotificationObserver.h"
#include "mozilla/dom/MediaDocument.h"
#include "MediaDocument.h"
#include "nsIDOMEventListener.h"
namespace mozilla {
enum class StyleImageRendering : uint8_t;
struct IntrinsicSize;
} // namespace mozilla
namespace mozilla::dom {
class HTMLImageElement;
class ImageDocument final : public MediaDocument,
@ -77,8 +73,6 @@ class ImageDocument final : public MediaDocument,
void NotifyPossibleTitleChange(bool aBoundTitleElement) override;
void UpdateRemoteStyle(StyleImageRendering aImageRendering);
protected:
virtual ~ImageDocument();
@ -104,8 +98,7 @@ class ImageDocument final : public MediaDocument,
eNone,
eShrinkToFit,
eOverflowingVertical, // And maybe horizontal too.
eOverflowingHorizontalOnly,
eIsInObjectOrEmbed
eOverflowingHorizontalOnly
};
void SetModeClass(eModeClasses mode);
@ -113,8 +106,6 @@ class ImageDocument final : public MediaDocument,
void OnLoadComplete(imgIRequest* aRequest, nsresult aStatus);
void OnHasTransparency();
void MaybeSendResultToEmbedder(nsresult aResult);
RefPtr<HTMLImageElement> mImageContent;
float mVisibleWidth;
@ -134,23 +125,10 @@ class ImageDocument final : public MediaDocument,
bool mTitleUpdateInProgress;
bool mHasCustomTitle;
// True iff embedder is either <object> or <embed>.
bool mIsInObjectOrEmbed;
float mOriginalZoomLevel;
float mOriginalResolution;
};
inline ImageDocument* Document::AsImageDocument() {
MOZ_ASSERT(IsImageDocument());
return static_cast<ImageDocument*>(this);
}
inline const ImageDocument* Document::AsImageDocument() const {
MOZ_ASSERT(IsImageDocument());
return static_cast<const ImageDocument*>(this);
}
} // namespace mozilla::dom
#endif /* mozilla_dom_ImageDocument_h */

1
dom/html/moz.build
Просмотреть файл

@ -114,7 +114,6 @@ EXPORTS.mozilla.dom += [
"HTMLUnknownElement.h",
"HTMLVideoElement.h",
"ImageDocument.h",
"MediaDocument.h",
"MediaError.h",
"nsBrowserElement.h",
"PlayPromise.h",

2
dom/html/test/browser.ini
Просмотреть файл

@ -3,7 +3,6 @@ support-files =
bug592641_img.jpg
dummy_page.html
file_fullscreen-api-keys.html
image.png
submission_flush.html
post_action_page.html
form_data_file.bin
@ -83,7 +82,6 @@ support-files =
file_fullscreen-iframe-top.html
file_fullscreen-iframe-middle.html
file_fullscreen-iframe-inner.html
[browser_containerLoadingContent.js]
[browser_submission_flush.js]
[browser_refresh_after_document_write.js]
support-files =

130
dom/html/test/browser_containerLoadingContent.js
Просмотреть файл

@ -1,130 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const syntheticBrowsingContexts = SpecialPowers.getBoolPref(
"browser.opaqueResponseBlocking.syntheticBrowsingContext",
false
);
const DIRPATH = getRootDirectory(gTestPath).replace(
"chrome://mochitests/content/",
""
);
const ORIGIN = "https://example.com";
const CROSSORIGIN = "https://example.org";
const TABURL = `${ORIGIN}/${DIRPATH}dummy_page.html`;
const IMAGEURL = `${ORIGIN}/${DIRPATH}image.png`;
const CROSSIMAGEURL = `${CROSSORIGIN}/${DIRPATH}image.png`;
const DOCUMENTURL = `${ORIGIN}/${DIRPATH}dummy_page.html`;
const CROSSDOCUMENTURL = `${CROSSORIGIN}/${DIRPATH}dummy_page.html`;
async function createElements({ element, attribute }, url1, url2) {
for (let url of [url1, url2]) {
const object = content.document.createElement(element);
object[attribute] = url;
const onloadPromise = new Promise(res => {
object.onload = res;
});
content.document.body.appendChild(object);
await onloadPromise;
return object;
}
}
function getPids(browser) {
return browser.browsingContext.children.map(
child => child.currentWindowContext.osPid
);
}
async function runTest(spec, tabUrl, imageurl, crossimageurl, check) {
await BrowserTestUtils.withNewTab(tabUrl, async browser => {
await SpecialPowers.spawn(
browser,
[spec, imageurl, crossimageurl],
async ({ element, attribute }, url1, url2) => {
for (let url of [url1, url2]) {
const object = content.document.createElement(element);
object[attribute] = url;
const onloadPromise = new Promise(res => {
object.onload = res;
});
content.document.body.appendChild(object);
await onloadPromise;
}
}
);
await check(browser);
});
}
let iframe = { element: "iframe", attribute: "src" };
let embed = { element: "embed", attribute: "src" };
let object = { element: "object", attribute: "data" };
async function checkImage(browser) {
let pids = getPids(browser);
is(pids.length, 2, "There should be two browsing contexts");
ok(pids[0], "The first pid should have a sane value");
ok(pids[1], "The second pid should have a sane value");
isnot(pids[0], pids[1], "The two pids should be different");
let images = [];
for (let context of browser.browsingContext.children) {
images.push(
await SpecialPowers.spawn(context, [], async () => {
let img = new URL(content.document.querySelector("img").src);
is(
`${img.protocol}//${img.host}`,
`${content.location.protocol}//${content.location.host}`,
"Images should be loaded in the same domain as the document"
);
return img.href;
})
);
}
isnot(images[0], images[1], "The images should have different sources");
}
function checkDocument(browser) {
let pids = getPids(browser);
is(pids.length, 2, "There should be two browsing contexts");
ok(pids[0], "The first pid should have a sane value");
ok(pids[1], "The second pid should have a sane value");
isnot(pids[0], pids[1], "The two pids should be different");
}
add_task(async function test_iframeImageDocument() {
await runTest(iframe, TABURL, IMAGEURL, CROSSIMAGEURL, checkImage);
});
if (syntheticBrowsingContexts) {
add_task(async function test_embedImageDocument() {
await runTest(embed, TABURL, IMAGEURL, CROSSIMAGEURL, checkImage);
});
add_task(async function test_objectImageDocument() {
await runTest(object, TABURL, IMAGEURL, CROSSIMAGEURL, checkImage);
});
}
add_task(async function test_iframeDocument() {
await runTest(iframe, TABURL, DOCUMENTURL, CROSSDOCUMENTURL, checkDocument);
});
if (syntheticBrowsingContexts) {
add_task(async function test_embedDocument() {
await runTest(embed, TABURL, DOCUMENTURL, CROSSDOCUMENTURL, checkDocument);
});
add_task(async function test_objectDocument() {
await runTest(object, TABURL, DOCUMENTURL, CROSSDOCUMENTURL, checkDocument);
});
}

1
dom/html/test/mochitest.ini
Просмотреть файл

@ -623,4 +623,3 @@ skip-if = toolkit == "android" # test does not function on android due to aggre
support-files =
file_window_close_and_open.html
file_broadcast_load.html
[test_frame_count_with_synthetic_doc.html]

36
dom/html/test/test_frame_count_with_synthetic_doc.html
Просмотреть файл

@ -1,36 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<script>
SimpleTest.waitForExplicitFinish();
function getWindowLength() {
setTimeout(function() {
if (window.length > 0) {
ok(false, "Synthetic document shouldn't be exposed");
}
// Keep running this check until the test stops
getWindowLength();
});
}
function addObject() {
const object = document.createElement("object");
object.data = 'file_bug417760.png';
document.body.appendChild(object);
object.onload = function() {
ok(true, "Test passes");
SimpleTest.finish();
}
}
getWindowLength();
addObject();
</script>
</body>
</html>

11
dom/ipc/BrowserBridgeChild.cpp
Просмотреть файл

@ -251,15 +251,4 @@ mozilla::ipc::IPCResult BrowserBridgeChild::RecvIntrinsicSizeOrRatioChanged(
return IPC_OK();
}
mozilla::ipc::IPCResult BrowserBridgeChild::RecvImageLoadComplete(
const nsresult& aResult) {
if (RefPtr<Element> owner = mFrameLoader->GetOwnerContent()) {
if (nsCOMPtr<nsIObjectLoadingContent> olc = do_QueryInterface(owner)) {
static_cast<nsObjectLoadingContent*>(olc.get())
->SubdocumentImageLoadComplete(aResult);
}
}
return IPC_OK();
}
} // namespace mozilla::dom

2
dom/ipc/BrowserBridgeChild.h
Просмотреть файл

@ -96,8 +96,6 @@ class BrowserBridgeChild : public PBrowserBridgeChild {
const Maybe<IntrinsicSize>& aIntrinsicSize,
const Maybe<AspectRatio>& aIntrinsicRatio);
mozilla::ipc::IPCResult RecvImageLoadComplete(const nsresult& aResult);
MOZ_CAN_RUN_SCRIPT_BOUNDARY
mozilla::ipc::IPCResult RecvScrollRectIntoView(
const nsRect& aRect, const ScrollAxis& aVertical,

6
dom/ipc/BrowserBridgeParent.cpp
Просмотреть файл

@ -257,12 +257,6 @@ IPCResult BrowserBridgeParent::RecvSetIsUnderHiddenEmbedderElement(
return IPC_OK();
}
mozilla::ipc::IPCResult BrowserBridgeParent::RecvUpdateRemoteStyle(
const StyleImageRendering& aImageRendering) {
Unused << mBrowserParent->SendUpdateRemoteStyle(aImageRendering);
return IPC_OK();
}
#ifdef ACCESSIBILITY
a11y::DocAccessibleParent* BrowserBridgeParent::GetDocAccessibleParent() {
auto* embeddedBrowser = GetBrowserParent();

3
dom/ipc/BrowserBridgeParent.h
Просмотреть файл

@ -101,9 +101,6 @@ class BrowserBridgeParent : public PBrowserBridgeParent {
mozilla::ipc::IPCResult RecvSetIsUnderHiddenEmbedderElement(
const bool& aIsUnderHiddenEmbedderElement);
mozilla::ipc::IPCResult RecvUpdateRemoteStyle(
const StyleImageRendering& aImageRendering);
#ifdef ACCESSIBILITY
mozilla::ipc::IPCResult RecvSetEmbedderAccessible(PDocAccessibleParent* aDoc,
uint64_t aID);

21
dom/ipc/BrowserChild.cpp
Просмотреть файл

@ -62,9 +62,7 @@
#include "mozilla/dom/Element.h"
#include "mozilla/dom/Event.h"
#include "mozilla/dom/JSWindowActorChild.h"
#include "mozilla/dom/ImageDocument.h"
#include "mozilla/dom/LoadURIOptionsBinding.h"
#include "mozilla/dom/MediaDocument.h"
#include "mozilla/dom/MessageManagerBinding.h"
#include "mozilla/dom/MouseEventBinding.h"
#include "mozilla/dom/Nullable.h"
@ -1330,25 +1328,6 @@ mozilla::ipc::IPCResult BrowserChild::RecvSetIsUnderHiddenEmbedderElement(
return IPC_OK();
}
mozilla::ipc::IPCResult BrowserChild::RecvUpdateRemoteStyle(
const StyleImageRendering& aImageRendering) {
BrowsingContext* context = GetBrowsingContext();
if (!context) {
return IPC_OK();
}
Document* document = context->GetDocument();
if (!document) {
return IPC_OK();
}
if (document->IsImageDocument()) {
document->AsImageDocument()->UpdateRemoteStyle(aImageRendering);
}
return IPC_OK();
}
mozilla::ipc::IPCResult BrowserChild::RecvDynamicToolbarMaxHeightChanged(
const ScreenIntCoord& aHeight) {
#if defined(MOZ_WIDGET_ANDROID)

3
dom/ipc/BrowserChild.h
Просмотреть файл

@ -416,9 +416,6 @@ class BrowserChild final : public nsMessageManagerScriptExecutor,
mozilla::ipc::IPCResult RecvInsertText(const nsAString& aStringToInsert);
mozilla::ipc::IPCResult RecvUpdateRemoteStyle(
const StyleImageRendering& aImageRendering);
mozilla::ipc::IPCResult RecvNormalPriorityInsertText(
const nsAString& aStringToInsert);

12
dom/ipc/BrowserParent.cpp
Просмотреть файл

@ -3120,18 +3120,6 @@ mozilla::ipc::IPCResult BrowserParent::RecvIntrinsicSizeOrRatioChanged(
return IPC_OK();
}
mozilla::ipc::IPCResult BrowserParent::RecvImageLoadComplete(
const nsresult& aResult) {
BrowserBridgeParent* bridge = GetBrowserBridgeParent();
if (!bridge || !bridge->CanSend()) {
return IPC_OK();
}
Unused << bridge->SendImageLoadComplete(aResult);
return IPC_OK();
}
bool BrowserParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent) {
nsCOMPtr<nsIWidget> textInputHandlingWidget = GetTextInputHandlingWidget();
if (!textInputHandlingWidget) {

2
dom/ipc/BrowserParent.h
Просмотреть файл

@ -324,8 +324,6 @@ class BrowserParent final : public PBrowserParent,
const Maybe<IntrinsicSize>& aIntrinsicSize,
const Maybe<AspectRatio>& aIntrinsicRatio);
mozilla::ipc::IPCResult RecvImageLoadComplete(const nsresult& aResult);
mozilla::ipc::IPCResult RecvSyncMessage(
const nsString& aMessage, const ClonedMessageData& aData,
nsTArray<ipc::StructuredCloneData>* aRetVal);

5
dom/ipc/PBrowser.ipdl
Просмотреть файл

@ -106,7 +106,6 @@ using mozilla::dom::EmbedderElementEventType from "mozilla/dom/TabMessageTypes.h
using mozilla::IntrinsicSize from "nsIFrame.h";
using mozilla::AspectRatio from "mozilla/AspectRatio.h";
using mozilla::NativeKeyBindingsType from "mozilla/NativeKeyBindingsType.h";
using mozilla::StyleImageRendering from "mozilla/ServoStyleConsts.h";
namespace mozilla {
namespace dom {
@ -575,8 +574,6 @@ parent:
async IntrinsicSizeOrRatioChanged(IntrinsicSize? aIntrinsicSize,
AspectRatio? aIntrinsicRatio);
async ImageLoadComplete(nsresult aResult);
/**
* Child informs the parent that a pointer lock has requested/released.
*/
@ -714,8 +711,6 @@ child:
async SetIsUnderHiddenEmbedderElement(bool aIsUnderHiddenEmbedderElement);
async UpdateRemoteStyle(StyleImageRendering aImageRendering);
async DynamicToolbarMaxHeightChanged(ScreenIntCoord height);
async DynamicToolbarOffsetChanged(ScreenIntCoord height);

5
dom/ipc/PBrowserBridge.ipdl
Просмотреть файл

@ -30,7 +30,6 @@ using mozilla::dom::EmbedderElementEventType from "mozilla/dom/TabMessageTypes.h
[RefCounted] using class nsDocShellLoadState from "nsDocShellLoadState.h";
using mozilla::IntrinsicSize from "nsIFrame.h";
using mozilla::AspectRatio from "mozilla/AspectRatio.h";
using mozilla::StyleImageRendering from "mozilla/ServoStyleConsts.h";
namespace mozilla {
namespace dom {
@ -79,8 +78,6 @@ child:
async IntrinsicSizeOrRatioChanged(IntrinsicSize? aIntrinsicSize,
AspectRatio? aIntrinsicRatio);
async ImageLoadComplete(nsresult aResult);
both:
// Destroy the remote web browser due to the nsFrameLoader going away.
@ -124,8 +121,6 @@ parent:
async SetIsUnderHiddenEmbedderElement(bool aIsUnderHiddenEmbedderElement);
async UpdateRemoteStyle(StyleImageRendering aImageRendering);
async WillChangeProcess();
#ifdef ACCESSIBILITY

12
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -34,7 +34,6 @@
#include "mozilla/ScopeExit.h"
#include "mozilla/ServoBindings.h"
#include "mozilla/ServoStyleSetInlines.h"
#include "mozilla/StaticPrefs_browser.h"
#include "mozilla/StaticPrefs_layout.h"
#include "mozilla/StaticPrefs_mathml.h"
#include "mozilla/Unused.h"
@ -3611,14 +3610,6 @@ nsCSSFrameConstructor::FindInputData(const Element& aElement,
ArrayLength(sInputData));
}
static nsIFrame* NS_NewSubDocumentOrImageFrame(mozilla::PresShell* aPresShell,
mozilla::ComputedStyle* aStyle) {
return StaticPrefs::
browser_opaqueResponseBlocking_syntheticBrowsingContext_AtStartup()
? NS_NewSubDocumentFrame(aPresShell, aStyle)
: NS_NewImageFrame(aPresShell, aStyle);
}
/* static */
const nsCSSFrameConstructor::FrameConstructionData*
nsCSSFrameConstructor::FindObjectData(const Element& aElement,
@ -3649,8 +3640,7 @@ nsCSSFrameConstructor::FindObjectData(const Element& aElement,
NS_NewEmptyFrame),
SIMPLE_INT_CREATE(nsIObjectLoadingContent::TYPE_FALLBACK,
ToCreationFunc(NS_NewBlockFrame)),
SIMPLE_INT_CREATE(nsIObjectLoadingContent::TYPE_IMAGE,
NS_NewSubDocumentOrImageFrame),
SIMPLE_INT_CREATE(nsIObjectLoadingContent::TYPE_IMAGE, NS_NewImageFrame),
SIMPLE_INT_CREATE(nsIObjectLoadingContent::TYPE_DOCUMENT,
NS_NewSubDocumentFrame),
// Fake plugin handlers load as documents

51
layout/build/nsContentDLF.cpp
Просмотреть файл

@ -117,12 +117,10 @@ nsContentDLF::CreateInstance(const char* aCommand, nsIChannel* aChannel,
contentType = TEXT_PLAIN;
}
nsresult rv;
bool imageDocument = false;
// Try html or plaintext; both use the same document CID
if (IsTypeInList(contentType, gHTMLTypes) ||
nsContentUtils::IsPlainTextType(contentType)) {
rv = CreateDocument(
return CreateDocument(
aCommand, aChannel, aLoadGroup, aContainer,
[]() -> already_AddRefed<Document> {
RefPtr<Document> doc;
@ -131,9 +129,11 @@ nsContentDLF::CreateInstance(const char* aCommand, nsIChannel* aChannel,
return doc.forget();
},
aDocListener, aDocViewer);
} // Try XML
else if (IsTypeInList(contentType, gXMLTypes)) {
rv = CreateDocument(
}
// Try XML
if (IsTypeInList(contentType, gXMLTypes)) {
return CreateDocument(
aCommand, aChannel, aLoadGroup, aContainer,
[]() -> already_AddRefed<Document> {
RefPtr<Document> doc;
@ -142,9 +142,11 @@ nsContentDLF::CreateInstance(const char* aCommand, nsIChannel* aChannel,
return doc.forget();
},
aDocListener, aDocViewer);
} // Try SVG
else if (IsTypeInList(contentType, gSVGTypes)) {
rv = CreateDocument(
}
// Try SVG
if (IsTypeInList(contentType, gSVGTypes)) {
return CreateDocument(
aCommand, aChannel, aLoadGroup, aContainer,
[]() -> already_AddRefed<Document> {
RefPtr<Document> doc;
@ -153,10 +155,12 @@ nsContentDLF::CreateInstance(const char* aCommand, nsIChannel* aChannel,
return doc.forget();
},
aDocListener, aDocViewer);
} else if (mozilla::DecoderTraits::ShouldHandleMediaType(
contentType.get(),
/* DecoderDoctorDiagnostics* */ nullptr)) {
rv = CreateDocument(
}
if (mozilla::DecoderTraits::ShouldHandleMediaType(
contentType.get(),
/* DecoderDoctorDiagnostics* */ nullptr)) {
return CreateDocument(
aCommand, aChannel, aLoadGroup, aContainer,
[]() -> already_AddRefed<Document> {
RefPtr<Document> doc;
@ -165,10 +169,11 @@ nsContentDLF::CreateInstance(const char* aCommand, nsIChannel* aChannel,
return doc.forget();
},
aDocListener, aDocViewer);
} // Try image types
else if (IsImageContentType(contentType)) {
imageDocument = true;
rv = CreateDocument(
}
// Try image types
if (IsImageContentType(contentType)) {
return CreateDocument(
aCommand, aChannel, aLoadGroup, aContainer,
[]() -> already_AddRefed<Document> {
RefPtr<Document> doc;
@ -177,18 +182,10 @@ nsContentDLF::CreateInstance(const char* aCommand, nsIChannel* aChannel,
return doc.forget();
},
aDocListener, aDocViewer);
} else {
// If we get here, then we weren't able to create anything. Sorry!
return NS_ERROR_FAILURE;
}
if (NS_SUCCEEDED(rv) && !imageDocument) {
Document* doc = (*aDocViewer)->GetDocument();
MOZ_ASSERT(doc);
doc->MakeBrowsingContextNonSynthetic();
}
return rv;
// If we get here, then we weren't able to create anything. Sorry!
return NS_ERROR_FAILURE;
}
NS_IMETHODIMP

8
layout/generic/LayoutMessageUtils.h
Просмотреть файл

@ -7,11 +7,9 @@
#ifndef LAYOUT_GENERIC_LAYOUTMESSAGEUTILS_H_
#define LAYOUT_GENERIC_LAYOUTMESSAGEUTILS_H_
#include "ipc/EnumSerializer.h"
#include "ipc/IPCMessageUtils.h"
#include "nsIFrame.h"
#include "mozilla/AspectRatio.h"
#include "mozilla/webrender/WebRenderTypes.h"
namespace IPC {
@ -43,12 +41,6 @@ struct ParamTraits<mozilla::AspectRatio> {
}
};
template <>
struct ParamTraits<mozilla::StyleImageRendering>
: public ContiguousEnumSerializerInclusive<
mozilla::StyleImageRendering, mozilla::StyleImageRendering::Auto,
mozilla::StyleImageRendering::Optimizequality> {};
} // namespace IPC
#endif // LAYOUT_GENERIC_LAYOUTMESSAGEUTILS_H_

73
layout/generic/nsImageFrame.cpp
Просмотреть файл

@ -42,7 +42,6 @@
#include "nsIImageLoadingContent.h"
#include "nsImageLoadingContent.h"
#include "nsImageRenderer.h"
#include "nsObjectLoadingContent.h"
#include "nsString.h"
#include "nsPrintfCString.h"
#include "nsPresContext.h"
@ -356,8 +355,6 @@ void nsImageFrame::DisconnectMap() {
void nsImageFrame::DestroyFrom(nsIFrame* aDestructRoot,
PostDestroyData& aPostDestroyData) {
MaybeSendIntrinsicSizeAndRatioToEmbedder(Nothing(), Nothing());
if (mReflowCallbackPosted) {
PresShell()->CancelReflowCallback(this);
mReflowCallbackPosted = false;
@ -516,11 +513,6 @@ void nsImageFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
// We have a PresContext now, so we need to notify the image content node
// that it can register images.
imageLoader->FrameCreated(this);
if (nsIDocShell* docShell = PresContext()->GetDocShell()) {
RefPtr<BrowsingContext> bc = docShell->GetBrowsingContext();
mIsInObjectOrEmbed = bc->IsEmbedderTypeObjectOrEmbed() &&
PresContext()->Document()->IsImageDocument();
}
} else {
const StyleImage* image = GetImageFromStyle();
MOZ_ASSERT(mKind == Kind::ListStyleImage || image->IsImageRequestType(),
@ -546,8 +538,6 @@ void nsImageFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
currentRequest->BoostPriority(categoryToBoostPriority);
}
MaybeSendIntrinsicSizeAndRatioToEmbedder();
}
void nsImageFrame::SetupForContentURLRequest() {
@ -960,13 +950,6 @@ void nsImageFrame::UpdateImage(imgIRequest* aRequest, imgIContainer* aImage) {
bool intrinsicRatioChanged = UpdateIntrinsicRatio();
return intrinsicSizeChanged || intrinsicRatioChanged;
}();
if (intrinsicSizeOrRatioChanged) {
// Our aspect-ratio property value changed, and an embedding <object> or
// <embed> might care about that.
MaybeSendIntrinsicSizeAndRatioToEmbedder();
}
if (!GotInitialReflow()) {
return;
}
@ -1039,47 +1022,6 @@ void nsImageFrame::InvalidateSelf(const nsIntRect* aLayerInvalidRect,
}
}
void nsImageFrame::MaybeSendIntrinsicSizeAndRatioToEmbedder() {
MaybeSendIntrinsicSizeAndRatioToEmbedder(Some(GetIntrinsicSize()),
Some(GetAspectRatio()));
}
void nsImageFrame::MaybeSendIntrinsicSizeAndRatioToEmbedder(
Maybe<IntrinsicSize> aIntrinsicSize, Maybe<AspectRatio> aIntrinsicRatio) {
if (!mIsInObjectOrEmbed || !mImage) {
return;
}
nsCOMPtr<nsIDocShell> docShell = PresContext()->GetDocShell();
if (!docShell) {
return;
}
BrowsingContext* bc = docShell->GetBrowsingContext();
if (!bc) {
return;
}
MOZ_ASSERT(bc->IsContentSubframe());
if (bc->GetParent()->IsInProcess()) {
if (Element* embedder = bc->GetEmbedderElement()) {
if (nsCOMPtr<nsIObjectLoadingContent> olc = do_QueryInterface(embedder)) {
static_cast<nsObjectLoadingContent*>(olc.get())
->SubdocumentIntrinsicSizeOrRatioChanged(aIntrinsicSize,
aIntrinsicRatio);
} else {
MOZ_ASSERT_UNREACHABLE("Got out of sync?");
}
return;
}
}
if (BrowserChild* browserChild = BrowserChild::GetFrom(docShell)) {
Unused << browserChild->SendIntrinsicSizeOrRatioChanged(aIntrinsicSize,
aIntrinsicRatio);
}
}
void nsImageFrame::OnLoadComplete(imgIRequest* aRequest, nsresult aStatus) {
NotifyNewCurrentRequest(aRequest, aStatus);
}
@ -1097,10 +1039,6 @@ void nsImageFrame::ResponsiveContentDensityChanged() {
return;
}
// Our aspect-ratio property value changed, and an embedding <object> or
// <embed> might care about that.
MaybeSendIntrinsicSizeAndRatioToEmbedder();
PresShell()->FrameNeedsReflow(this, IntrinsicDirty::StyleChange,
NS_FRAME_IS_DIRTY);
}
@ -1213,15 +1151,8 @@ void nsImageFrame::EnsureIntrinsicSizeAndRatio() {
return;
}
bool intrinsicSizeOrRatioChanged = UpdateIntrinsicSize();
intrinsicSizeOrRatioChanged =
UpdateIntrinsicRatio() || intrinsicSizeOrRatioChanged;
if (intrinsicSizeOrRatioChanged) {
// Our aspect-ratio property value changed, and an embedding <object> or
// <embed> might care about that.
MaybeSendIntrinsicSizeAndRatioToEmbedder();
}
UpdateIntrinsicSize();
UpdateIntrinsicRatio();
}
nsIFrame::SizeComputationResult nsImageFrame::ComputeSize(

6
layout/generic/nsImageFrame.h
Просмотреть файл

@ -370,10 +370,6 @@ class nsImageFrame : public nsAtomicContainerFrame, public nsIReflowCallback {
void InvalidateSelf(const nsIntRect* aLayerInvalidRect,
const nsRect* aFrameInvalidRect);
void MaybeSendIntrinsicSizeAndRatioToEmbedder();
void MaybeSendIntrinsicSizeAndRatioToEmbedder(Maybe<mozilla::IntrinsicSize>,
Maybe<mozilla::AspectRatio>);
RefPtr<nsImageMap> mImageMap;
RefPtr<nsImageListener> mListener;
@ -401,8 +397,6 @@ class nsImageFrame : public nsAtomicContainerFrame, public nsIReflowCallback {
bool mReflowCallbackPosted;
bool mForceSyncDecoding;
bool mIsInObjectOrEmbed = false;
/* loading / broken image icon support */
// XXXbz this should be handled by the prescontext, I think; that

58
layout/generic/nsSubDocumentFrame.cpp
Просмотреть файл

@ -17,7 +17,6 @@
#include "mozilla/Unused.h"
#include "mozilla/dom/Document.h"
#include "mozilla/dom/HTMLFrameElement.h"
#include "mozilla/dom/ImageDocument.h"
#include "mozilla/dom/BrowserParent.h"
#include "nsCOMPtr.h"
@ -74,8 +73,7 @@ nsSubDocumentFrame::nsSubDocumentFrame(ComputedStyle* aStyle,
mIsInline(false),
mPostedReflowCallback(false),
mDidCreateDoc(false),
mCallingShow(false),
mIsInObjectOrEmbed(false) {}
mCallingShow(false) {}
#ifdef ACCESSIBILITY
a11y::AccType nsSubDocumentFrame::AccessibleType() {
@ -147,14 +145,8 @@ void nsSubDocumentFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
frameloader->Hide();
}
}
if (RefPtr<BrowsingContext> bc = frameloader->GetExtantBrowsingContext()) {
mIsInObjectOrEmbed = bc->IsEmbedderTypeObjectOrEmbed();
}
}
MaybeUpdateRemoteStyle();
PropagateIsUnderHiddenEmbedderElementToSubView(
PresShell()->IsUnderHiddenEmbedderElement() ||
!StyleVisibility()->IsVisible());
@ -189,7 +181,7 @@ void nsSubDocumentFrame::ShowViewer() {
}
RefPtr<nsFrameLoader> frameloader = FrameLoader();
if (!frameloader || frameloader->IsDead()) {
if (!frameloader) {
return;
}
@ -853,51 +845,11 @@ void nsSubDocumentFrame::MaybeUpdateEmbedderColorScheme() {
Unused << bc->SetEmbedderColorScheme(value);
}
void nsSubDocumentFrame::MaybeUpdateRemoteStyle(
ComputedStyle* aOldComputedStyle) {
if (!mIsInObjectOrEmbed) {
return;
}
if (aOldComputedStyle &&
aOldComputedStyle->StyleVisibility()->mImageRendering ==
Style()->StyleVisibility()->mImageRendering) {
return;
}
if (!mFrameLoader) {
return;
}
if (mFrameLoader->IsRemoteFrame()) {
mFrameLoader->UpdateRemoteStyle(
Style()->StyleVisibility()->mImageRendering);
return;
}
BrowsingContext* context = mFrameLoader->GetExtantBrowsingContext();
if (!context) {
return;
}
Document* document = context->GetDocument();
if (!document) {
return;
}
if (document->IsImageDocument()) {
document->AsImageDocument()->UpdateRemoteStyle(
Style()->StyleVisibility()->mImageRendering);
}
}
void nsSubDocumentFrame::DidSetComputedStyle(ComputedStyle* aOldComputedStyle) {
nsAtomicContainerFrame::DidSetComputedStyle(aOldComputedStyle);
MaybeUpdateEmbedderColorScheme();
MaybeUpdateRemoteStyle(aOldComputedStyle);
// If this presshell has invisible ancestors, we don't need to propagate the
// visibility style change to the subdocument since the subdocument should
// have already set the IsUnderHiddenEmbedderElement flag in
@ -1283,6 +1235,11 @@ nsPoint nsSubDocumentFrame::GetExtraOffset() const {
}
void nsSubDocumentFrame::SubdocumentIntrinsicSizeOrRatioChanged() {
if (MOZ_UNLIKELY(HasAllStateBits(NS_FRAME_IS_DIRTY))) {
// We will be reflowed soon anyway.
return;
}
const nsStylePosition* pos = StylePosition();
bool dependsOnIntrinsics =
!pos->mWidth.ConvertsToLength() || !pos->mHeight.ConvertsToLength();
@ -1291,7 +1248,6 @@ void nsSubDocumentFrame::SubdocumentIntrinsicSizeOrRatioChanged() {
auto dirtyHint = dependsOnIntrinsics ? IntrinsicDirty::StyleChange
: IntrinsicDirty::Resize;
PresShell()->FrameNeedsReflow(this, dirtyHint, NS_FRAME_IS_DIRTY);
InvalidateFrame();
}
}

3
layout/generic/nsSubDocumentFrame.h
Просмотреть файл

@ -135,8 +135,6 @@ class nsSubDocumentFrame final : public nsAtomicContainerFrame,
void ClearRetainedPaintData();
void MaybeUpdateEmbedderColorScheme();
void MaybeUpdateRemoteStyle(ComputedStyle* aOldComputedStyle = nullptr);
void PropagateIsUnderHiddenEmbedderElementToSubView(
bool aIsUnderHiddenEmbedderElement);
@ -195,7 +193,6 @@ class nsSubDocumentFrame final : public nsAtomicContainerFrame,
bool mPostedReflowCallback : 1;
bool mDidCreateDoc : 1;
bool mCallingShow : 1;
bool mIsInObjectOrEmbed : 1;
};
namespace mozilla {

5
layout/style/ImageDocument.css
Просмотреть файл

@ -25,11 +25,6 @@ body {
}
}
.isInObjectOrEmbed {
width: 100%;
height: 100vh;
}
img {
display: block;
}

17
modules/libpref/init/StaticPrefList.yaml
Просмотреть файл

@ -1617,23 +1617,6 @@
value: @IS_NIGHTLY_BUILD@
mirror: always
# When this pref is enabled, <object> and <embed> elements will create
# synthetic documents when the resource type they're loading is an image.
- name: browser.opaqueResponseBlocking.syntheticBrowsingContext
type: bool
value: @IS_NIGHTLY_BUILD@
mirror: once
# When this pref is enabled, <object> and <embed> elements will filter the
# browsing contexts created for the synthetic browsing contexts for the
# synthetic documents when browser.opaqueResponseBlocking.syntheticBrowsingContext
# is enabled from `Window.frames`, `Window.length` and named targeting.
- name: browser.opaqueResponseBlocking.syntheticBrowsingContext.filter
type: bool
value: @IS_NIGHTLY_BUILD@
mirror: once
do_not_use_directly: true
# When true, zooming will be enabled on all sites, even ones that declare
# user-scalable=no.
- name: browser.ui.zoom.force-user-scalable