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

remove unused SkPoint3 from SkColor.h

Browse Source 
Bug: skia:
Change-Id: Iba327a5604dc11525c4d8d0a535a7c417a1b8185
Reviewed-on: https://skia-review.googlesource.com/25961
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2017-07-22 08:29:48 -04:00 committed by Skia Commit-Bot
parent 31599e98df
commit 54518ac1c2
7 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuzz/FuzzCanvas.cpp
View File

@ -18,6 +18,7 @@
#include "SkNullCanvas.h"
#include "SkPathEffect.h"
#include "SkPictureRecorder.h"
#include "SkPoint3.h"
#include "SkRSXform.h"
#include "SkRegion.h"
#include "SkSurface.h"

2
include/core/SkColor.h
View File

@ -9,7 +9,6 @@
#define SkColor_DEFINED
#include "SkScalar.h"
#include "SkPoint3.h"
#include "SkTypes.h"
/** \file SkColor.h
@ -195,7 +194,6 @@ struct SkColor4f {
static SkColor4f Pin(float r, float g, float b, float a);
/** Convert to SkColor4f, assuming SkColor is sRGB */
static SkColor4f FromColor(SkColor);
static SkColor4f FromColor3f(SkColor3f, float a);
SkColor toSkColor() const;

1
include/utils/SkShadowUtils.h
View File

@ -9,6 +9,7 @@
#define SkShadowUtils_DEFINED
#include "SkColor.h"
#include "SkPoint3.h"
#include "SkScalar.h"
#include "../private/SkShadowFlags.h"
#include <functional>

9
src/core/SkColor.cpp
View File

@ -157,15 +157,6 @@ SkColor4f SkColor4f::FromColor(SkColor bgra) {
return rgba;
}
SkColor4f SkColor4f::FromColor3f(SkColor3f color3f, float a) {
SkColor4f rgba;
rgba.fR = color3f.fX;
rgba.fG = color3f.fY;
rgba.fB = color3f.fZ;
rgba.fA = a;
return rgba;
}
SkColor SkColor4f::toSkColor() const {
return Sk4f_toS32(swizzle_rb(Sk4f::Load(this->vec())));
}

1
src/utils/SkShadowTessellator.cpp
View File

@ -10,6 +10,7 @@
#include "SkGeometry.h"
#include "SkInsetConvexPolygon.h"
#include "SkPath.h"
#include "SkPoint3.h"
#include "SkVertices.h"
#if SK_SUPPORT_GPU

1
src/utils/SkShadowTessellator.h
View File

@ -14,6 +14,7 @@
class SkMatrix;
class SkPath;
struct SkPoint3;
class SkVertices;
namespace SkShadowTessellator {

1
tests/QuickRejectTest.cpp
View File

@ -11,6 +11,7 @@
#include "SkColorSpaceXformer.h"
#include "SkDrawLooper.h"
#include "SkLightingImageFilter.h"
#include "SkPoint3.h"
#include "SkTypes.h"
#include "Test.h"