remove cruft from SkTypes.h, including SkBool

src/utils/SkInterpolator.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkInterpolator.h"
@@ skipping 50 matching lines @@
 SkScalar SkInterpolatorBase::ComputeRelativeT(SkMSec time, SkMSec prevTime,
                                   SkMSec nextTime, const SkScalar blend[4]) {
     SkASSERT(time > prevTime && time < nextTime);
 
     SkScalar t = (SkScalar)(time - prevTime) / (SkScalar)(nextTime - prevTime);
     return blend ?
             SkUnitCubicInterp(t, blend[0], blend[1], blend[2], blend[3]) : t;
 }
 
 SkInterpolatorBase::Result SkInterpolatorBase::timeToT(SkMSec time, SkScalar* T,
-                                        int* indexPtr, SkBool* exactPtr) const {
+                                        int* indexPtr, bool* exactPtr) const {
     SkASSERT(fFrameCount > 0);
     Result  result = kNormal_Result;
     if (fRepeat != SK_Scalar1) {
         SkMSec startTime = 0, endTime = 0;  // initialize to avoid warning
         this->getDuration(&startTime, &endTime);
         SkMSec totalTime = endTime - startTime;
         SkMSec offsetTime = time - startTime;
         endTime = SkScalarFloorToInt(fRepeat * totalTime);
         if (offsetTime >= endTime) {
             SkScalar fraction = SkScalarFraction(fRepeat);
@@ skipping 93 matching lines @@
         SkScalar* dst = &fValues[fElemCount * index];
         memcpy(dst, values, fElemCount * sizeof(SkScalar));
     }
     return success;
 }
 
 SkInterpolator::Result SkInterpolator::timeToValues(SkMSec time,
                                                     SkScalar values[]) const {
     SkScalar T;
     int index;
-    SkBool exact;
+    bool exact;
     Result result = timeToT(time, &T, &index, &exact);
     if (values) {
         const SkScalar* nextSrc = &fValues[index * fElemCount];
 
         if (exact) {
             memcpy(values, nextSrc, fElemCount * sizeof(SkScalar));
         } else {
             SkASSERT(index > 0);
 
             const SkScalar* prevSrc = nextSrc - fElemCount;
@@ skipping 65 matching lines @@
     }
 
     // Now we have t, so compute the coeff for Y and evaluate
     b = pin_and_convert(by);
     c = pin_and_convert(cy);
     A = 3*b;
     B = 3*(c - 2*b);
     C = 3*(b - c) + Dot14_ONE;
     return SkFixedToScalar(eval_cubic(t, A, B, C) << 2);
 }