980436 - Fix widget/windows/nsDragService.cpp's use of DataSourceSurface::Map() the Moz2D conversion

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Jonathan Watt [:jwatt]]

Bug 962786 left widget/windows/nsDragService.cpp in a bit of a weird state. It Map()'s a DataSourceSurface without actually using the map, and fails to call Unmap() at multiple return points. It also seems to still be using a gfxImageSurface to do the drawing.

Comment 1

[Jonathan Watt [:jwatt]]

Attachment: patch

Comment 2

[Jonathan Watt [:jwatt]]

The code for CopyPixelDataToPackedArray is in bug 980547.

Comment 3

[Matt Woodrow (:mattwoodrow)]

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

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

::: widget/windows/nsDragService.cpp
@@ +112,5 @@
> +                                     dataSurface->GetSize(),
> +                                     map.mStride,
> +                                     dataSurface->GetFromat());
> +  if (!dt) {
> +    dataSurface->Unmap();

FWIW, I am hugely for a RAII class to prevent needing to do this :)

Comment 4

[Jonathan Watt [:jwatt]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c6cec6e8dbac

Comment 5

[Ed Morley [:emorley]]

Push backed out for crashes:
https://tbpl.mozilla.org/?tree=Mozilla-Inbound&rev=a2b62ced704d

remote:   https://hg.mozilla.org/integration/mozilla-inbound/rev/0ee66295c251
remote:   https://hg.mozilla.org/integration/mozilla-inbound/rev/360307f9ee38

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/4528bce55006