diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-07 18:53:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-23 11:45:33 +0100 |
| commit | e3bd776e020723ad8caf0a02d8db0d19e0f0e650 (patch) | |
| tree | 8ed999eb97278d2cb7954695f03d0bc3652ee6b0 /drawinglayer/source/processor2d | |
| parent | be596c0192f059324d06716b625be6a11079f8ea (diff) | |
Split BasePrimitive2D UNO interface into separate object
Rather than make all the BasePrimitive2D classes bear the cost of being an UNO
object, we just wrap the top level BasePrimitive2D in this class when we need
to pass them over UNO.
This reduces the locking overhead when doing normal drawinglayer operations,
and reduces the size of drawinglayer objects and the cost of initialising
them, which shaves 5% off the load/display time of a large barchart.
Add new drawinglayer::convertPrimitive2DContainerToBitmapEx utility
method to avoid needing to convert to Sequence<XPrimitive2D>
Change-Id: I553eaa4c16ba016b098cb21f6c55f5008f0d9b53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126487
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer/source/processor2d')
| -rw-r--r-- | drawinglayer/source/processor2d/baseprocessor2d.cxx | 9 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx index b4291dd4431c..e7a6a44932f7 100644 --- a/drawinglayer/source/processor2d/baseprocessor2d.cxx +++ b/drawinglayer/source/processor2d/baseprocessor2d.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <comphelper/sequence.hxx> @@ -48,8 +49,7 @@ namespace drawinglayer::processor2d // Primitive2DDecompositionVisitor void BaseProcessor2D::visit(const primitive2d::Primitive2DReference& rCandidate) { - const primitive2d::BasePrimitive2D* pBasePrimitive = static_cast< const primitive2d::BasePrimitive2D* >(rCandidate.get()); - processBasePrimitive2D(*pBasePrimitive); + processBasePrimitive2D(*rCandidate); } void BaseProcessor2D::visit(const primitive2d::Primitive2DContainer& rContainer) { @@ -64,9 +64,8 @@ namespace drawinglayer::processor2d { for (const primitive2d::Primitive2DReference& rCandidate : rSource) { - const primitive2d::BasePrimitive2D* pBasePrimitive = static_cast< const primitive2d::BasePrimitive2D* >(rCandidate.get()); - if (pBasePrimitive) - processBasePrimitive2D(*pBasePrimitive); + if (rCandidate) + processBasePrimitive2D(*rCandidate); } } diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index c4ca011d30d1..73a3332af221 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -620,9 +620,7 @@ void VclPixelProcessor2D::processUnifiedTransparencePrimitive2D( if (1 == rContent.size()) { - const primitive2d::Primitive2DReference xReference(rContent[0]); - const primitive2d::BasePrimitive2D* pBasePrimitive - = static_cast<const primitive2d::BasePrimitive2D*>(xReference.get()); + const primitive2d::BasePrimitive2D* pBasePrimitive = rContent[0].get(); switch (pBasePrimitive->getPrimitive2DID()) { |