[Libreoffice-commits] core.git: Branch 'feature/skia' - 2 commits - configure.ac download.lst external/skia vcl/skia
Luboš Luňák (via logerrit)
logerrit at kemper.freedesktop.org
Mon Oct 21 11:07:57 UTC 2019
configure.ac | 6 +--
download.lst | 4 +-
external/skia/Library_skia.mk | 37 ++++++++++++++---------
external/skia/README | 7 +++-
external/skia/UnpackedTarball_skia.mk | 2 -
external/skia/make-api-visible.patch | 37 -----------------------
external/skia/make-api-visible.patch.1 | 51 +++++++++++++++++++++++++++++++++
vcl/skia/win/gdiimpl.cxx | 4 +-
vcl/skia/x11/gdiimpl.cxx | 2 -
9 files changed, 88 insertions(+), 62 deletions(-)
New commits:
commit ef44b66f3d55754afd581fb22ebcc5e491aa2609
Author: Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Oct 21 13:04:49 2019 +0200
Commit: Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Oct 21 13:06:38 2019 +0200
update Skia to chrome-m79
Change-Id: Ie79f4752c4d0978b816774674bc923e6973289f8
diff --git a/download.lst b/download.lst
index 0598d4973226..f0957cdab77d 100644
--- a/download.lst
+++ b/download.lst
@@ -229,8 +229,8 @@ export RHINO_SHA256SUM := 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131
export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
export SERF_SHA256SUM := 6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
export SERF_TARBALL := serf-1.2.1.tar.bz2
-export SKIA_SHA256SUM := 826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
-export SKIA_TARBALL := skia-m77.tar.xz
+export SKIA_SHA256SUM := 160cd0275fc47b3374ed998fe30aa9e97e032eeb7cded53f57c5b80165e3f657
+export SKIA_TARBALL := skia-m79-0df7697235b4a02cd6dd6fa2a783345add40cbad.tar.xz
export STAROFFICE_SHA256SUM := 6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
export STAROFFICE_VERSION_MICRO := 6
export STAROFFICE_TARBALL := libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 8f21787cfd0f..ed24d30fa93f 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -106,7 +106,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/codec/SkJpegUtility \
UnpackedTarball/skia/src/codec/SkMasks \
UnpackedTarball/skia/src/codec/SkMaskSwizzler \
- UnpackedTarball/skia/src/codec/SkOrientationMarker \
+ UnpackedTarball/skia/src/codec/SkParseEncodedOrigin \
UnpackedTarball/skia/src/codec/SkPngCodec \
UnpackedTarball/skia/src/codec/SkSampledCodec \
UnpackedTarball/skia/src/codec/SkSampler \
@@ -128,7 +128,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkBitmapDevice \
UnpackedTarball/skia/src/core/SkBitmapProcState \
UnpackedTarball/skia/src/core/SkBitmapProcState_matrixProcs \
- UnpackedTarball/skia/src/core/SkBitmapProvider \
UnpackedTarball/skia/src/core/SkBlendMode \
UnpackedTarball/skia/src/core/SkBlitRow_D32 \
UnpackedTarball/skia/src/core/SkBlitter_ARGB32 \
@@ -168,6 +167,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkDraw \
UnpackedTarball/skia/src/core/SkDrawLooper \
UnpackedTarball/skia/src/core/SkDrawShadowInfo \
+ UnpackedTarball/skia/src/core/SkDraw_atlas \
UnpackedTarball/skia/src/core/SkDraw_text \
UnpackedTarball/skia/src/core/SkDraw_vertices \
UnpackedTarball/skia/src/core/SkEdgeBuilder \
@@ -185,12 +185,14 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkGeometry \
UnpackedTarball/skia/src/core/SkGlobalInitialization_core \
UnpackedTarball/skia/src/core/SkGlyph \
+ UnpackedTarball/skia/src/core/SkGlyphBuffer \
UnpackedTarball/skia/src/core/SkGlyphRun \
UnpackedTarball/skia/src/core/SkGlyphRunPainter \
UnpackedTarball/skia/src/core/SkGraphics \
UnpackedTarball/skia/src/core/SkHalf \
UnpackedTarball/skia/src/core/SkICC \
UnpackedTarball/skia/src/core/SkImageFilterCache \
+ UnpackedTarball/skia/src/core/SkImageFilterTypes \
UnpackedTarball/skia/src/core/SkImageFilter \
UnpackedTarball/skia/src/core/SkImageGenerator \
UnpackedTarball/skia/src/core/SkImageInfo \
@@ -274,6 +276,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkStream \
UnpackedTarball/skia/src/core/SkStrikeCache \
UnpackedTarball/skia/src/core/SkStrike \
+ UnpackedTarball/skia/src/core/SkStrikeForGPU \
UnpackedTarball/skia/src/core/SkStrikeSpec \
UnpackedTarball/skia/src/core/SkString \
UnpackedTarball/skia/src/core/SkStringUtils \
@@ -297,6 +300,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkVertices \
UnpackedTarball/skia/src/core/SkVertState \
UnpackedTarball/skia/src/core/SkVM \
+ UnpackedTarball/skia/src/core/SkVMBlitter \
UnpackedTarball/skia/src/core/SkWriteBuffer \
UnpackedTarball/skia/src/core/SkWriter32 \
UnpackedTarball/skia/src/core/SkXfermode \
@@ -315,6 +319,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/effects/imagefilters/SkComposeImageFilter \
UnpackedTarball/skia/src/effects/imagefilters/SkDisplacementMapEffect \
UnpackedTarball/skia/src/effects/imagefilters/SkDropShadowImageFilter \
+ UnpackedTarball/skia/src/effects/imagefilters/SkImageFilters \
UnpackedTarball/skia/src/effects/imagefilters/SkImageSource \
UnpackedTarball/skia/src/effects/imagefilters/SkLightingImageFilter \
UnpackedTarball/skia/src/effects/imagefilters/SkMagnifierImageFilter \
@@ -446,13 +451,13 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/sksl/SkSLGLSLCodeGenerator \
UnpackedTarball/skia/src/sksl/SkSLHCodeGenerator \
UnpackedTarball/skia/src/sksl/SkSLIRGenerator \
- UnpackedTarball/skia/src/sksl/SkSLJIT \
UnpackedTarball/skia/src/sksl/SkSLLexer \
UnpackedTarball/skia/src/sksl/SkSLMetalCodeGenerator \
UnpackedTarball/skia/src/sksl/SkSLOutputStream \
UnpackedTarball/skia/src/sksl/SkSLParser \
UnpackedTarball/skia/src/sksl/SkSLPipelineStageCodeGenerator \
UnpackedTarball/skia/src/sksl/SkSLSPIRVCodeGenerator \
+ UnpackedTarball/skia/src/sksl/SkSLSectionAndParameterHelper \
UnpackedTarball/skia/src/sksl/SkSLString \
UnpackedTarball/skia/src/sksl/SkSLUtil \
UnpackedTarball/skia/src/utils/SkBase64 \
@@ -532,6 +537,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/effects/generated/GrPremulInputFragmentProcessor \
UnpackedTarball/skia/src/gpu/effects/generated/GrRectBlurEffect \
UnpackedTarball/skia/src/gpu/effects/generated/GrRRectBlurEffect \
+ UnpackedTarball/skia/src/gpu/effects/generated/GrSaturateProcessor \
UnpackedTarball/skia/src/gpu/effects/generated/GrSimpleTextureEffect \
UnpackedTarball/skia/src/gpu/effects/GrBezierEffect \
UnpackedTarball/skia/src/gpu/effects/GrBicubicEffect \
@@ -568,12 +574,12 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/gl/GrGLContext \
UnpackedTarball/skia/src/gpu/gl/GrGLExtensions \
UnpackedTarball/skia/src/gpu/gl/GrGLGLSL \
- UnpackedTarball/skia/src/gpu/gl/GrGLGpuCommandBuffer \
UnpackedTarball/skia/src/gpu/gl/GrGLGpu \
UnpackedTarball/skia/src/gpu/gl/GrGLGpuProgramCache \
UnpackedTarball/skia/src/gpu/gl/GrGLInterfaceAutogen \
UnpackedTarball/skia/src/gpu/gl/GrGLPath \
UnpackedTarball/skia/src/gpu/gl/GrGLPathRendering \
+ UnpackedTarball/skia/src/gpu/gl/GrGLOpsRenderPass \
UnpackedTarball/skia/src/gpu/gl/GrGLProgram \
UnpackedTarball/skia/src/gpu/gl/GrGLProgramDataManager \
UnpackedTarball/skia/src/gpu/gl/GrGLRenderTarget \
@@ -620,17 +626,18 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrBlurUtils \
UnpackedTarball/skia/src/gpu/GrBufferAllocPool \
UnpackedTarball/skia/src/gpu/GrCaps \
+ UnpackedTarball/skia/src/gpu/GrClientMappedBufferManager \
UnpackedTarball/skia/src/gpu/GrClipStackClip \
- UnpackedTarball/skia/src/gpu/GrColorSpaceInfo \
+ UnpackedTarball/skia/src/gpu/GrColorInfo \
UnpackedTarball/skia/src/gpu/GrColorSpaceXform \
UnpackedTarball/skia/src/gpu/GrContext_Base \
UnpackedTarball/skia/src/gpu/GrContext \
UnpackedTarball/skia/src/gpu/GrContextPriv \
UnpackedTarball/skia/src/gpu/GrContextThreadSafeProxy \
+ UnpackedTarball/skia/src/gpu/GrCopyRenderTask \
UnpackedTarball/skia/src/gpu/GrDataUtils \
UnpackedTarball/skia/src/gpu/GrDDLContext \
UnpackedTarball/skia/src/gpu/GrDefaultGeoProcFactory \
- UnpackedTarball/skia/src/gpu/GrDeinstantiateProxyTracker \
UnpackedTarball/skia/src/gpu/GrDistanceFieldGenFromVector \
UnpackedTarball/skia/src/gpu/GrDrawingManager \
UnpackedTarball/skia/src/gpu/GrDrawOpAtlas \
@@ -639,7 +646,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrFixedClip \
UnpackedTarball/skia/src/gpu/GrFragmentProcessor \
UnpackedTarball/skia/src/gpu/GrGpuBuffer \
- UnpackedTarball/skia/src/gpu/GrGpuCommandBuffer \
UnpackedTarball/skia/src/gpu/GrGpu \
UnpackedTarball/skia/src/gpu/GrGpuResource \
UnpackedTarball/skia/src/gpu/GrImageContext \
@@ -648,7 +654,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrMemoryPool \
UnpackedTarball/skia/src/gpu/GrOnFlushResourceProvider \
UnpackedTarball/skia/src/gpu/GrOpFlushState \
- UnpackedTarball/skia/src/gpu/GrOpList \
+ UnpackedTarball/skia/src/gpu/GrOpsRenderPass \
+ UnpackedTarball/skia/src/gpu/GrOpsTask \
UnpackedTarball/skia/src/gpu/GrPaint \
UnpackedTarball/skia/src/gpu/GrPath \
UnpackedTarball/skia/src/gpu/GrPathProcessor \
@@ -662,14 +669,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrProcessorSet \
UnpackedTarball/skia/src/gpu/GrProcessorUnitTest \
UnpackedTarball/skia/src/gpu/GrProgramDesc \
+ UnpackedTarball/skia/src/gpu/GrProgramInfo \
UnpackedTarball/skia/src/gpu/GrProxyProvider \
UnpackedTarball/skia/src/gpu/GrRecordingContext \
UnpackedTarball/skia/src/gpu/GrRectanizer_pow2 \
UnpackedTarball/skia/src/gpu/GrRectanizer_skyline \
+ UnpackedTarball/skia/src/gpu/GrRenderTask \
UnpackedTarball/skia/src/gpu/GrReducedClip \
UnpackedTarball/skia/src/gpu/GrRenderTargetContext \
UnpackedTarball/skia/src/gpu/GrRenderTarget \
- UnpackedTarball/skia/src/gpu/GrRenderTargetOpList \
UnpackedTarball/skia/src/gpu/GrRenderTargetProxy \
UnpackedTarball/skia/src/gpu/GrResourceAllocator \
UnpackedTarball/skia/src/gpu/GrResourceCache \
@@ -693,12 +701,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrTextureContext \
UnpackedTarball/skia/src/gpu/GrTexture \
UnpackedTarball/skia/src/gpu/GrTextureMaker \
- UnpackedTarball/skia/src/gpu/GrTextureOpList \
UnpackedTarball/skia/src/gpu/GrTextureProducer \
UnpackedTarball/skia/src/gpu/GrTextureProxy \
UnpackedTarball/skia/src/gpu/GrTextureRenderTargetProxy \
+ UnpackedTarball/skia/src/gpu/GrTextureResolveRenderTask \
+ UnpackedTarball/skia/src/gpu/GrTransferFromRenderTask \
+ UnpackedTarball/skia/src/gpu/GrWaitRenderTask \
UnpackedTarball/skia/src/gpu/GrXferProcessor \
UnpackedTarball/skia/src/gpu/GrYUVProvider \
+ UnpackedTarball/skia/src/gpu/mock/GrMockCaps \
UnpackedTarball/skia/src/gpu/mock/GrMockGpu \
UnpackedTarball/skia/src/gpu/mock/GrMockTypes \
UnpackedTarball/skia/src/gpu/ops/GrAAConvexPathRenderer \
@@ -708,7 +719,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/ops/GrAtlasTextOp \
UnpackedTarball/skia/src/gpu/ops/GrClearOp \
UnpackedTarball/skia/src/gpu/ops/GrClearStencilClipOp \
- UnpackedTarball/skia/src/gpu/ops/GrCopySurfaceOp \
UnpackedTarball/skia/src/gpu/ops/GrDashLinePathRenderer \
UnpackedTarball/skia/src/gpu/ops/GrDashOp \
UnpackedTarball/skia/src/gpu/ops/GrDebugMarkerOp \
@@ -725,7 +735,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/ops/GrOvalOpFactory \
UnpackedTarball/skia/src/gpu/ops/GrQuadPerEdgeAA \
UnpackedTarball/skia/src/gpu/ops/GrRegionOp \
- UnpackedTarball/skia/src/gpu/ops/GrSemaphoreOp \
UnpackedTarball/skia/src/gpu/ops/GrShadowRRectOp \
UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper \
UnpackedTarball/skia/src/gpu/ops/GrSmallPathRenderer \
@@ -734,7 +743,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/ops/GrStrokeRectOp \
UnpackedTarball/skia/src/gpu/ops/GrTessellatingPathRenderer \
UnpackedTarball/skia/src/gpu/ops/GrTextureOp \
- UnpackedTarball/skia/src/gpu/ops/GrTransferFromOp \
UnpackedTarball/skia/src/gpu/SkGpuDevice \
UnpackedTarball/skia/src/gpu/SkGpuDevice_drawTexture \
UnpackedTarball/skia/src/gpu/SkGr \
@@ -761,15 +769,14 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorSetManager \
UnpackedTarball/skia/src/gpu/vk/GrVkExtensions \
UnpackedTarball/skia/src/gpu/vk/GrVkFramebuffer \
- UnpackedTarball/skia/src/gpu/vk/GrVkGpuCommandBuffer \
UnpackedTarball/skia/src/gpu/vk/GrVkGpu \
UnpackedTarball/skia/src/gpu/vk/GrVkImage \
UnpackedTarball/skia/src/gpu/vk/GrVkImageView \
UnpackedTarball/skia/src/gpu/vk/GrVkIndexBuffer \
UnpackedTarball/skia/src/gpu/vk/GrVkInterface \
UnpackedTarball/skia/src/gpu/vk/GrVkMemory \
+ UnpackedTarball/skia/src/gpu/vk/GrVkOpsRenderPass \
UnpackedTarball/skia/src/gpu/vk/GrVkPipeline \
- UnpackedTarball/skia/src/gpu/vk/GrVkPipelineLayout \
UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateBuilder \
UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateCache \
UnpackedTarball/skia/src/gpu/vk/GrVkPipelineState \
diff --git a/external/skia/README b/external/skia/README
index 8bdb8f258f0b..767f12e91936 100644
--- a/external/skia/README
+++ b/external/skia/README
@@ -2,13 +2,18 @@ External package containing skia.
https://skia.org/
+
How to update the tarball:
+==========================
git clone https://skia.googlesource.com/skia.git
cd skia
git checkout chrome/mXX
+id=$(git rev-parse chrome/mXX)
rm -rf .git gitignore
cd ..
-tar cvJf skia-mXX.tar.xz skia
+tar cvJf skia-mXX-$id.tar.xz skia
(where XX refers to the branch version)
+
+And review differences for BUILD.gn and relevant files in gn/ .
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk
index 462d07edf8f2..25543084a8ca 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,skia))
$(eval $(call gb_UnpackedTarball_set_tarball,skia,$(SKIA_TARBALL)))
# TODO
-skia_patches := lerp.patch fix-pch.patch fix-ddi.patch make-api-visible.patch
+skia_patches := lerp.patch fix-pch.patch fix-ddi.patch make-api-visible.patch.1
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/external/skia/make-api-visible.patch b/external/skia/make-api-visible.patch
deleted file mode 100644
index 45f4ee44ae71..000000000000
--- a/external/skia/make-api-visible.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- skia/tools/sk_app/unix/WindowContextFactory_unix.h.sav 2019-09-26 15:02:19.637587019 +0200
-+++ skia/tools/sk_app/unix/WindowContextFactory_unix.h 2019-10-07 11:52:46.744194127 +0200
-@@ -33,11 +33,11 @@ struct XlibWindowInfo {
- int fHeight;
- };
-
--WindowContext* NewVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
-+SK_API WindowContext* NewVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
-
--WindowContext* NewGLForXlib(const XlibWindowInfo&, const DisplayParams&);
-+SK_API WindowContext* NewGLForXlib(const XlibWindowInfo&, const DisplayParams&);
-
--WindowContext* NewRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
-+SK_API WindowContext* NewRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
-
- } // namespace window_context_factory
-
---- skia/tools/sk_app/win/WindowContextFactory_win.h
-+++ skia/tools/sk_app/win/WindowContextFactory_win.h
-@@ -18,13 +18,13 @@ struct DisplayParams;
-
- namespace window_context_factory {
-
--WindowContext* NewVulkanForWin(HWND, const DisplayParams&);
-+SK_API WindowContext* NewVulkanForWin(HWND, const DisplayParams&);
-
--WindowContext* NewGLForWin(HWND, const DisplayParams&);
-+SK_API WindowContext* NewGLForWin(HWND, const DisplayParams&);
-
--WindowContext* NewANGLEForWin(HWND, const DisplayParams&);
-+SK_API WindowContext* NewANGLEForWin(HWND, const DisplayParams&);
-
--WindowContext* NewRasterForWin(HWND, const DisplayParams&);
-+SK_API WindowContext* NewRasterForWin(HWND, const DisplayParams&);
-
- } // namespace window_context_factory
-
diff --git a/external/skia/make-api-visible.patch.1 b/external/skia/make-api-visible.patch.1
new file mode 100644
index 000000000000..2bf3a0f3d73a
--- /dev/null
+++ b/external/skia/make-api-visible.patch.1
@@ -0,0 +1,51 @@
+diff --git a/tools/sk_app/unix/WindowContextFactory_unix.h b/tools/sk_app/unix/WindowContextFactory_unix.h
+index 47310970d5..e02e6eb5b7 100644
+--- a/tools/sk_app/unix/WindowContextFactory_unix.h
++++ b/tools/sk_app/unix/WindowContextFactory_unix.h
+@@ -36,15 +36,15 @@ struct XlibWindowInfo {
+ int fHeight;
+ };
+
+-std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
+
+-std::unique_ptr<WindowContext> MakeGLForXlib(const XlibWindowInfo&, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeGLForXlib(const XlibWindowInfo&, const DisplayParams&);
+
+ #ifdef SK_DAWN
+-std::unique_ptr<WindowContext> MakeDawnVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeDawnVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
+ #endif
+
+-std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
+
+ } // namespace window_context_factory
+
+diff --git a/tools/sk_app/win/WindowContextFactory_win.h b/tools/sk_app/win/WindowContextFactory_win.h
+index 33dd6d413b..647e5ff81a 100644
+--- a/tools/sk_app/win/WindowContextFactory_win.h
++++ b/tools/sk_app/win/WindowContextFactory_win.h
+@@ -20,17 +20,17 @@ struct DisplayParams;
+
+ namespace window_context_factory {
+
+-std::unique_ptr<WindowContext> MakeVulkanForWin(HWND, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeVulkanForWin(HWND, const DisplayParams&);
+
+-std::unique_ptr<WindowContext> MakeGLForWin(HWND, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeGLForWin(HWND, const DisplayParams&);
+
+-std::unique_ptr<WindowContext> MakeANGLEForWin(HWND, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeANGLEForWin(HWND, const DisplayParams&);
+
+ #ifdef SK_DAWN
+-std::unique_ptr<WindowContext> MakeDawnD3D12ForWin(HWND, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeDawnD3D12ForWin(HWND, const DisplayParams&);
+ #endif
+
+-std::unique_ptr<WindowContext> MakeRasterForWin(HWND, const DisplayParams&);
++SK_API std::unique_ptr<WindowContext> MakeRasterForWin(HWND, const DisplayParams&);
+
+ } // namespace window_context_factory
+
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index b8894ad98216..c33735f58063 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -57,8 +57,8 @@ void WinSkiaSalGraphicsImpl::createSurface()
return;
}
sk_app::DisplayParams displayParams;
- mWindowContext.reset(
- sk_app::window_context_factory::NewRasterForWin(mWinParent.gethWnd(), displayParams));
+ mWindowContext
+ = sk_app::window_context_factory::MakeRasterForWin(mWinParent.gethWnd(), displayParams);
assert(SkToBool(mWindowContext)); // TODO
mSurface = mWindowContext->getBackbufferSurface();
assert(mSurface.get());
diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx
index 778581050124..cdb9a655f758 100644
--- a/vcl/skia/x11/gdiimpl.cxx
+++ b/vcl/skia/x11/gdiimpl.cxx
@@ -59,7 +59,7 @@ void X11SkiaSalGraphicsImpl::createSurface()
winInfo.fVisualInfo = const_cast<SalVisual*>(&mParent.GetVisual());
winInfo.fWidth = GetWidth();
winInfo.fHeight = GetHeight();
- mWindowContext.reset(sk_app::window_context_factory::NewRasterForXlib(winInfo, displayParams));
+ mWindowContext = sk_app::window_context_factory::MakeRasterForXlib(winInfo, displayParams);
assert(SkToBool(mWindowContext)); // TODO
mSurface = mWindowContext->getBackbufferSurface();
}
commit e95e964613a4bafc1fc2f58bdda93b30bda9153f
Author: Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Oct 21 11:51:46 2019 +0200
Commit: Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Oct 21 13:05:31 2019 +0200
build skia by default
Change-Id: Ia7d9c95b2e1e78481755f40d817c6f16a5d2b4ed
diff --git a/configure.ac b/configure.ac
index 97d9973c6c2a..20aa3e4b0cb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1037,8 +1037,8 @@ libo_FUZZ_ARG_ENABLE(pdfium,
)
libo_FUZZ_ARG_ENABLE(skia,
- AS_HELP_STRING([--enable-skia],
- [Enable building Skia.])
+ AS_HELP_STRING([--disable-skia],
+ [Disable building Skia.])
)
###############################################################################
@@ -10865,7 +10865,7 @@ AC_SUBST(POPPLER_LIBS)
# Skia?
AC_MSG_CHECKING([whether to build Skia])
ENABLE_SKIA=
-if test "$enable_skia" = "yes"; then
+if test "$enable_skia" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_SKIA=TRUE
AC_DEFINE(HAVE_FEATURE_SKIA)
More information about the Libreoffice-commits
mailing list