commit ec7278e703f0f22250bb98eb07e59572539a2c55
author Mike Reed <reed@google.com> Fri Feb 01 14:00:34 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 01 19:29:46 2019 +0000
tree 79ada367eff1c7a341a357a5d8882573c782114d
parent 9a2bb09202fbf4169dac9e57acc4729e7dc7e03f

remove unneeded friends/includes in SkPaint.h

Bug: skia:
Change-Id: Ica9f10cdb67322eb43ec38b6549146350fa5dcd9
Reviewed-on: https://skia-review.googlesource.com/c/188630
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>

src/gpu/text/GrTextBlob.cpp

diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index a7b67f7..0f5b7ea 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -14,6 +14,7 @@
 #include "GrTextTarget.h"
 #include "SkColorFilter.h"
 #include "SkMaskFilterBase.h"
+#include "SkPaintPriv.h"
 #include "ops/GrAtlasTextOp.h"
 
 #include <new>
@@ -81,7 +82,7 @@
     // to regenerate the blob on any color change
     // We use the grPaint to get any color filter effects
     if (fKey.fCanonicalColor == SK_ColorTRANSPARENT &&
-        fLuminanceColor != paint.computeLuminanceColor()) {
+        fLuminanceColor != SkPaintPriv::ComputeLuminanceColor(paint)) {
         return true;
     }
 
@@ -176,7 +177,8 @@
         // TODO: Can we be even smarter based on the dest transfer function?
         op = GrAtlasTextOp::MakeDistanceField(
                 target->getContext(), std::move(grPaint), glyphCount, distanceAdjustTable,
-                target->colorSpaceInfo().isLinearlyBlended(), paint.computeLuminanceColor(),
+                target->colorSpaceInfo().isLinearlyBlended(),
+                SkPaintPriv::ComputeLuminanceColor(paint),
                 props, info.isAntiAliased(), info.hasUseLCDText());
     } else {
         op = GrAtlasTextOp::MakeBitmap(target->getContext(), std::move(grPaint), format, glyphCount,