core.git: slideshow/source

[Tomaž Vajngerl (via logerrit)]

 slideshow/source/engine/slide/slideimpl.cxx |   63 +++-------------------------
 1 file changed, 7 insertions(+), 56 deletions(-)

New commits:
commit 92f694a300d15f5fa1aa9291fcfd229bbff60b08
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sat Jul 27 08:07:18 2024 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Oct 14 10:56:12 2024 +0200

    lok: remove code that renders other slide layers to increase speed
    
    This (temporary) removes rendering the other layers so we speed
    up fetching and rendering of the slides as we will only render and
    send the main slide layer to the online.
    
    Change-Id: I40a809499ae87850922b48785842ae6eead3a001
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174879
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/slideshow/source/engine/slide/slideimpl.cxx 
b/slideshow/source/engine/slide/slideimpl.cxx
index ff796e011bda..5c8fd9e28f3a 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -167,17 +167,9 @@ public:
                      const SlideShowContext& rContext,
                      const std::shared_ptr<LayerManager>& pLayerManager);
 
-    void renderBackground(unsigned char* pBuffer);
-    void renderTextFields(unsigned char* pBuffer);
-    void renderMasterPage(unsigned char* pBuffer);
-    void renderDrawPage(unsigned char* pBuffer);
     void renderNextLayer(unsigned char* pBuffer);
 
     const Size& getDeviceSize() const { return maDeviceSize; }
-    bool isBackgroundRenderingDone() const { return mbBackgroundRenderingDone; 
}
-    bool isTextFieldsRenderingDone() const { return mbTextFieldsRenderingDone; 
}
-    bool isMasterPageRenderingDone() const { return mbMasterPageRenderingDone; 
}
-    bool isDrawPageRenderingDone() const { return mbDrawPageRenderingDone; }
     bool isSlideRenderingDone() const { return mbSlideRenderingDone; }
     bool isBitmapLayer() const { return mbIsBitmapLayer; }
 
@@ -203,8 +195,8 @@ private:
 private:
     Size maDeviceSize;
     Size maSlideSize;
-    bool mbRenderBackground;
-    bool mbRenderMasterPageObjects;
+    //bool mbRenderBackground;
+    //bool mbRenderMasterPageObjects;
     basegfx::B2DHomMatrix maTransformation;
     uno::Reference<drawing::XDrawPage> mxDrawPage;
     uno::Reference<drawing::XDrawPagesSupplier> mxDrawPagesSupplier;
@@ -237,7 +229,7 @@ private:
 };
 
 LOKSlideRenderer::LOKSlideRenderer(const Size& rViewSize, const Size& 
rSlideSize,
-                                   bool bRenderBackground, bool 
bRenderMasterPageObjects,
+                                   bool /*bRenderBackground*/, bool 
/*bRenderMasterPageObjects*/,
                                    const uno::Reference<drawing::XDrawPage>& 
rxDrawPage,
                                    const 
uno::Reference<drawing::XDrawPagesSupplier>& rxDrawPagesSupplier,
                                    const 
uno::Reference<animations::XAnimationNode>& rxRootNode,
@@ -245,8 +237,8 @@ LOKSlideRenderer::LOKSlideRenderer(const Size& rViewSize, 
const Size& rSlideSize
                                    const std::shared_ptr<LayerManager>& 
pLayerManager) :
     maDeviceSize(rViewSize),
     maSlideSize(rSlideSize),
-    mbRenderBackground(bRenderBackground),
-    mbRenderMasterPageObjects(bRenderMasterPageObjects),
+    //mbRenderBackground(bRenderBackground),
+    //mbRenderMasterPageObjects(bRenderMasterPageObjects),
     maTransformation(createTransformation(maDeviceSize, maSlideSize)),
     mxDrawPage(rxDrawPage),
     mxDrawPagesSupplier(rxDrawPagesSupplier),
@@ -346,26 +338,6 @@ LOKSlideRenderer::LOKSlideRenderer(const Size& rViewSize, 
const Size& rSlideSize
         collectAnimatedShapes();
 }
 
-void LOKSlideRenderer::renderBackground(unsigned char* pBuffer)
-{
-    renderImpl(LayerGroupType::BACKGROUND, pBuffer);
-}
-
-void LOKSlideRenderer::renderMasterPage(unsigned char* pBuffer)
-{
-    renderImpl(LayerGroupType::MASTER_PAGE, pBuffer);
-}
-
-void LOKSlideRenderer::renderDrawPage(unsigned char* pBuffer)
-{
-    renderImpl(LayerGroupType::DRAW_PAGE, pBuffer);
-}
-
-void LOKSlideRenderer::renderTextFields(unsigned char* pBuffer)
-{
-    renderImpl(LayerGroupType::TEXT_FIELDS, pBuffer);
-}
-
 void LOKSlideRenderer::renderNextLayer(unsigned char* pBuffer)
 {
     OSL_ASSERT(pBuffer);
@@ -373,30 +345,9 @@ void LOKSlideRenderer::renderNextLayer(unsigned char* 
pBuffer)
     msLastJsonMessage = ""_ostr;
     mbIsBitmapLayer = false;
 
-    if (mbRenderBackground && !isBackgroundRenderingDone())
-    {
-        renderBackground(pBuffer);
-        if (!msLastJsonMessage.isEmpty())
-            return;
-    }
-
-    if (!isTextFieldsRenderingDone())
-    {
-        renderTextFields(pBuffer);
-        if (!msLastJsonMessage.isEmpty())
-            return;
-    }
-
-    if (mbRenderMasterPageObjects && !isMasterPageRenderingDone())
-    {
-        renderMasterPage(pBuffer);
-        if (!msLastJsonMessage.isEmpty())
-            return;
-    }
-
-    if (!isDrawPageRenderingDone())
+    if (!mbDrawPageRenderingDone)
     {
-        renderDrawPage(pBuffer);
+        renderImpl(LayerGroupType::DRAW_PAGE, pBuffer);
         if (!msLastJsonMessage.isEmpty())
             return;
     }