diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-27 11:18:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-03 09:38:30 +0000 |
| commit | d94af01c90575348c4e81a418257f254b6f8d225 (patch) | |
| tree | 77a26669b33eaa4d46b88b07e17dacc61eba6001 /chromium/third_party/blink/renderer/core/paint/compositing/compositing_layer_property_updater.cc | |
| parent | 5d87695f37678f96492b258bbab36486c59866b4 (diff) | |
BASELINE: Update Chromium to 75.0.3770.116
Change-Id: Ifcd5227841577e8ce81a1b7a54c56caba4d85e02
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/paint/compositing/compositing_layer_property_updater.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/core/paint/compositing/compositing_layer_property_updater.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chromium/third_party/blink/renderer/core/paint/compositing/compositing_layer_property_updater.cc b/chromium/third_party/blink/renderer/core/paint/compositing/compositing_layer_property_updater.cc index aff08d420fe..50e185b0966 100644 --- a/chromium/third_party/blink/renderer/core/paint/compositing/compositing_layer_property_updater.cc +++ b/chromium/third_party/blink/renderer/core/paint/compositing/compositing_layer_property_updater.cc @@ -172,8 +172,16 @@ void CompositingLayerPropertyUpdater::Update(const LayoutObject& object) { auto* main_graphics_layer = mapping->MainGraphicsLayer(); if (main_graphics_layer->ContentsLayer()) { - main_graphics_layer->SetContentsPropertyTreeState( - fragment_data.ContentsProperties()); + IntPoint offset; + // The offset should be zero when the layer has ReplacedContentTransform, + // because the offset has been baked into ReplacedContentTransform. + if (!fragment_data.PaintProperties() || + !fragment_data.PaintProperties()->ReplacedContentTransform()) { + offset = main_graphics_layer->ContentsRect().Location() + + main_graphics_layer->GetOffsetFromTransformNode(); + } + main_graphics_layer->SetContentsLayerState( + fragment_data.ContentsProperties(), offset); } if (auto* squashing_layer = mapping->SquashingLayer()) { |