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

don't memtion SkXfermode in public

Browse Source 
BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5070

Change-Id: Ia9527bfd0f13146669df5e71098af903e14bae3a
Reviewed-on: https://skia-review.googlesource.com/5070
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2016-11-18 17:19:54 -05:00 committed by Skia Commit-Bot
parent 1fc83b131a
commit 71fecc32b1
9 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/core/SkBitmapDevice.h
View File

@ -29,7 +29,6 @@ class SkPixelRef;
class SkPixmap;
class SkRRect;
class SkSurface;
class SkXfermode;
struct SkPoint;
///////////////////////////////////////////////////////////////////////////////

1
include/core/SkCanvas.h
View File

@ -18,7 +18,6 @@
#include "SkRefCnt.h"
#include "SkRegion.h"
#include "SkSurfaceProps.h"
#include "SkXfermode.h"
#include "SkLights.h"
#include "../private/SkShadowParams.h"

2
include/core/SkColorFilter.h
View File

@ -8,10 +8,10 @@
#ifndef SkColorFilter_DEFINED
#define SkColorFilter_DEFINED
#include "SkBlendMode.h"
#include "SkColor.h"
#include "SkFlattenable.h"
#include "SkRefCnt.h"
#include "SkXfermode.h"
class GrContext;
class GrFragmentProcessor;

4
include/core/SkPaint.h
View File

@ -12,7 +12,7 @@
#include "SkColor.h"
#include "SkFilterQuality.h"
#include "SkMatrix.h"
#include "SkXfermode.h"
#include "SkRefCnt.h"
class SkAutoDescriptor;
class SkAutoGlyphCache;
@ -1056,7 +1056,7 @@ private:
SkColor fColor;
SkScalar fWidth;
SkScalar fMiterLimit;
uint32_t fBlendMode; // just need 5-6 bits for SkXfermode::Mode
uint32_t fBlendMode; // just need 5-6 bits
union {
struct {
// all of these bitfields should add up to 32

8
include/effects/SkLayerDrawLooper.h
View File

@ -11,7 +11,7 @@
#include "SkDrawLooper.h"
#include "SkPaint.h"
#include "SkPoint.h"
#include "SkXfermode.h"
#include "SkBlendMode.h"
class SK_API SkLayerDrawLooper : public SkDrawLooper {
public:
@ -51,9 +51,9 @@ public:
* The layer's paint's color is treated as the SRC
* The draw's paint's color is treated as the DST
* final-color = Mode(layers-color, draws-color);
* Any SkXfermode::Mode will work. Two common choices are:
* kSrc_Mode: to use the layer's color, ignoring the draw's
* kDst_Mode: to just keep the draw's color, ignoring the layer's
* Any SkBlendMode will work. Two common choices are:
* kSrc: to use the layer's color, ignoring the draw's
* kDst: to just keep the draw's color, ignoring the layer's
*/
struct SK_API LayerInfo {
BitFlags fPaintBits;

5
include/effects/SkMergeImageFilter.h
View File

@ -8,10 +8,9 @@
#ifndef SkMergeImageFilter_DEFINED
#define SkMergeImageFilter_DEFINED
#include "SkBlendMode.h"
#include "SkImageFilter.h"
#include "SkXfermode.h"
class SK_API SkMergeImageFilter : public SkImageFilter {
public:
~SkMergeImageFilter() override;
@ -34,7 +33,7 @@ private:
SkMergeImageFilter(sk_sp<SkImageFilter> filters[], int count, const SkBlendMode modes[],
const CropRect* cropRect);
uint8_t* fModes; // SkXfermode::Mode
uint8_t* fModes; // SkBlendMode
// private storage, to avoid dynamically allocating storage for our copy
// of the modes (unless the count is so large we can't fit).

2
include/effects/SkXfermodeImageFilter.h
View File

@ -11,8 +11,6 @@
#include "SkBlendMode.h"
#include "SkImageFilter.h"
class SkXfermode;
/**
* This filter takes an xfermode, and uses it to composite the foreground
* over the background. If foreground or background is NULL, the input

1
include/gpu/GrXferProcessor.h
View File

@ -13,7 +13,6 @@
#include "GrProcessor.h"
#include "GrTexture.h"
#include "GrTypes.h"
#include "SkXfermode.h"
class GrShaderCaps;
class GrGLSLCaps;

2
include/gpu/effects/GrPorterDuffXferProcessor.h
View File

@ -10,7 +10,7 @@
#include "GrTypes.h"
#include "GrXferProcessor.h"
#include "SkXfermode.h"
#include "SkBlendMode.h"
class GrProcOptInfo;