summaryrefslogtreecommitdiffstats
path: root/layout/svg
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-07-12 18:56:16 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-07-12 18:56:16 +0200
commit53cf12d6d808c80c4ce240cbbf8d29344c8ce644 (patch)
tree4d187651b4548fa1a97065a732a20eec0fe5e473 /layout/svg
parent70dd5e7c66b1fe3f82e5b4db2406050baba15f05 (diff)
downloadUXP-53cf12d6d808c80c4ce240cbbf8d29344c8ce644.tar
UXP-53cf12d6d808c80c4ce240cbbf8d29344c8ce644.tar.gz
UXP-53cf12d6d808c80c4ce240cbbf8d29344c8ce644.tar.lz
UXP-53cf12d6d808c80c4ce240cbbf8d29344c8ce644.tar.xz
UXP-53cf12d6d808c80c4ce240cbbf8d29344c8ce644.zip
Bug 1346501. Don't mark every image as visible when a frame is created for it
Diffstat (limited to 'layout/svg')
-rw-r--r--layout/svg/SVGFEImageFrame.cpp6
-rw-r--r--layout/svg/nsSVGImageFrame.cpp6
2 files changed, 12 insertions, 0 deletions
diff --git a/layout/svg/SVGFEImageFrame.cpp b/layout/svg/SVGFEImageFrame.cpp
index 185096a93..b1f98c421 100644
--- a/layout/svg/SVGFEImageFrame.cpp
+++ b/layout/svg/SVGFEImageFrame.cpp
@@ -107,6 +107,12 @@ SVGFEImageFrame::Init(nsIContent* aContent,
nsFrame::Init(aContent, aParent, aPrevInFlow);
// We assume that feImage's are always visible.
+ // This call must happen before the FrameCreated. This is because the
+ // primary frame pointer on our content node isn't set until after this
+ // function ends, so there is no way for the resulting OnVisibilityChange
+ // notification to get a frame. FrameCreated has a workaround for this in
+ // that it passes our frame around so it can be accessed. OnVisibilityChange
+ // doesn't have that workaround.
IncApproximateVisibleCount();
nsCOMPtr<nsIImageLoadingContent> imageLoader =
diff --git a/layout/svg/nsSVGImageFrame.cpp b/layout/svg/nsSVGImageFrame.cpp
index c0a7f9419..2d6f75d26 100644
--- a/layout/svg/nsSVGImageFrame.cpp
+++ b/layout/svg/nsSVGImageFrame.cpp
@@ -159,6 +159,12 @@ nsSVGImageFrame::Init(nsIContent* aContent,
if (GetStateBits() & NS_FRAME_IS_NONDISPLAY) {
// Non-display frames are likely to be patterns, masks or the like.
// Treat them as always visible.
+ // This call must happen before the FrameCreated. This is because the
+ // primary frame pointer on our content node isn't set until after this
+ // function ends, so there is no way for the resulting OnVisibilityChange
+ // notification to get a frame. FrameCreated has a workaround for this in
+ // that it passes our frame around so it can be accessed. OnVisibilityChange
+ // doesn't have that workaround.
IncApproximateVisibleCount();
}