wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-27 17:47:34 +09:00
Code Issues Projects Releases Packages Wiki Activity

Make extra sure Compositables don't refer back to layers after reassignment.

Browse source
This commit is contained in:
wolfbeast 2019-05-28 15:18:04 +02:00 • committed by Roy Tam
commit 706ac5f0a4
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gfx/layers/composite/CanvasLayerComposite.cpp
View file

@ -43,9 +43,13 @@ bool
CanvasLayerComposite::SetCompositableHost(CompositableHost* aHost) CanvasLayerComposite::SetCompositableHost(CompositableHost* aHost)
{ {
switch (aHost->GetType()) { switch (aHost->GetType()) {
case CompositableType::IMAGE: case CompositableType::IMAGE: {
if (mCompositableHost && aHost != mCompositableHost) {
mCompositableHost->Detach(this);
}
mCompositableHost = aHost; mCompositableHost = aHost;
return true; return true;
}
default: default:
return false; return false;
} }

9
gfx/layers/composite/ImageLayerComposite.cpp
View file

@ -50,9 +50,14 @@ bool
ImageLayerComposite::SetCompositableHost(CompositableHost* aHost) ImageLayerComposite::SetCompositableHost(CompositableHost* aHost)
{ {
switch (aHost->GetType()) { switch (aHost->GetType()) {
case CompositableType::IMAGE: case CompositableType::IMAGE: {
mImageHost = static_cast<ImageHost*>(aHost); ImageHost* newImageHost = static_cast<ImageHost*>(aHost);
if (mImageHost && newImageHost != mImageHost) {
mImageHost->Detach(this);
}
mImageHost = newImageHost;
return true; return true;
}
default: default:
return false; return false;
} }

9
gfx/layers/composite/PaintedLayerComposite.cpp
View file

@ -49,9 +49,14 @@ PaintedLayerComposite::SetCompositableHost(CompositableHost* aHost)
switch (aHost->GetType()) { switch (aHost->GetType()) {
case CompositableType::CONTENT_TILED: case CompositableType::CONTENT_TILED:
case CompositableType::CONTENT_SINGLE: case CompositableType::CONTENT_SINGLE:
case CompositableType::CONTENT_DOUBLE: case CompositableType::CONTENT_DOUBLE: {
mBuffer = static_cast<ContentHost*>(aHost); ContentHost* newBuffer = static_cast<ContentHost*>(aHost);
if (mBuffer && newBuffer != mBuffer) {
mBuffer->Detach(this);
}
mBuffer = newBuffer;
return true; return true;
}
default: default:
return false; return false;
} }