867269 - SyncFrameMetrics override is disconnected and breaks compiles on gcc 4.7+

Status: RESOLVED FIXED

(Core :: Graphics: Layers, defect)

Description

[Kartikaya Gupta (email:[e-mail])]

In https://hg.mozilla.org/mozilla-central/rev/4b2b6c39adf9 (bug 839641) I added a SyncFrameMetrics method CompositorParent which was overridden in the AndroidCompositorParent subclass in Fennec. The AndroidCompositorParent subclass was introduced in bug 860613 a couple of weeks ago.

The refactoring in bug 861727 moved some of the stuff in CompositorParent out into a AsyncCompositionManager class, including the SyncFrameMetrics method. This means the override in AndroidCompositorParent is now on the wrong class, and therefore that code path is broken. The code path is disabled by default so it will not manifest anywhere.

However, the MOZ_OVERRIDE tag on the function causes builds with gcc 4.7 and up to fail.

Comment 1

[Benoit Girard (:BenWa)]

Glad to see MOZ_OVERRIDE catching real bugs :)

Comment 2

[Kartikaya Gupta (email:[e-mail])]

Attachment: Patch

Still building this locally. It makes SyncFrameMetrics a non-virtual function, similar to how SetFirstPaintViewport, SetPageRect, and SyncViewportInfo work.

Comment 3

[Kartikaya Gupta (email:[e-mail])]

Attachment: Better patch

Comment 4

[Nick Cameron [:nrc]]

Sorry about breaking your patch and thanks for the fix - bug 861727 turned into rebase hell, I presume I missed this in one of the rebases.

Comment 5

[Nick Cameron [:nrc]]

Comment on attachment 743891 [details] [diff] [review]
Better patch

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

lgtm

Comment 6

[Kartikaya Gupta (email:[e-mail])]

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

Comment 7

[Kartikaya Gupta (email:[e-mail])]

I typo'd the ifdef check and didn't qref the fix for it. Oops. Landed as a trivial follow-up:

https://hg.mozilla.org/integration/mozilla-inbound/rev/9a0a3cb01e5c

Comment 8

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/ea568a1576e5
https://hg.mozilla.org/mozilla-central/rev/9a0a3cb01e5c