remove unused SkPoint3 from SkColor.h

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>

7 files changed, 5 insertions, 11 deletions

diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
index be79c97346..317578caca 100644
--- a/fuzz/FuzzCanvas.cpp
+++ b/fuzz/FuzzCanvas.cpp
@@ -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"
diff --git a/include/core/SkColor.h b/include/core/SkColor.h
index c5941394d8..8197408739 100644
--- a/include/core/SkColor.h
+++ b/include/core/SkColor.h
@@ -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;
 
diff --git a/include/utils/SkShadowUtils.h b/include/utils/SkShadowUtils.h
index 0ac2f3708d..5409731d37 100644
--- a/include/utils/SkShadowUtils.h
+++ b/include/utils/SkShadowUtils.h
@@ -9,6 +9,7 @@
 #define SkShadowUtils_DEFINED
 
 #include "SkColor.h"
+#include "SkPoint3.h"
 #include "SkScalar.h"
 #include "../private/SkShadowFlags.h"
 #include <functional>
diff --git a/src/core/SkColor.cpp b/src/core/SkColor.cpp
index bee114b1e8..d41184a428 100644
--- a/src/core/SkColor.cpp
+++ b/src/core/SkColor.cpp
@@ -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())));
 }
diff --git a/src/utils/SkShadowTessellator.cpp b/src/utils/SkShadowTessellator.cpp
index df43732083..62306998d8 100755
--- a/src/utils/SkShadowTessellator.cpp
+++ b/src/utils/SkShadowTessellator.cpp
@@ -10,6 +10,7 @@
 #include "SkGeometry.h"
 #include "SkInsetConvexPolygon.h"
 #include "SkPath.h"
+#include "SkPoint3.h"
 #include "SkVertices.h"
 
 #if SK_SUPPORT_GPU
diff --git a/src/utils/SkShadowTessellator.h b/src/utils/SkShadowTessellator.h
index 351beee29d..420b8184ef 100644
--- a/src/utils/SkShadowTessellator.h
+++ b/src/utils/SkShadowTessellator.h
@@ -14,6 +14,7 @@
 
 class SkMatrix;
 class SkPath;
+struct SkPoint3;
 class SkVertices;
 
 namespace SkShadowTessellator {
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index d7d330f750..6426538c64 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -11,6 +11,7 @@
 #include "SkColorSpaceXformer.h"
 #include "SkDrawLooper.h"
 #include "SkLightingImageFilter.h"
+#include "SkPoint3.h"
 #include "SkTypes.h"
 #include "Test.h"