997445 - Windows ShellService Fixups @2014-04. Port Firefox fixes: Bug 950368, Bug 950372, Bug 980415.

Status: RESOLVED FIXED

(SeaMonkey :: OS Integration, defect)

Description

[Philip Chee]

> c:/t1/hg/comm-central/suite/shell/src/nsWindowsShellService.cpp(648) : error C2440: 'initializing' : cannot co
> nvert from 'mozilla::TemporaryRef<T>' to 'nsRefPtr<T>'
>         with
>         [
>             T=mozilla::gfx::SourceSurface
>         ]
>         and
>         [
>             T=gfxASurface
>         ]
>         No constructor could take the source type, or constructor overload resolution was ambiguous
> c:/t1/hg/comm-central/config/rules.mk:960: recipe for target 'nsWindowsShellService.obj' failed
> mozmake[3]: *** [nsWindowsShellService.obj] Error 2
> mozmake[3]: Leaving directory 'c:/t1/hg/objdir-sm/suite/shell/src'

Port the following Firefox fixes:
Bug 950368 - Make nsWindowsShellService's WriteBitmap act on a Moz2D SourceSurface instead of a Thebes gfxASurface.
Bug 950372 - Convert imgIContainer::GetFrame to return a Moz2D SourceSurface instead of a Thebes gfxASurface.
Bug 980415 - Fix multiple points in the codebase where we fail to call DataSourceSurface::Unmap().

Comment 1

[Philip Chee]

Attachment: Patch v1.0 Bustage fix plus some ride along patches.

Comment 2

[[e-mail]]

Comment on attachment 8407851 [details] [diff] [review]
Patch v1.0 Bustage fix plus some ride along patches.

>+  int32_t width = dataSurface->GetSize().width;
>+  int32_t height = dataSurface->GetSize().height;
>+  int32_t bytesPerPixel = 4 * sizeof(uint8_t);
>+  uint32_t bytesPerRow = bytesPerPixel * width;
I asked on IRC why this one was different and the answer was "not sure". I'd like them all to be int32_t please. r=me with that fixed.

Comment 3

[Philip Chee]

Pushed comm-central changeset 16758a07a0dc
http://hg.mozilla.org/comm-central/rev/16758a07a0dc