915985 - Add a ZoomConstraints class to hold the allowzoom and min/max zoom values

Status: RESOLVED FIXED

(Core :: Panning and Zooming, defect)

Description

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

The arguments to AsyncPanZoomController::UpdateZoomConstraints are passed around together in a bunch of places, originating somewhere in TabChild, going through TabParent, RenderFrameParent, APZCTreeManager, and GeckoContentController. It would be nice to define a struct to hold these three values, as botond noted at https://bugzilla.mozilla.org/show_bug.cgi?id=909881#c1.

Comment 1

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

This will simplify the B2G half of bug 941995.

Comment 2

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

Attachment: Patch

Pretty straightforward mechanical change. Try push to make sure I didn't run afoul of some arcane compiler:

https://tbpl.mozilla.org/?tree=Try&rev=5cb774c860b1

Comment 3

[Botond Ballo [:botond]]

Comment on attachment 8355673 [details] [diff] [review]
Patch

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

::: gfx/layers/ipc/AsyncPanZoomController.cpp
@@ +1696,4 @@
>  }
>  
> +ZoomConstraints
> +AsyncPanZoomController::GetZoomConstraints()

This method can be const. (Could have been before, too.)

::: gfx/layers/ipc/GeckoContentController.h
@@ +75,5 @@
>     * Retrieves the last known zoom constraints for the root scrollable layer
>     * for this layers tree. This function should return false if there are no
>     * last known zoom constraints.
>     */
> +  virtual bool GetRootZoomConstraints(ZoomConstraints* aConstraints)

Let's call this aOutConstraints for consistency.

::: layout/ipc/RenderFrameParent.cpp
@@ +617,3 @@
>    }
>  
> +  virtual bool GetRootZoomConstraints(ZoomConstraints* aConstraints)

Likewise.

Comment 4

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

Attachment: Patch

Made the changes above and got a green try: https://tbpl.mozilla.org/?tree=Try&rev=0a0f729e03f9

I also added a check to make sure aOutConstraints is non-null before writing to it for consistency.

Comment 5

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

https://hg.mozilla.org/integration/mozilla-inbound/rev/8812993d675b

Comment 6

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/8812993d675b

Comment 7

[Milan Sreckovic [:milan] (needinfo for best results)]

Kats, is the patch on this bug appropriate as-is for Aurora/1.3?

Comment 8

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

Attachment: Patch rebased on mozilla-aurora (FF28)

Yup. Here's a version that applies cleanly to the latest aurora tip (required some minor manual rebasing). If you mark the bug as 1.3+ I'm happy to uplift it.

Comment 9

[Milan Sreckovic [:milan] (needinfo for best results)]

Blocks a 1.3+

Comment 10

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

https://hg.mozilla.org/releases/mozilla-aurora/rev/af1d31586716