summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dom/html/nsGenericHTMLElement.cpp2
-rw-r--r--layout/generic/nsImageFrame.cpp4
-rw-r--r--layout/svg/nsSVGOuterSVGFrame.cpp16
3 files changed, 4 insertions, 18 deletions
diff --git a/dom/html/nsGenericHTMLElement.cpp b/dom/html/nsGenericHTMLElement.cpp
index afc76ee31..5af578b2d 100644
--- a/dom/html/nsGenericHTMLElement.cpp
+++ b/dom/html/nsGenericHTMLElement.cpp
@@ -1480,8 +1480,6 @@ nsGenericHTMLElement::MapImageSizeAttributesInto(const nsMappedAttributes* aAttr
}
}
- // 2020-07-15 (RealityRipple) Much of this is a guess based on a few sources.
- // Please go over this with a fine-tooth comb before production.
if (Preferences::GetBool("layout.css.width-and-height-map-to-aspect-ratio.enabled") &&
aMapAspectRatio && aWidth && aHeight) {
Maybe<double> w;
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 3208a3233..d6f47f2e4 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -287,10 +287,6 @@ nsImageFrame::Init(nsIContent* aContent,
p->AdjustPriority(-1);
}
-// 2020-07-14 (RealityRipple) Firefox is doing this completely differently
-// because of loading="lazy" support and the StyleDisplay()->IsContainSize()
-// property. Double-check all of this for problems.
-
static IntrinsicSize
ComputeIntrinsicSize(imgIContainer* aImage,
bool aUseMappedRatio,
diff --git a/layout/svg/nsSVGOuterSVGFrame.cpp b/layout/svg/nsSVGOuterSVGFrame.cpp
index d8cd2cb77..3f68245e2 100644
--- a/layout/svg/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/nsSVGOuterSVGFrame.cpp
@@ -234,22 +234,14 @@ nsSVGOuterSVGFrame::GetIntrinsicSize()
/* virtual */ AspectRatio
nsSVGOuterSVGFrame::GetIntrinsicRatio()
-{
- // 2020-07-14 (RealityRipple) Firefox Uses a new IsReplacedAndContainSize(this)
- // function call [Line 96-99 on trunk].
+{
+ // When 'contain: size' is implemented, make sure to check for it.
/*
- static inline bool IsReplacedAndContainSize(const nsSVGOuterSVGFrame* aFrame) {
- return aFrame->GetContent->GetParent() &&
- aFrame->StyleDisplay()->IsContainSize();
- }
- */
- // but since contain: size doesn't exist in Pale Moon yet...
-/*
- if (IsReplacedAndContainSize(this)) {
+ if (this->GetContent->GetParent() && this->StyleDisplay()->IsContainSize()) {
return AspectRatio();
}
*/
-
+
// We only have an intrinsic size/ratio if our width and height attributes
// are both specified and set to non-percentage values, or we have a viewBox
// rect: http://www.w3.org/TR/SVGMobile12/coords.html#IntrinsicSizing