AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix skshaper in component builds"

Browse Source 
This reverts commit d1be5d64f8.

Reason for revert: Chrome win compile

Original change's description:
> Fix skshaper in component builds
> 
> It was building a shared library, but had no exports (on Windows).
> We think the correct model for modules in the future is for each one
> to be a separate DLL linked against the public API/exports of Skia.
> This serves as the model for that. Doing this with other modules will
> probably require exporting more symbols from Skia.
> 
> Change-Id: I116b1635533d755ae71e8df5aa234270b7f77a31
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/267477
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=mtklein@google.com,brianosman@google.com

Change-Id: I4c70dc996ce3964b017dc863bed2428bf4b63325
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/267758
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2020-01-30 15:32:26 +00:00 committed by Skia Commit-Bot
parent eb40726b88
commit 482f1c7479
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/skshaper/BUILD.gn
View File

@ -26,7 +26,6 @@ if (skia_enable_skshaper) {
deps = [
"../..:skia",
]
defines = [ "SKSHAPER_IMPLEMENTATION=1" ]
sources = skia_shaper_primitive_sources
if (skia_use_icu && skia_use_harfbuzz) {
sources += skia_shaper_harfbuzz_sources

24
modules/skshaper/include/SkShaper.h
View File

@ -17,26 +17,6 @@
#include <memory>
#if !defined(SKSHAPER_IMPLEMENTATION)
#define SKSHAPER_IMPLEMENTATION 0
#endif
#if !defined(SKSHAPER_API)
#if defined(SKIA_DLL)
#if defined(_MSC_VER)
#if SKSHAPER_IMPLEMENTATION
#define SKSHAPER_API __declspec(dllexport)
#else
#define SKSHAPER_API __declspec(dllimport)
#endif
#else
#define SKSHAPER_API __attribute__((visibility("default")))
#endif
#else
#define SKSHAPER_API
#endif
#endif
class SkFont;
class SkFontMgr;
@ -46,7 +26,7 @@ class SkFontMgr;
If compiled without HarfBuzz, fall back on SkPaint::textToGlyphs.
*/
class SKSHAPER_API SkShaper {
class SkShaper {
public:
static std::unique_ptr<SkShaper> MakePrimitive();
#ifdef SK_SHAPER_HARFBUZZ_AVAILABLE
@ -252,7 +232,7 @@ private:
/**
* Helper for shaping text directly into a SkTextBlob.
*/
class SKSHAPER_API SkTextBlobBuilderRunHandler final : public SkShaper::RunHandler {
class SkTextBlobBuilderRunHandler final : public SkShaper::RunHandler {
public:
SkTextBlobBuilderRunHandler(const char* utf8Text, SkPoint offset)
: fUtf8Text(utf8Text)