diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-16 15:55:43 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-16 14:33:41 +0000 |
| commit | a93217908d12ab9e34052a52dfd59d87fca75e52 (patch) | |
| tree | fc515ceb9d803fa5196cc6c01bf9041cccb1ec5d /desktop/inc | |
| parent | sort the array (diff) | |
| download | core-a93217908d12ab9e34052a52dfd59d87fca75e52.tar.gz core-a93217908d12ab9e34052a52dfd59d87fca75e52.zip | |
sw lok: move filtering of callbacks during paint to desktop
This will be important when in the per-view case
SwViewShell::libreOfficeKitCallback() won't be called anymore; as
pointed out by online.git's TileCacheTests::testSimpleCombine() test.
Change-Id: Ie68f8c51facdba127763df660e9220f820805ecc
Reviewed-on: https://gerrit.libreoffice.org/26372
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/lib/init.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index 2f18223793cc..815f1ac6b4da 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -30,7 +30,7 @@ namespace desktop { class DESKTOP_DLLPUBLIC CallbackFlushHandler : public Idle { public: - explicit CallbackFlushHandler(LibreOfficeKitCallback pCallback, void* pData); + explicit CallbackFlushHandler(LibreOfficeKitDocument* pDocument, LibreOfficeKitCallback pCallback, void* pData); virtual ~CallbackFlushHandler(); virtual void Invoke() override; static void callback(const int type, const char* payload, void* data); @@ -44,6 +44,7 @@ namespace desktop { std::vector<std::pair<int, std::string>> m_queue; std::map<int, std::string> m_states; + LibreOfficeKitDocument* m_pDocument; LibreOfficeKitCallback m_pCallback; void *m_pData; bool m_bPartTilePainting; |