[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sfx2/source/view/viewsh.cxx                                 |   14 ++++-
 sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx              |   33 ++++++++++++
 sw/source/uibase/docvw/edtwin2.cxx                          |   11 ++++
 4 files changed, 56 insertions(+), 2 deletions(-)

New commits:
commit 3ed2f733f81b348e4be1c46c019e9588a6062bd2
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Nov 24 17:26:32 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Nov 25 21:15:35 2020 +0100

    sw tiled rendering: fix paint->invalidation loop when paint is started by vcl
    
    SwViewShell::PaintTile() already calls
    comphelper::LibreOfficeKit::setTiledPainting(), so by the time it would
    rearch SwViewShell::Paint(), callbacks (e.g. invalidations) are ignored
    during paint.
    
    Do the same for SwEditWin::Paint(), where we processed invalidations
    during paint, potentially leading to paint->invalidation loops.
    
    Conflicts:
            sw/qa/extras/tiledrendering/tiledrendering.cxx
            sw/source/uibase/docvw/edtwin2.cxx
    
    Change-Id: I8280f5c2571beeae6c0f2986d275dde3c2d33161
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106543
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106601
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index dcbdc9ceef3a..cae5f15fe4b7 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1488,8 +1488,18 @@ void SfxViewShell::libreOfficeKitViewCallback(int nType, const char* pPayload) c
     if (!comphelper::LibreOfficeKit::isActive())
         return;
 
-    if (comphelper::LibreOfficeKit::isTiledPainting() && nType != LOK_CALLBACK_FORM_FIELD_BUTTON)
-        return;
+    if (comphelper::LibreOfficeKit::isTiledPainting())
+    {
+        switch (nType)
+        {
+        case LOK_CALLBACK_FORM_FIELD_BUTTON:
+        case LOK_CALLBACK_TEXT_SELECTION:
+            break;
+        default:
+            // Reject e.g. invalidate during paint.
+            return;
+        }
+    }
 
     if (pImpl->m_bTiledSearching)
     {
diff --git a/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt b/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt
new file mode 100644
index 000000000000..b42c5cc51588
Binary files /dev/null and b/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 3d922d088309..ac481a9f7148 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -128,6 +128,7 @@ public:
     void testDropDownFormFieldButtonEditing();
     void testDropDownFormFieldButtonNoSelection();
     void testDropDownFormFieldButtonNoItem();
+    void testTablePaintInvalidate();
 
     CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
     CPPUNIT_TEST(testRegisterCallback);
@@ -196,6 +197,7 @@ public:
     CPPUNIT_TEST(testDropDownFormFieldButtonEditing);
     CPPUNIT_TEST(testDropDownFormFieldButtonNoSelection);
     CPPUNIT_TEST(testDropDownFormFieldButtonNoItem);
+    CPPUNIT_TEST(testTablePaintInvalidate);
     CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2737,6 +2739,37 @@ void SwTiledRenderingTest::testDropDownFormFieldButtonNoItem()
     }
 }
 
+void SwTiledRenderingTest::testTablePaintInvalidate()
+{
+    // Load a document with a table in it.
+    SwXTextDocument* pXTextDocument = createDoc("table-paint-invalidate.odt");
+    SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+    pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this);
+    // Enter the table.
+    pWrtShell->Down(/*bSelect=*/false);
+    Scheduler::ProcessEventsToIdle();
+    m_nInvalidations = 0;
+
+    // Paint a tile.
+    size_t nCanvasWidth = 256;
+    size_t nCanvasHeight = 256;
+    std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
+    ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
+    pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+    pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, nCanvasHeight),
+                                                    Fraction(1.0), Point(), aPixmap.data());
+    pXTextDocument->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, m_aInvalidation.getX(),
+                              m_aInvalidation.getY(), /*nTileWidth=*/1000,
+                              /*nTileHeight=*/1000);
+    Scheduler::ProcessEventsToIdle();
+
+    // Without the accompanying fix in place, this test would have failed with
+    // - Expected: 0
+    // - Actual  : 5
+    // i.e. paint generated an invalidation, which caused a loop.
+    CPPUNIT_ASSERT_EQUAL(0, m_nInvalidations);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index aeca6373f718..ef2b8c304bd1 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -63,6 +63,7 @@
 #include <IDocumentMarkAccess.hxx>
 #include <txtfrm.hxx>
 #include <ndtxt.hxx>
+#include <comphelper/lok.hxx>
 
 static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon )
 {
@@ -445,7 +446,17 @@ void SwEditWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
     else
     {
         pWrtShell->setOutputToWindow(true);
+        bool bTiledPainting = false;
+        if (comphelper::LibreOfficeKit::isActive())
+        {
+            bTiledPainting = comphelper::LibreOfficeKit::isTiledPainting();
+            comphelper::LibreOfficeKit::setTiledPainting(true);
+        }
         pWrtShell->Paint(rRenderContext, rRect);
+        if (comphelper::LibreOfficeKit::isActive())
+        {
+            comphelper::LibreOfficeKit::setTiledPainting(bTiledPainting);
+        }
         pWrtShell->setOutputToWindow(false);
     }