964731 - Convert ImageLayerD3D10 and CreateOptimalSurface/CreateOptimalMaskSurface to Moz2D

Status: RESOLVED FIXED

(Core :: Graphics: Layers, defect)

Description

[Ali Ak]

Remove the calls to Image::DeprecatedGetAsSurface from ImageLayerD3D10::GetImageSRView.

Comment 1

[Liz Henry (:lizzard) (relman/hg->git project)]

Hi Ali, Is this unconfirmed because you're not sure it is a bug, or because you need to have editbug permissions for Bugzilla? Let me know. Thanks!

Comment 2

[Liz Henry (:lizzard) (relman/hg->git project)]

Ali, I went ahead and gave you canconfirm permissions based on your bugzilla history. Let me know if you need anything else!

Comment 3

[Ali Ak]

Thanks Liz! It was indeed because of the latter.

Comment 4

[Jonathan Watt [:jwatt]]

The ImageLayerD3D10 code is strongly intertwined with CreateOptimalSurface/CreateOptimalMaskSurface, so I'm also going to convert them as part of this bug.

Comment 5

[Jonathan Watt [:jwatt]]

Attachment: patch

Bas, I'm trying to maintain the gKeyD3D10Texture optimization, although doing so is messy.

Comment 6

[Jonathan Watt [:jwatt]]

Also you can ignore the |data.mDeprecatedSurface = nullptr| line. I'll land this together with the patch is bug 960524 which kills off mDeprecatedSurface.

Comment 7

[Bas Schouten (:bas.schouten)]

Comment on attachment 8400694 [details] [diff] [review]
patch

Review of attachment 8400694 [details] [diff] [review]:
-----------------------------------------------------------------

This patch looks good, so this r- is not related to the quality of the patch, but we should really fix the native surface handling along with this probably.. That would remove a lot of the complexity.

::: layout/base/FrameLayerBuilder.cpp
@@ +3965,5 @@
>                               aRoundedRectClipCount);
>  
> +    RefPtr<SourceSurface> surface = dt->Snapshot();
> +#ifdef MOZ_ENABLE_D3D10_LAYER
> +    void* data = dt->GetUserData(gKeyD3D10Texture);

You want to use GetNativeSurface here on the dt and not depend on the userdata at least for the DrawTarget where you have that option. I wonder if we should add a GetNativeSurface on SourceSurface as well. I suspect we probably do..

Comment 8

[Jonathan Watt [:jwatt]]

Attachment: patch

Comment 10

[Jonathan Watt [:jwatt]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/70af90b7e08b

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/70af90b7e08b

Comment 12

[Liz Henry (:lizzard) (relman/hg->git project)]

I'm going to go ahead and mark this qa- since it's been in since Nightly and hasn't caused any obvious problems.