mirror of
https://github.com/LibreOffice/core.git
synced 2025-07-26 15:45:26 +00:00
b17e0bb5ca
which was keeping stuff alive for too long.
regression from
commit 8a17b7f0a6
Author: Noel Grandin <noelgrandin@gmail.com>
Date: Thu Mar 13 18:37:54 2025 +0200
tdf#131595 Improve drawinglayer flushing mechanism.
Change-Id: I82c3e11d027b22a969d2ce786a0945fea2deb6b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186389
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
115 lines
3.8 KiB
C++
115 lines
3.8 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <comphelper/configuration.hxx>
|
|
#include <drawinglayer/primitive2d/BufferedDecompositionGroupPrimitive2D.hxx>
|
|
#include <drawinglayer/geometry/viewinformation2d.hxx>
|
|
#include <drawinglayer/primitive2d/BufferedDecompositionFlusher.hxx>
|
|
|
|
namespace drawinglayer::primitive2d
|
|
{
|
|
bool BufferedDecompositionGroupPrimitive2D::hasBuffered2DDecomposition() const
|
|
{
|
|
if (!mbFlushOnTimer)
|
|
return !maBuffered2DDecomposition.empty();
|
|
else
|
|
{
|
|
std::lock_guard Guard(maCallbackLock);
|
|
return !maBuffered2DDecomposition.empty();
|
|
}
|
|
}
|
|
|
|
void BufferedDecompositionGroupPrimitive2D::setBuffered2DDecomposition(Primitive2DContainer&& rNew)
|
|
{
|
|
if (!mbFlushOnTimer)
|
|
{
|
|
// no flush used, just set
|
|
maBuffered2DDecomposition = std::move(rNew);
|
|
}
|
|
else
|
|
{
|
|
// decomposition changed, touch
|
|
maLastAccess = std::chrono::steady_clock::now();
|
|
BufferedDecompositionFlusher::update(this);
|
|
|
|
// tdf#158913 need to secure change when flush/multithreading is in use
|
|
std::lock_guard Guard(maCallbackLock);
|
|
maBuffered2DDecomposition = std::move(rNew);
|
|
}
|
|
}
|
|
|
|
BufferedDecompositionGroupPrimitive2D::BufferedDecompositionGroupPrimitive2D(
|
|
Primitive2DContainer&& aChildren)
|
|
: GroupPrimitive2D(std::move(aChildren))
|
|
, maCallbackLock()
|
|
, mbFlushOnTimer(false)
|
|
{
|
|
}
|
|
|
|
BufferedDecompositionGroupPrimitive2D::~BufferedDecompositionGroupPrimitive2D()
|
|
{
|
|
if (mbFlushOnTimer)
|
|
BufferedDecompositionFlusher::remove(this);
|
|
}
|
|
|
|
void BufferedDecompositionGroupPrimitive2D::get2DDecomposition(
|
|
Primitive2DDecompositionVisitor& rVisitor,
|
|
const geometry::ViewInformation2D& rViewInformation) const
|
|
{
|
|
if (!mbFlushOnTimer)
|
|
{
|
|
// no flush/multithreading is in use, just call
|
|
if (maBuffered2DDecomposition.empty())
|
|
create2DDecomposition(maBuffered2DDecomposition, rViewInformation);
|
|
rVisitor.visit(maBuffered2DDecomposition);
|
|
}
|
|
else
|
|
{
|
|
// tdf#158913 need to secure 'visit' when flush/multithreading is in use,
|
|
// so that the local non-ref-Counted instance of the decomposition gets not
|
|
// manipulated (e.g. deleted)
|
|
Primitive2DContainer xTmp;
|
|
{
|
|
maLastAccess = std::chrono::steady_clock::now();
|
|
// only hold the lock for long enough to get a valid reference
|
|
std::lock_guard Guard(maCallbackLock);
|
|
if (maBuffered2DDecomposition.empty())
|
|
{
|
|
create2DDecomposition(maBuffered2DDecomposition, rViewInformation);
|
|
BufferedDecompositionFlusher::update(this);
|
|
}
|
|
xTmp = maBuffered2DDecomposition;
|
|
}
|
|
rVisitor.visit(xTmp);
|
|
}
|
|
}
|
|
|
|
void BufferedDecompositionGroupPrimitive2D::activateFlushOnTimer()
|
|
{
|
|
if (comphelper::IsFuzzing())
|
|
return;
|
|
mbFlushOnTimer = true;
|
|
}
|
|
|
|
} // end of namespace drawinglayer::primitive2d
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|