Bug 1143575. Convert SetCurrentImage(nullptr) callers to call ClearAllImages instead. r=nical

--HG--
extra : commitid : BN8G7I6BhiD
extra : rebase_source : 19fba64a55316faa5350274b21b4ee772c9cdad6
This commit is contained in:
Robert O'Callahan 2015-03-26 11:40:36 +13:00
Родитель 4cbd6a0b45
Коммит 77c34a416d
1 изменённых файлов: 2 добавлений и 5 удалений

Просмотреть файл

@ -197,13 +197,10 @@ PluginInstanceParent::ActorDestroy(ActorDestroyReason why)
UnsubclassPluginWindow();
}
#endif
// After this method, the data backing the remote surface may no
// longer be valid. The X surface may be destroyed, or the shared
// memory backing this surface may no longer be valid.
if (mFrontSurface) {
mFrontSurface = nullptr;
if (mImageContainer) {
mImageContainer->SetCurrentImage(nullptr);
mImageContainer->ClearAllImages();
}
#ifdef MOZ_X11
FinishX(DefaultXDisplay());
@ -639,7 +636,7 @@ PluginInstanceParent::RecvShow(const NPRect& updatedRect,
container->SetCurrentImage(cairoImage);
}
else if (mImageContainer) {
mImageContainer->SetCurrentImage(nullptr);
mImageContainer->ClearAllImages();
}
mFrontSurface = surface;