summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-11-09 15:56:25 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-11-09 14:00:03 +0100
commit81b5f591dfe428efb3de278460ca662eacbf02bc (patch)
tree0ef4a27162ca5864043e19a2971d666dbe32dc49 /solenv
parenta93b691b78c95676d0dcf2724563aa1a8a5a2e8e (diff)
LibreOffice.natvis: add SfxItemSet visualizer
Change-Id: I2d63cf73df945cc84fbfb93ad431f243caa238e1 Reviewed-on: https://gerrit.libreoffice.org/44542 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/vs/LibreOffice.natvis51
1 files changed, 48 insertions, 3 deletions
diff --git a/solenv/vs/LibreOffice.natvis b/solenv/vs/LibreOffice.natvis
index 4b2f29ebe4d8..56e1e80ae48b 100644
--- a/solenv/vs/LibreOffice.natvis
+++ b/solenv/vs/LibreOffice.natvis
@@ -64,8 +64,9 @@
<DisplayString>{pType->eTypeClass,en}</DisplayString>
<Expand>
<ExpandedItem Condition="pType->eTypeClass == 19">(com::sun::star::uno::Exception *)pData</ExpandedItem>
+ <ExpandedItem Condition="pType->eTypeClass == 20">*(uno_Sequence **)pData</ExpandedItem>
<ExpandedItem Condition="pType->eTypeClass == 22">(com::sun::star::uno::BaseReference *)pData</ExpandedItem>
- <Item Name="Data" Condition="pType->eTypeClass != 19 &amp;&amp; pType->eTypeClass != 22">pData</Item>
+ <Item Name="Data" Condition="pType->eTypeClass != 19 &amp;&amp; pType->eTypeClass != 20 &amp;&amp; pType->eTypeClass != 22">pData</Item>
</Expand>
</Type>
<Type Name="basegfx::internal::ImplMatLine &lt; 3 &gt;">
@@ -101,9 +102,16 @@
<Type Name="SwRect">
<DisplayString>{m_Point}, {m_Size}</DisplayString>
</Type>
+ <Type Name="_sal_Sequence">
+ <DisplayString Condition="nElements == 0">_sal_Sequence (empty)</DisplayString>
+ <DisplayString>_sal_Sequence of {nElements,d} elements</DisplayString>
+ <Expand>
+ <Item Name="[size]">nElements,d</Item>
+ </Expand>
+ </Type>
<Type Name="com::sun::star::uno::Sequence &lt; * &gt;">
- <DisplayString Condition="_pSequence->nElements == 0">empty sequence</DisplayString>
- <DisplayString>sequence of {_pSequence->nElements,d} {"$T1",sb}</DisplayString>
+ <DisplayString Condition="_pSequence->nElements == 0">Sequence (empty)</DisplayString>
+ <DisplayString>Sequence of {_pSequence->nElements,d} {"$T1",sb}</DisplayString>
<Expand>
<Item Name="[size]">_pSequence->nElements,d</Item>
<ArrayItems>
@@ -254,4 +262,41 @@
<Item Condition="_pType->pType != nullptr" Name="Alignment">_pType->pType->nAlignment</Item>
</Expand>
</Type>
+ <Type Name="SfxBoolItem">
+ <DisplayString>{{which={m_nWhich,x}}} {m_bValue}</DisplayString>
+ </Type>
+ <Type Name="CntUnencodedStringItem">
+ <DisplayString>{{which={m_nWhich,x}}} {m_aValue}</DisplayString>
+ </Type>
+ <Type Name="SfxUsrAnyItem">
+ <DisplayString>{{which={m_nWhich,x}}} {aValue}</DisplayString>
+ </Type>
+ <Type Name="SfxPoolItem">
+ <DisplayString>{{which={m_nWhich,x}}}</DisplayString>
+ </Type>
+ <Type Name="SfxItemSet">
+ <DisplayString>{{size={m_nCount,d}}}</DisplayString>
+ <Expand>
+ <Item Name="[size]">m_nCount,d</Item>
+ <IndexListItems>
+ <Size>m_nCount</Size>
+ <ValueNode>*(m_pItems[$i])</ValueNode>
+ </IndexListItems>
+ <Synthetic Name="Which Ranges">
+ <Expand>
+ <CustomListItems>
+ <Variable Name='pCurRange' InitialValue='m_pWhichRanges'/>
+ <Variable Name='i' InitialValue='0'/>
+ <Loop Condition='*pCurRange'>
+ <Item Name='[{i,d}] begin'>*pCurRange</Item>
+ <Item Name='[{i,d}] end'>*(pCurRange+1)</Item>
+ <Exec>pCurRange+=2</Exec>
+ <Exec>++i</Exec>
+ </Loop>
+ </CustomListItems>
+ </Expand>
+ </Synthetic>
+ <Item Condition="m_pParent != nullptr" Name="Parent">*m_pParent</Item>
+ </Expand>
+ </Type>
</AutoVisualizer>
hen building for 32-bit Windows. The issue is reported upstream, but there is only a workaround so far, no fix. Change-Id: I1c50019a2afe39d245c6b02243789752e84445a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174585 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2024-10-06Update to skia m116Noel Grandin The sort comparison patch seems to have been upstreamed. Lots of patches needed to be redone. Followed the skia release notes in replacing calls to SkCanvas::flush and SkSurface::flushAndSubmit. Change-Id: I13179565b95cc0720b4548cd4baecc5adacc7133 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174554 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins 2023-07-10update skia to m116Noel Grandin (from m111) SK_SUPPORT_GPU is now SK_GANESH GR_OP_ALLOCATE_USE_NEW was removed in skia m111 commit dd8f8ed3848cbe2032edc7ec08ef648a23e28ad9 Author: Mike Klein <mtklein@google.com> Date: Thu Apr 22 12:17:33 2021 -0500 clean up defines that do nothing the fast-png-write patch was removed. The underlying helper function we need was removed in commit 0ec4c84abd0b578a5c792b04b56653cbc325530e Author: Kevin Lubick <kjlubick@google.com> Date: Thu Apr 20 14:46:28 2023 -0400 Remove SkImageEncoder and SkImage::encodeToData So I updated our dump() function in SkiaHelper.cxx to use the new Skia API. The constexpr-template patch seems to be superceded by skia changes. SkOpts: :hash_fn has been replaced with SkChecksum::Hash32 commit 657ed9cf2379a950b925cb2aba7c85d6e1dd36ed Author: Brian Osman <brianosman@google.com> Date: Tue May 23 12:40:12 2023 +0000 Reland "Replace SkOpts::hash/hash_fn with SkChecksum::Hash32" The SkDebugf function needs to be exported from the library since it leaks out to calling code via some of the headers. Change-Id: I80ace8f25e660fa7889d22ef90676f47264d866c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154223 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2023-01-30Update skia to m111Noel Grandin (*) Remove patches already upstream (*) Remove the skia_sk_cpu_sse_level_0_by_default.patch.1 patch and rather set that define via -D parameter, because that is how the skia BUILD.gn seems to do it. (*) I hand edited the PCH file, because running the update_pch script failed for me. Change-Id: I1fd175b9f63f8d2792a1876e4ece03fe92fb5374 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146251 Tested-by: Jenkins Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2023-01-25Revert "Update skia to m110"Stephan Bergmann This reverts commit aef70869b0fae3001648ec2a2651ffc9c507678f plus follow-up 4172fcb7514ff8a9e9740ff0939e9a2f611edbce "Fix no-pch Windows build: missing include". It caused my Windows build `instdir/program/soffice` to immediatley fail with > skia\include/core/SkRefCnt.h(62): fatal error: "assert(this->getRefCnt() > 0)" > warn:skia:10572:7804:external/skia/source/SkMemory_malloc.cxx:32: sk_abort_no_print on start. Change-Id: I751f83eda28d9a5a8f9dd4b2429389906ffce983 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146132 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2023-01-25Update skia to m110Noel Grandin Removing those bits of the patches that appear to have been upstreamed. Change-Id: Ia7683c26af4c622ca4fccb828df023ae30e724a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146069 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2022-05-21update Skia to chrome/m103Luboš Luňák Change-Id: I35f1ca3fc703dbf31c68f4b145344b23029a156d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134688 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2021-11-25update Skia to chrome/m97Luboš Luňák Change-Id: I55ab0b25389dcce3263b38a2de12c437b47751c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125821 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2021-08-24initial Metal support for Mac/SkiaLuboš Luňák This also required changing SkiaSalGraphicsImpl to have sk_app::WindowContext as an internal detail inaccessible to the base class, since the Mac implementations cannot use it as is. Change-Id: I2424f0b887c79ee91c3bd0f1477b0745f9540247 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120909 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2020-11-17update Skia to chrome/m88Luboš Luňák Change-Id: I74c19597b07e9d07ee90e4191b75787241fdd845 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105829 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2020-08-27Fix `--disable-pch` buildMike Kaganski ... breaking after commit eaf4f6d3b1e64bc7b057e70cffe0bda0ed42c49f with this: In file included from C:/lo/src/build/workdir/UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win.cpp:13: In file included from C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/VulkanWindowContext.h:17: In file included from C:/lo/src/build/workdir/UnpackedTarball/skia\include/gpu/vk/GrVkBackendContext.h:11: C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(141,12): error: member access into incomplete type 'GrDirectContext' obj->ref(); ^ C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(226,40): note: in instantiation of function template specialization 'SkSafeRef<GrDirectContext>' requested here sk_sp(const sk_sp<T>& that) : fPtr(SkSafeRef(that.get())) {} ^ C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/WindowContext.h(24,1): note: in instantiation of member function 'sk_sp<GrDirectContext>::sk_sp' requested here WindowContext { ^ C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkImage.h(36,7): note: forward declaration of 'GrDirectContext' class GrDirectContext; ^ In file included from C:/lo/src/build/workdir/UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win.cpp:13: In file included from C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/VulkanWindowContext.h:17: In file included from C:/lo/src/build/workdir/UnpackedTarball/skia\include/gpu/vk/GrVkBackendContext.h:11: C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(150,12): error: member access into incomplete type 'GrDirectContext' obj->unref(); ^ C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(251,9): note: in instantiation of function template specialization 'SkSafeUnref<GrDirectContext>' requested here SkSafeUnref(fPtr); ^ C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/WindowContext.h(24,1): note: in instantiation of member function 'sk_sp<GrDirectContext>::~sk_sp' requested here WindowContext { ^ C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkImage.h(36,7): note: forward declaration of 'GrDirectContext' class GrDirectContext; ^ In file included from C:/lo/src/build/workdir/UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win.cpp:13: In file included from C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/VulkanWindowContext.h:17: In file included from C:/lo/src/build/workdir/UnpackedTarball/skia\include/gpu/vk/GrVkBackendContext.h:11: C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(264,25): error: no matching function for call to 'SkSafeRef' this->reset(SkSafeRef(that.get())); ^~~~~~~~~ C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/WindowContext.h(24,1): note: in instantiation of member function 'sk_sp<GrDirectContext>::operator=' requested here WindowContext { ^ C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(139,40): note: candidate template ignored: substitution failure [with T = GrDirectContext] template <typename T> static inline T* SkSafeRef(T* obj) { ^ C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(311,9): error: no matching function for call to 'SkSafeUnref' SkSafeUnref(oldPtr); ^~~~~~~~~~~ C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(264,19): note: in instantiation of member function 'sk_sp<GrDirectContext>::reset' requested here this->reset(SkSafeRef(that.get())); ^ C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/WindowContext.h(24,1): note: in instantiation of member function 'sk_sp<GrDirectContext>::operator=' requested here WindowContext { ^ C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(148,42): note: candidate template ignored: substitution failure [with T = GrDirectContext] template <typename T> static inline void SkSafeUnref(T* obj) { ^ 4 errors generated. Change-Id: I159b9ef388834a454eff58c6c2eda2e13dddb67a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101439 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2020-08-26update Skia to chrome/m86 snapshotLuboš Luňák Change-Id: Id0c0679bc1ca546a75f71d4716ba151ae46569bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101311 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2020-07-01update Skia to chrome/m85 snapshotLuboš Luňák Change-Id: I3af3517c9c213e0db8365aecd0a008d817ca4dcf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97592 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2020-02-10add (Vulkan) blacklisting to SkiaLuboš Luňák Currently there's nothing blacklisted, but this is the code. And there's not much point in blacklisting CPU-based raster Skia, so check only for Vulkan. Since this requires accessing Vulkan to get the driver info, this commit also reorganizes a bit getting a GrContext when there's no actual window, so that it's usable for the test. Change-Id: I042af0470fb635d8ea471a40837bfcd102d7016f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88205 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2020-01-06avoid Skia assert on leaked resourcesLuboš Luňák Change-Id: Ie9d9117c43d19b9391f8e0dee6825076aaa12706 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85582 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2019-12-12update Skia to chrome/m80Luboš Luňák Change-Id: I26782c8bd3d8ce34cbf7ce5a00b884436d37cb85 Reviewed-on: https://gerrit.libreoffice.org/84617 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> 2019-11-27make Skia GPU offscreen surfaces work with unittestsLuboš Luňák Skia is now patched to be able to create also invalid sk_app::WindowContext that will just initialize the shared GrContext. And always use that GrContext, even for tests, because some tests first create a offscreen surfaces and only later create windows, which before this patch led to mixing GrContext instances. Change-Id: Ic79c0719f98f6ac48527c2ea2a9a9a69412adeff 2019-11-27make Skia VCL backend fall back to raster if vulkan doesn't workLuboš Luňák Change-Id: Ic446f6f85e5ebc2e50cb51a3ed1e732b8976a193 2019-11-27fix Skia offscreen GPU-backed drawingLuboš Luňák The previous approach of using multiple GrContext instances apparently does not work, it's not possible to do drawing operations that involve objects using two different GrContext's. So patch Skia to use just one GrContext for our needs. See vcl/skia/README for details. Change-Id: I2bd3d3c618bf7f8ff45b2f37cbd086d2289940aa