1275826 - Remove composition adjustment code, base on layer-index, in nsCSSRendering::PaintBackgroundWithSC

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[u459114]

According to bug 1275451 comment 9, remove layer index check at [1]
Have that logic at caller-side(GenerateMaskSurface) only. 

[1] https://dxr.mozilla.org/mozilla-central/source/layout/base/nsCSSRendering.cpp#3091

Comment 1

[u459114]

Attachment: Bug 1275826 - Part 1. Determine composition mode base on layer index and image type.

Review commit: https://reviewboard.mozilla.org/r/76730/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/76730/

Comment 2

[u459114]

Attachment: Bug 1275826 - Part 2. Remove a unsed parameter in PrepareImageLayer.

Review commit: https://reviewboard.mozilla.org/r/76736/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/76736/

Comment 3

[u459114]

Comment on attachment 8788138 [details]
Bug 1275826 - Part 1. Determine composition mode base on layer index and image type.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/76730/diff/1-2/

Comment 4

[Markus Stange [:mstange]]

Comment on attachment 8788138 [details]
Bug 1275826 - Part 1. Determine composition mode base on layer index and image type.

https://reviewboard.mozilla.org/r/76730/#review74836

::: layout/base/nsCSSRendering.cpp:3049
(Diff revision 2)
> +  const nsStyleImageLayers::Layer& layer = aLayers.mLayers[aLayerIndex];
> +  // While drawing all layers, get the compositon op from each image layer.
> +  if (aParams.paintFlags & nsCSSRendering::PAINTBG_MASK_IMAGE) {
> +    // Always using OP_OVER mode while drawing the bottom mask layer.
> +    return (aLayerIndex == (aLayers.mImageCount - 1))
> +           ? CompositionOp::OP_OVER
> +           : nsCSSRendering::GetGFXCompositeMode(layer.mComposite);
> +  } else {
> +    return nsCSSRendering::GetGFXBlendMode(layer.mBlendMode);
> +  }

No else after return, please.

I'd also replace "While drawing" with "When drawing", and I'd slightly prefer an if condition instead of the ternary operator inside the mask case.

Comment 5

[Markus Stange [:mstange]]

Comment on attachment 8788142 [details]
Bug 1275826 - Part 2. Remove a unsed parameter in PrepareImageLayer.

https://reviewboard.mozilla.org/r/76736/#review74838

Comment 6

[u459114]

Comment on attachment 8788138 [details]
Bug 1275826 - Part 1. Determine composition mode base on layer index and image type.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/76730/diff/2-3/

Comment 7

[u459114]

Comment on attachment 8788142 [details]
Bug 1275826 - Part 2. Remove a unsed parameter in PrepareImageLayer.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/76736/diff/1-2/

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/76c0440bbaf1
Part 1. Determine composition mode base on layer index and image type. r=mstange
https://hg.mozilla.org/integration/autoland/rev/8454daae5c1f
Part 2. Remove a unsed parameter in PrepareImageLayer. r=mstange

Comment 9

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/76c0440bbaf1
https://hg.mozilla.org/mozilla-central/rev/8454daae5c1f