diff options
| author |  Hal Canary <halcanary@google.com> | 2017-04-11 12:12:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-11 18:57:20 +0000 |
| commit | fafe135349bd34961a12bfd8185733709cd0e45e (patch) | |
| tree | b40dbd0a0787901843aba62eec1f21a1fe3936e1 /bench/PathBench.cpp | |
| parent | 8a8e5fe290307952f9b8df1eb680eed52d83eca9 (diff) | |
SkSize can be aggregate-initialized
Previosly, SkSize had a base class, which prevented it.
Also removes unused SkISize::clampNegToZero() and
SkSize::clampNegToZero().
Change-Id: I7b93b42f6f6381c66e294bbedee99ad53c6c3436
Reviewed-on: https://skia-review.googlesource.com/13187
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'bench/PathBench.cpp')
| -rw-r--r-- | bench/PathBench.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp index 3a1410a32d..6991db558d 100644 --- a/bench/PathBench.cpp +++ b/bench/PathBench.cpp @@ -1115,8 +1115,8 @@ private: const SkRect ConservativelyContainsBench::kBounds = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100)); -const SkSize ConservativelyContainsBench::kQueryMin = SkSize::Make(SkIntToScalar(1), SkIntToScalar(1)); -const SkSize ConservativelyContainsBench::kQueryMax = SkSize::Make(SkIntToScalar(40), SkIntToScalar(40)); +const SkSize ConservativelyContainsBench::kQueryMin = {SkIntToScalar(1), SkIntToScalar(1)}; +const SkSize ConservativelyContainsBench::kQueryMax = {SkIntToScalar(40), SkIntToScalar(40)}; const SkRect ConservativelyContainsBench::kBaseRect = SkRect::MakeXYWH(SkIntToScalar(25), SkIntToScalar(25), SkIntToScalar(50), SkIntToScalar(50)); const SkScalar ConservativelyContainsBench::kRRRadii[2] = {SkIntToScalar(5), SkIntToScalar(10)}; |