diff options
| author |  reed <reed@google.com> | 2015-12-27 12:47:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-27 12:47:25 -0800 |
| commit | 9a878a00ef2c2eb72628c807be5969e2d8098317 (patch) | |
| tree | dbd74fce2241f376ac2b3265e10bd9b04fdf499d /src/animator | |
| parent | 43a6f405e6aa0726fd18eb2b1575ac12ea093610 (diff) | |
remove cruft from SkTypes.h, including SkBool
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1548223002
TBR=
Review URL: https://codereview.chromium.org/1548223002
Diffstat (limited to 'src/animator')
| -rw-r--r-- | src/animator/SkDisplayType.h | 4 | ||||
| -rw-r--r-- | src/animator/SkDisplayTypes.h | 2 | ||||
| -rw-r--r-- | src/animator/SkOperandIterpolator.cpp | 4 | ||||
| -rw-r--r-- | src/animator/SkScript.h | 2 | ||||
| -rw-r--r-- | src/animator/SkScript2.h | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/src/animator/SkDisplayType.h b/src/animator/SkDisplayType.h index 474a65e8e6..8ffcd75fea 100644 --- a/src/animator/SkDisplayType.h +++ b/src/animator/SkDisplayType.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,13 +5,14 @@ * found in the LICENSE file. */ - #ifndef SkDisplayType_DEFINED #define SkDisplayType_DEFINED #include "SkMath.h" #include "SkScalar.h" +typedef int SkBool; + #ifdef SK_DEBUG #define SK_DUMP_ENABLED #ifdef SK_BUILD_FOR_MAC diff --git a/src/animator/SkDisplayTypes.h b/src/animator/SkDisplayTypes.h index 07e8448a4c..c24091f398 100644 --- a/src/animator/SkDisplayTypes.h +++ b/src/animator/SkDisplayTypes.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,7 +5,6 @@ * found in the LICENSE file. */ - #ifndef SkDisplayTypes_DEFINED #define SkDisplayTypes_DEFINED diff --git a/src/animator/SkOperandIterpolator.cpp b/src/animator/SkOperandIterpolator.cpp index e6973e29f7..89ac44dea2 100644 --- a/src/animator/SkOperandIterpolator.cpp +++ b/src/animator/SkOperandIterpolator.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,7 +5,6 @@ * found in the LICENSE file. */ - #include "SkOperandInterpolator.h" #include "SkScript.h" @@ -60,7 +58,7 @@ SkInterpolatorBase::Result SkOperandInterpolator::timeToValues(SkMSec time, SkOp { SkScalar T; int index; - SkBool exact; + bool exact; Result result = timeToT(time, &T, &index, &exact); if (values) { diff --git a/src/animator/SkScript.h b/src/animator/SkScript.h index aa8d9a30c8..074d10c3cc 100644 --- a/src/animator/SkScript.h +++ b/src/animator/SkScript.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,7 +5,6 @@ * found in the LICENSE file. */ - #ifndef SkScript_DEFINED #define SkScript_DEFINED diff --git a/src/animator/SkScript2.h b/src/animator/SkScript2.h index d182e8c7c5..f257adb450 100644 --- a/src/animator/SkScript2.h +++ b/src/animator/SkScript2.h @@ -1,13 +1,14 @@ - /* * Copyright 2011 Google Inc. * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #ifndef SkScript2_DEFINED #define SkScript2_DEFINED +#include "SkDisplayType.h" #include "SkOperand2.h" #include "SkStream.h" #include "SkTDArray.h" |