Refactor doc_paintPartTile a bit.

Move repeated lines into inline functions.
Move large code blocks into inline functions.
Separate the data validation and process parts.

Signed-off-by: Gökay Şatır <gokaysatir@collabora.com>
Change-Id: Icaf4a6fa0bdc15907b4bee7e148edc878555ea45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176466
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

1 files changed, 73 insertions, 47 deletions

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 445f25cd58ad..494a2c82f2a8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4487,6 +4487,64 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 #endif
 }
 
+inline static ITiledRenderable* getDocumentPointer(LibreOfficeKitDocument* pThis)
+{
+    ITiledRenderable* pDoc = getTiledRenderable(pThis);
+
+    if (!pDoc)
+    {
+        SetLastExceptionMsg(u"Document doesn't support tiled rendering"_ustr);
+        return nullptr;
+    }
+    return pDoc;
+}
+
+inline static void writeInfoLog(const int nPart, const int nMode,
+    const int nTileWidth, const int nTileHeight, const int nTilePosX, const int nTilePosY,
+    const int nCanvasWidth, const int nCanvasHeight)
+{
+    SAL_INFO( "lok.tiledrendering", "paintPartTile: painting @ " << nPart << " : " << nMode << " ["
+               << nTileWidth << "x" << nTileHeight << "]@("
+               << nTilePosX << ", " << nTilePosY << ") to ["
+               << nCanvasWidth << "x" << nCanvasHeight << "]px" );
+}
+
+inline static int getFirstViewIdAsFallback(LibreOfficeKitDocument* pThis)
+{
+    // tile painting always needs a SfxViewShell::Current(), but actually
+    // it does not really matter which one - all of them should paint the
+    // same thing. It's important to get a view for the correct document,
+    // though.
+    // doc_getViewsCount() returns the count of views for the document in the current view.
+    int viewCount = doc_getViewsCount(pThis);
+
+    if (viewCount == 0) return -1;
+
+    std::vector<int> viewIds(viewCount);
+    doc_getViewIds(pThis, viewIds.data(), viewCount);
+
+    int result = viewIds[0];
+    doc_setView(pThis, result);
+
+    SAL_WARN("lok.tiledrendering", "Why is this happening? A call to paint without setting a view?");
+
+    return result;
+}
+
+inline static void disableViewCallbacks(LibLODocument_Impl* pDocument, const int viewId)
+{
+    const auto handlerIt = pDocument->mpCallbackFlushHandlers.find(viewId);
+    if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
+        handlerIt->second->disableCallbacks();
+}
+
+inline static void enableViewCallbacks(LibLODocument_Impl* pDocument, const int viewId)
+{
+    const auto handlerIt = pDocument->mpCallbackFlushHandlers.find(viewId);
+    if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
+        handlerIt->second->enableCallbacks();
+}
+
 static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
                               unsigned char* pBuffer,
                               const int nPart,
@@ -4500,46 +4558,26 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
     SolarMutexGuard aGuard;
     SetLastExceptionMsg();
 
-    SAL_INFO( "lok.tiledrendering", "paintPartTile: painting @ " << nPart << " : " << nMode << " ["
-               << nTileWidth << "x" << nTileHeight << "]@("
-               << nTilePosX << ", " << nTilePosY << ") to ["
-               << nCanvasWidth << "x" << nCanvasHeight << "]px" );
+    writeInfoLog(nPart, nMode, nTileWidth, nTileHeight, nTilePosX, nTilePosY, nCanvasWidth, nCanvasHeight);
 
-    LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis);
-    int nOrigViewId = doc_getView(pThis);
-
-    ITiledRenderable* pDoc = getTiledRenderable(pThis);
+    ITiledRenderable* pDoc = getDocumentPointer(pThis);
     if (!pDoc)
-    {
-        SetLastExceptionMsg(u"Document doesn't support tiled rendering"_ustr);
         return;
-    }
+
+    LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis);
+
+    int nOrigViewId = doc_getView(pThis);
 
     if (nOrigViewId < 0)
-    {
-        // tile painting always needs a SfxViewShell::Current(), but actually
-        // it does not really matter which one - all of them should paint the
-        // same thing. It's important to get a view for the correct document,
-        // though.
-        // doc_getViewsCount() returns the count of views for the document in the current view.
-        int viewCount = doc_getViewsCount(pThis);
-        if (viewCount == 0)
-            return;
+        nOrigViewId = getFirstViewIdAsFallback(pThis);
 
-        std::vector<int> viewIds(viewCount);
-        doc_getViewIds(pThis, viewIds.data(), viewCount);
+    if (nOrigViewId == -1)
+        return;
 
-        nOrigViewId = viewIds[0];
-        doc_setView(pThis, nOrigViewId);
-    }
+    // Data validity checks end here.
 
     // Disable callbacks while we are painting.
-    if (nOrigViewId >= 0)
-    {
-        const auto handlerIt = pDocument->mpCallbackFlushHandlers.find(nOrigViewId);
-        if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
-            handlerIt->second->disableCallbacks();
-    }
+    disableViewCallbacks(pDocument, nOrigViewId);
 
     try
     {
@@ -4554,6 +4592,7 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
         int nLastNonEditorView = -1;
         int nViewMatchingMode = -1;
         SfxViewShell* pCurrentViewShell = SfxViewShell::Current();
+        const OString sCurrentViewRenderState = pDoc->getViewRenderState(pCurrentViewShell);
 
         if (!isText)
         {
@@ -4567,7 +4606,6 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
                     bool bIsInEdit = pViewShell->GetDrawView() &&
                         pViewShell->GetDrawView()->GetTextEditOutliner();
 
-                    OString sCurrentViewRenderState = pDoc->getViewRenderState(pCurrentViewShell);
                     OString sNewRenderState = pDoc->getViewRenderState(pViewShell);
 
                     if (sCurrentViewRenderState == sNewRenderState && !bIsInEdit)
@@ -4611,11 +4649,7 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
 
             // Disable callbacks while we are painting - after setting the view
             if (nViewId != nOrigViewId && nViewId >= 0)
-            {
-                const auto handlerIt = pDocument->mpCallbackFlushHandlers.find(nViewId);
-                if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
-                    handlerIt->second->disableCallbacks();
-            }
+                disableViewCallbacks(pDocument, nViewId);
 
             nOrigPart = doc_getPart(pThis);
             if (nPart != nOrigPart)
@@ -4651,13 +4685,7 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
 
             if (nViewId != nOrigViewId)
             {
-                if (nViewId >= 0)
-                {
-                    const auto handlerIt = pDocument->mpCallbackFlushHandlers.find(nViewId);
-                    if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
-                        handlerIt->second->enableCallbacks();
-                }
-
+                enableViewCallbacks(pDocument, nViewId);
                 doc_setView(pThis, nOrigViewId);
             }
         }
@@ -4669,9 +4697,7 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
 
     if (nOrigViewId >= 0)
     {
-        const auto handlerIt = pDocument->mpCallbackFlushHandlers.find(nOrigViewId);
-        if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
-            handlerIt->second->enableCallbacks();
+        enableViewCallbacks(pDocument, nOrigViewId);
     }
 }