diff options
| author |  Sadrul Habib Chowdhury <sadrul@chromium.org> | 2017-08-18 10:20:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-18 16:53:49 +0000 |
| commit | 4189d1b8b7dfa62f10845b0afcadba3a956ec939 (patch) | |
| tree | 34085badc5c840d2b92da7fff1a6aad35ff6df91 | |
| parent | 8009488d7f322dd43601b0ba273e3db62a2aaadd (diff) | |
Add SK_API to SkOverdrawCanvas and SkOverdrawColorFilter.
The SkiaRenderer in chromium is going to use the overdraw canvas and
filter for measuring overdraw. Move these headers out of src/ into
include/.
Bug: chromium:704285
Change-Id: I2abb1671b73e3d26552462cf700340a7e3b874f0
Reviewed-on: https://skia-review.googlesource.com/36160
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
| -rw-r--r-- | gn/core.gni | 2 | ||||
| -rw-r--r-- | gn/effects.gni | 2 | ||||
| -rw-r--r-- | include/core/SkOverdrawCanvas.h (renamed from src/core/SkOverdrawCanvas.h) | 2 | ||||
| -rw-r--r-- | include/effects/SkOverdrawColorFilter.h (renamed from src/effects/SkOverdrawColorFilter.h) | 2 | ||||
| -rw-r--r-- | src/ports/SkGlobalInitialization_default.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/gn/core.gni b/gn/core.gni index efd3eab5b2..65b08db282 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -200,7 +200,6 @@ skia_core_sources = [ "$_src/core/SkOrderedReadBuffer.h", "$_src/core/SkOSFile.h", "$_src/core/SkOverdrawCanvas.cpp", - "$_src/core/SkOverdrawCanvas.h", "$_src/core/SkPaint.cpp", "$_src/core/SkPaintDefaults.h", "$_src/core/SkPaintPriv.cpp", @@ -394,6 +393,7 @@ skia_core_sources = [ "$_include/core/SkMatrix44.h", "$_include/core/SkMetaData.h", "$_include/core/SkMultiPictureDraw.h", + "$_include/core/SkOverdrawCanvas.h", "$_include/core/SkPaint.h", "$_include/core/SkPath.h", "$_include/core/SkPathEffect.h", diff --git a/gn/effects.gni b/gn/effects.gni index f3a480d2cc..138b5b5655 100644 --- a/gn/effects.gni +++ b/gn/effects.gni @@ -46,7 +46,6 @@ skia_effects_sources = [ "$_src/effects/SkMorphologyImageFilter.cpp", "$_src/effects/SkOffsetImageFilter.cpp", "$_src/effects/SkOverdrawColorFilter.cpp", - "$_src/effects/SkOverdrawColorFilter.h", "$_src/effects/SkPackBits.cpp", "$_src/effects/SkPackBits.h", "$_src/effects/SkPaintFlagsDrawFilter.cpp", @@ -106,6 +105,7 @@ skia_effects_sources = [ "$_include/effects/SkMagnifierImageFilter.h", "$_include/effects/SkMorphologyImageFilter.h", "$_include/effects/SkOffsetImageFilter.h", + "$_include/effects/SkOverdrawColorFilter.h", "$_include/effects/SkPaintFlagsDrawFilter.h", "$_include/effects/SkPaintImageFilter.h", "$_include/effects/SkPerlinNoiseShader.h", diff --git a/src/core/SkOverdrawCanvas.h b/include/core/SkOverdrawCanvas.h index 5c247b1630..284fe6cd97 100644 --- a/src/core/SkOverdrawCanvas.h +++ b/include/core/SkOverdrawCanvas.h @@ -15,7 +15,7 @@ * increments the alpha channel of each pixel every time it would have been touched * by a draw call. This is useful for detecting overdraw. */ -class SkOverdrawCanvas : public SkNWayCanvas { +class SK_API SkOverdrawCanvas : public SkNWayCanvas { public: /* Does not take ownership of canvas */ SkOverdrawCanvas(SkCanvas*); diff --git a/src/effects/SkOverdrawColorFilter.h b/include/effects/SkOverdrawColorFilter.h index 0948f7080d..ac97821269 100644 --- a/src/effects/SkOverdrawColorFilter.h +++ b/include/effects/SkOverdrawColorFilter.h @@ -19,7 +19,7 @@ * 5 (or larger) -> fColors[5] * */ -class SkOverdrawColorFilter : public SkColorFilter { +class SK_API SkOverdrawColorFilter : public SkColorFilter { public: static constexpr int kNumColors = 6; diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index d372f12228..52ef365ea2 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -33,7 +33,7 @@ #include "SkMergeImageFilter.h" #include "SkMorphologyImageFilter.h" #include "SkOffsetImageFilter.h" -#include "../../src/effects/SkOverdrawColorFilter.h" +#include "SkOverdrawColorFilter.h" #include "SkPaintImageFilter.h" #include "SkPerlinNoiseShader.h" #include "SkPictureImageFilter.h" |