形式
Diff
投稿日時
2020-07-11 05:41
公開期間
無期限
  1. diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn
  2. index 4517710946..f49d3b9b39 100644
  3. --- a/gn/toolchain/BUILD.gn
  4. +++ b/gn/toolchain/BUILD.gn
  5. @@ -67,7 +67,7 @@ toolchain("msvc") {
  6. if (target_cpu == "x86") {
  7. # Toolchain asset includes a script that configures for x86 building.
  8. # We don't support x86 builds with local MSVC installations.
  9. - env_setup = "$shell $win_sdk/bin/SetEnv.cmd /x86 && "
  10. + # env_setup = "$shell $win_sdk/bin/SetEnv.cmd /x86 && "
  11. } else if (target_cpu == "arm64") {
  12. # ARM64 compiler is incomplete - it relies on DLLs located in the host toolchain directory.
  13. env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && "
  14. @@ -201,7 +201,7 @@ toolchain("msvc") {
  15. tool("copy") {
  16. cp_py = rebase_path("../cp.py")
  17. - command = "python \"$cp_py\" {{source}} {{output}}"
  18. + command = "$shell python \"$cp_py\" {{source}} {{output}}"
  19. description = "copy {{source}} {{output}}"
  20. }
  21. }
  22. @@ -341,13 +341,13 @@ template("gcc_like_toolchain") {
  23. tool("copy") {
  24. cp_py = rebase_path("../cp.py")
  25. - command = "python \"$cp_py\" {{source}} {{output}}"
  26. + command = "$shell python \"$cp_py\" {{source}} {{output}}"
  27. description = "copy {{source}} {{output}}"
  28. }
  29. tool("copy_bundle_data") {
  30. cp_py = rebase_path("../cp.py")
  31. - command = "python \"$cp_py\" {{source}} {{output}}"
  32. + command = "$shell python \"$cp_py\" {{source}} {{output}}"
  33. description = "copy_bundle_data {{source}} {{output}}"
  34. }
  35. diff --git a/include/core/SkM44.h b/include/core/SkM44.h
  36. index 63b3ac140b..d32921d96e 100644
  37. --- a/include/core/SkM44.h
  38. +++ b/include/core/SkM44.h
  39. @@ -405,7 +405,7 @@ private:
  40. friend class SkMatrixPriv;
  41. };
  42. -SkM44 Sk3LookAt(const SkV3& eye, const SkV3& center, const SkV3& up);
  43. -SkM44 Sk3Perspective(float near, float far, float angle);
  44. +SK_API SkM44 Sk3LookAt(const SkV3& eye, const SkV3& center, const SkV3& up);
  45. +SK_API SkM44 Sk3Perspective(float near, float far, float angle);
  46. #endif
  47. diff --git a/include/core/SkString.h b/include/core/SkString.h
  48. index 6f1d972da2..5bee2dc218 100644
  49. --- a/include/core/SkString.h
  50. +++ b/include/core/SkString.h
  51. @@ -270,7 +270,7 @@ private:
  52. };
  53. /// Creates a new string and writes into it using a printf()-style format.
  54. -SkString SkStringPrintf(const char* format, ...) SK_PRINTF_LIKE(1, 2);
  55. +SK_API SkString SkStringPrintf(const char* format, ...) SK_PRINTF_LIKE(1, 2);
  56. /// This makes it easier to write a caller as a VAR_ARGS function where the format string is
  57. /// optional.
  58. static inline SkString SkStringPrintf() { return SkString(); }
  59. diff --git a/include/private/SkThreadID.h b/include/private/SkThreadID.h
  60. index 06b9be7317..2764370405 100644
  61. --- a/include/private/SkThreadID.h
  62. +++ b/include/private/SkThreadID.h
  63. @@ -12,7 +12,7 @@
  64. typedef int64_t SkThreadID;
  65. -SkThreadID SkGetThreadID();
  66. +SK_API SkThreadID SkGetThreadID();
  67. const SkThreadID kIllegalThreadID = 0;
  68. diff --git a/include/utils/SkCustomTypeface.h b/include/utils/SkCustomTypeface.h
  69. index 61f32afed5..ffe3ad8d34 100644
  70. --- a/include/utils/SkCustomTypeface.h
  71. +++ b/include/utils/SkCustomTypeface.h
  72. @@ -19,7 +19,7 @@
  73. class SkStream;
  74. -class SkCustomTypefaceBuilder {
  75. +class SK_API SkCustomTypefaceBuilder {
  76. public:
  77. SkCustomTypefaceBuilder();
  78. diff --git a/modules/skottie/include/Skottie.h b/modules/skottie/include/Skottie.h
  79. index c519068b43..ecb2debf8e 100644
  80. --- a/modules/skottie/include/Skottie.h
  81. +++ b/modules/skottie/include/Skottie.h
  82. @@ -43,7 +43,7 @@ using ResourceProvider = skresources::ResourceProvider;
  83. /**
  84. * A Logger subclass can be used to receive Animation::Builder parsing errors and warnings.
  85. */
  86. -class SK_API Logger : public SkRefCnt {
  87. +class Logger : public SkRefCnt {
  88. public:
  89. enum class Level {
  90. kWarning,
  91. @@ -56,13 +56,13 @@ public:
  92. /**
  93. * Interface for receiving AE composition markers at Animation build time.
  94. */
  95. -class SK_API MarkerObserver : public SkRefCnt {
  96. +class MarkerObserver : public SkRefCnt {
  97. public:
  98. // t0,t1 are in the Animation::seek() domain.
  99. virtual void onMarker(const char name[], float t0, float t1) = 0;
  100. };
  101. -class SK_API Animation : public SkNVRefCnt<Animation> {
  102. +class Animation : public SkNVRefCnt<Animation> {
  103. public:
  104. class Builder final {
  105. public:
  106. diff --git a/modules/skottie/include/SkottieProperty.h b/modules/skottie/include/SkottieProperty.h
  107. index 2355984b86..fbc08544f9 100644
  108. --- a/modules/skottie/include/SkottieProperty.h
  109. +++ b/modules/skottie/include/SkottieProperty.h
  110. @@ -70,7 +70,7 @@ namespace internal { class AnimationBuilder; }
  111. * and the internal scene-graph representation.
  112. */
  113. template <typename ValueT, typename NodeT>
  114. -class SK_API PropertyHandle final {
  115. +class PropertyHandle final {
  116. public:
  117. explicit PropertyHandle(sk_sp<NodeT> node) : fNode(std::move(node)) {}
  118. ~PropertyHandle();
  119. @@ -106,7 +106,7 @@ using TransformPropertyHandle = PropertyHandle<TransformPropertyValue,
  120. * various properties of layer and shape nodes. The |node_name| argument corresponds to the
  121. * name ("nm") node property.
  122. */
  123. -class SK_API PropertyObserver : public SkRefCnt {
  124. +class PropertyObserver : public SkRefCnt {
  125. public:
  126. template <typename T>
  127. using LazyHandle = std::function<std::unique_ptr<T>()>;
  128. diff --git a/modules/skresources/include/SkResources.h b/modules/skresources/include/SkResources.h
  129. index c5bdb81dfa..af6b2baa36 100644
  130. --- a/modules/skresources/include/SkResources.h
  131. +++ b/modules/skresources/include/SkResources.h
  132. @@ -26,7 +26,7 @@ namespace skresources {
  133. /**
  134. * Image asset proxy interface.
  135. */
  136. -class SK_API ImageAsset : public SkRefCnt {
  137. +class ImageAsset : public SkRefCnt {
  138. public:
  139. /**
  140. * Returns true if the image asset is animated.
  141. @@ -75,7 +75,7 @@ private:
  142. * ResourceProvider is an interface that lets rich-content modules defer loading of external
  143. * resources (images, fonts, etc.) to embedding clients.
  144. */
  145. -class SK_API ResourceProvider : public SkRefCnt {
  146. +class ResourceProvider : public SkRefCnt {
  147. public:
  148. /**
  149. * Load a generic resource (currently only nested animations) specified by |path| + |name|,
  150. diff --git a/modules/sksg/BUILD.gn b/modules/sksg/BUILD.gn
  151. index 3bf998b173..319a4d522e 100644
  152. --- a/modules/sksg/BUILD.gn
  153. +++ b/modules/sksg/BUILD.gn
  154. @@ -9,7 +9,7 @@ config("public_config") {
  155. include_dirs = [ "include" ]
  156. }
  157. -component("sksg") {
  158. +static_library("sksg") {
  159. check_includes = false
  160. import("sksg.gni")
  161. public_configs = [ ":public_config" ]
  162. diff --git a/src/core/SkTextBlobPriv.h b/src/core/SkTextBlobPriv.h
  163. index 5394b50d5d..2fa56a9cab 100644
  164. --- a/src/core/SkTextBlobPriv.h
  165. +++ b/src/core/SkTextBlobPriv.h
  166. @@ -199,7 +199,7 @@ private:
  167. * .....
  168. * }
  169. */
  170. -class SkTextBlobRunIterator {
  171. +class SK_API SkTextBlobRunIterator {
  172. public:
  173. SkTextBlobRunIterator(const SkTextBlob* blob);
  174. diff --git a/src/utils/SkJSON.h b/src/utils/SkJSON.h
  175. index d3f0b1d48f..970d64cd5b 100644
  176. --- a/src/utils/SkJSON.h
  177. +++ b/src/utils/SkJSON.h
  178. @@ -53,7 +53,7 @@ namespace skjson {
  179. * }
  180. * }
  181. */
  182. -class alignas(8) Value {
  183. +class SK_API alignas(8) Value {
  184. public:
  185. enum class Type {
  186. kNull,
  187. @@ -209,7 +209,7 @@ private:
  188. #endif
  189. };
  190. -class NullValue final : public Value {
  191. +class SK_API NullValue final : public Value {
  192. public:
  193. static constexpr Type kType = Type::kNull;
  194. @@ -321,7 +321,7 @@ struct Member {
  195. Value fValue;
  196. };
  197. -class ObjectValue final : public VectorValue<Member, Value::Type::kObject> {
  198. +class SK_API ObjectValue final : public VectorValue<Member, Value::Type::kObject> {
  199. public:
  200. ObjectValue(const Member* src, size_t size, SkArenaAlloc& alloc);
  201. @@ -332,7 +332,7 @@ public:
  202. }
  203. };
  204. -class DOM final : public SkNoncopyable {
  205. +class SK_API DOM final : public SkNoncopyable {
  206. public:
  207. DOM(const char*, size_t);
ダウンロード 印刷用表示

このコピペの URL

JavaScript での埋め込み

iframe での埋め込み

元のテキスト