summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mike Reed <reed@google.com> 2019-01-25 13:04:14 -0500
committer Mike Reed <reed@google.com> 2019-01-25 18:06:21 +0000
commit0ea09a4f4a53019a26b8a25806cff7bb94e9c853 (patch)
tree0105af4468affc54559afc5d9e74532715574498
parent3e6de26e7a6a0b399f06ab40f038f29f89552e5d (diff)
IWYU
Trying to land https://skia-review.googlesource.com/c/skia/+/185460 Test: make Change-Id: Ia1dd2fb6911d3e562e9c68e8ad03136f96b2d7c0
-rw-r--r--core/jni/android/graphics/Paint.cpp1
-rw-r--r--libs/hwui/hwui/PaintImpl.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index dd7633ac6269..acb34ba3dfec 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -29,6 +29,7 @@
#include "SkBlurDrawLooper.h"
#include "SkColorFilter.h"
#include "SkFont.h"
+#include "SkFontMetrics.h"
#include "SkFontTypes.h"
#include "SkMaskFilter.h"
#include "SkPath.h"
diff --git a/libs/hwui/hwui/PaintImpl.cpp b/libs/hwui/hwui/PaintImpl.cpp
index d2903f08af15..2f2d575bca29 100644
--- a/libs/hwui/hwui/PaintImpl.cpp
+++ b/libs/hwui/hwui/PaintImpl.cpp
@@ -99,7 +99,7 @@ void Paint::setAntiAlias(bool aa) {
////////////////// Java flags compatibility //////////////////
-/* Flags are tricky. Java has its own idea of the "paint" flags, but they don't really
+/* Flags are tricky. Java has its own idea of the "paint" flags, but they don't really
match up with skia anymore, so we have to do some shuffling in get/set flags()
3 flags apply to SkPaint (antialias, dither, filter -> enum)