773462 - OMTC: Fix calls to ImageContainer::SetCurrentImage in layer transactions

Status: RESOLVED FIXED

(Core :: Graphics: Layers, defect)

Description

[Nicolas Silva [:nical]]

With bug 598868, ImageContainer got a new and shiny method SetCurrentImageInTransaction better suited to cases where the current image is set on the main thread within a layer transaction.

We need to replace the concerned calls to SetCurrentImage by calls to SetCurrentImageInTransaction.

Comment 1

[Nicolas Silva [:nical]]

Here is a list of the potentail caller of SetCurrentImage that might be in layer transactions:

layout/base/FrameLayerBuilder.cpp
2952:    container->SetCurrentImage(image);

image/src/RasterImage.cpp
931:  mImageContainer->SetCurrentImage(image);

dom/plugins/base/nsPluginInstanceOwner.cpp
3703:      container->SetCurrentImage(nsnull);

dom/plugins/ipc/PluginInstanceParent.cpp
758:        container->SetCurrentImage(ioImage);
773:    container->SetCurrentImage(pluginImage);

I am confident the first two happen at least some times during transactions.

roc, you know these parts of the code way better than me, do you know if some of these should be changed for SetCurrentImageInTransaction?

Comment 2

[Robert O'Callahan (:roc) (email my personal email if necessary)]

(In reply to Nicolas Silva [:nical] from comment #1)
> layout/base/FrameLayerBuilder.cpp
> 2952:    container->SetCurrentImage(image);
> 
> image/src/RasterImage.cpp
> 931:  mImageContainer->SetCurrentImage(image);
> 
> dom/plugins/base/nsPluginInstanceOwner.cpp
> 3703:      container->SetCurrentImage(nsnull);

There are actually several SetCurrentImage calls in this file.

> roc, you know these parts of the code way better than me, do you know if
> some of these should be changed for SetCurrentImageInTransaction?

I think they all need to be SetCurrentImageInTransaction.

Comment 3

[Nicolas Silva [:nical]]

Attachment: Replaces calls to ImageContainer's SetCurrentImage with calls to SetCurrentImageInTransaction used within a layers transaction.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2fd48f64273e

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/2fd48f64273e