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

Add SK_API to SkOverdrawCanvas and SkOverdrawColorFilter.

Browse Source 
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>
This commit is contained in:
Sadrul Habib Chowdhury 2017-08-18 10:20:02 -04:00 committed by Skia Commit-Bot
parent 8009488d7f
commit 4189d1b8b7
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gn/core.gni
View File

@ -200,7 +200,6 @@ skia_core_sources = [
"$_src/core/SkOrderedReadBuffer.h", "$_src/core/SkOrderedReadBuffer.h",
"$_src/core/SkOSFile.h", "$_src/core/SkOSFile.h",
"$_src/core/SkOverdrawCanvas.cpp", "$_src/core/SkOverdrawCanvas.cpp",
"$_src/core/SkOverdrawCanvas.h",
"$_src/core/SkPaint.cpp", "$_src/core/SkPaint.cpp",
"$_src/core/SkPaintDefaults.h", "$_src/core/SkPaintDefaults.h",
"$_src/core/SkPaintPriv.cpp", "$_src/core/SkPaintPriv.cpp",
@ -394,6 +393,7 @@ skia_core_sources = [
"$_include/core/SkMatrix44.h", "$_include/core/SkMatrix44.h",
"$_include/core/SkMetaData.h", "$_include/core/SkMetaData.h",
"$_include/core/SkMultiPictureDraw.h", "$_include/core/SkMultiPictureDraw.h",
"$_include/core/SkOverdrawCanvas.h",
"$_include/core/SkPaint.h", "$_include/core/SkPaint.h",
"$_include/core/SkPath.h", "$_include/core/SkPath.h",
"$_include/core/SkPathEffect.h", "$_include/core/SkPathEffect.h",

2
gn/effects.gni
View File

@ -46,7 +46,6 @@ skia_effects_sources = [
"$_src/effects/SkMorphologyImageFilter.cpp", "$_src/effects/SkMorphologyImageFilter.cpp",
"$_src/effects/SkOffsetImageFilter.cpp", "$_src/effects/SkOffsetImageFilter.cpp",
"$_src/effects/SkOverdrawColorFilter.cpp", "$_src/effects/SkOverdrawColorFilter.cpp",
"$_src/effects/SkOverdrawColorFilter.h",
"$_src/effects/SkPackBits.cpp", "$_src/effects/SkPackBits.cpp",
"$_src/effects/SkPackBits.h", "$_src/effects/SkPackBits.h",
"$_src/effects/SkPaintFlagsDrawFilter.cpp", "$_src/effects/SkPaintFlagsDrawFilter.cpp",
@ -106,6 +105,7 @@ skia_effects_sources = [
"$_include/effects/SkMagnifierImageFilter.h", "$_include/effects/SkMagnifierImageFilter.h",
"$_include/effects/SkMorphologyImageFilter.h", "$_include/effects/SkMorphologyImageFilter.h",
"$_include/effects/SkOffsetImageFilter.h", "$_include/effects/SkOffsetImageFilter.h",
"$_include/effects/SkOverdrawColorFilter.h",
"$_include/effects/SkPaintFlagsDrawFilter.h", "$_include/effects/SkPaintFlagsDrawFilter.h",
"$_include/effects/SkPaintImageFilter.h", "$_include/effects/SkPaintImageFilter.h",
"$_include/effects/SkPerlinNoiseShader.h", "$_include/effects/SkPerlinNoiseShader.h",

2
src/core/SkOverdrawCanvas.h → include/core/SkOverdrawCanvas.h
View File

@ -15,7 +15,7 @@
* increments the alpha channel of each pixel every time it would have been touched * increments the alpha channel of each pixel every time it would have been touched
* by a draw call. This is useful for detecting overdraw. * by a draw call. This is useful for detecting overdraw.
*/ */
class SkOverdrawCanvas : public SkNWayCanvas { class SK_API SkOverdrawCanvas : public SkNWayCanvas {
public: public:
/* Does not take ownership of canvas */ /* Does not take ownership of canvas */
SkOverdrawCanvas(SkCanvas*); SkOverdrawCanvas(SkCanvas*);

2
src/effects/SkOverdrawColorFilter.h → include/effects/SkOverdrawColorFilter.h
View File

@ -19,7 +19,7 @@
* 5 (or larger) -> fColors[5] * 5 (or larger) -> fColors[5]
* *
*/ */
class SkOverdrawColorFilter : public SkColorFilter { class SK_API SkOverdrawColorFilter : public SkColorFilter {
public: public:
static constexpr int kNumColors = 6; static constexpr int kNumColors = 6;

2
src/ports/SkGlobalInitialization_default.cpp
View File

@ -33,7 +33,7 @@
#include "SkMergeImageFilter.h" #include "SkMergeImageFilter.h"
#include "SkMorphologyImageFilter.h" #include "SkMorphologyImageFilter.h"
#include "SkOffsetImageFilter.h" #include "SkOffsetImageFilter.h"
#include "../../src/effects/SkOverdrawColorFilter.h" #include "SkOverdrawColorFilter.h"
#include "SkPaintImageFilter.h" #include "SkPaintImageFilter.h"
#include "SkPerlinNoiseShader.h" #include "SkPerlinNoiseShader.h"
#include "SkPictureImageFilter.h" #include "SkPictureImageFilter.h"