Revert "Move headers used by headers in include/ to include/private."

include/gpu/GrBlend.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTypes.h"
-#include "../private/SkTLogic.h"
+#include "../../src/utils/SkTLogic.h"
 
 #ifndef GrBlend_DEFINED
 #define GrBlend_DEFINED
 
 /**
  * Equations for alpha-blending.
  */
 enum GrBlendEquation {
     // Basic blend equations.
     kAdd_GrBlendEquation,             //<! Cs*S + Cd*D
@@ skipping 186 matching lines @@
                                                     kReverseSubtract_GrBlendEquation == Equation) &&
                                                    !GR_BLEND_COEFF_REFS_SRC(SrcCoeff) &&
                                                    (kOne_GrBlendCoeff == DstCoeff ||
                                                     kISC_GrBlendCoeff == DstCoeff ||
                                                     kISA_GrBlendCoeff == DstCoeff))> {};
 
 #define GR_BLEND_CAN_TWEAK_ALPHA_FOR_COVERAGE(EQUATION, SRC_COEFF, DST_COEFF) \
     GrTBlendCanTweakAlphaForCoverage<EQUATION, SRC_COEFF, DST_COEFF>::value
 
 #endif