commit d94c28e10e924c773f1bf6faaa0dd8ecb20fcaaa
author Kevin Lubick <kjlubick@google.com> Wed Jan 18 13:04:34 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 18 13:04:34 2023 +0000
tree b1d954060e826f86b1e7a2b5a77c05c34b570933
parent c13ea3a39fd82b67649912aaef794dc990ba2f54
parent daeb4c656139f6c6f415452dc55efd3e7565a34e

Merge "Remove direct includes of SkMath.h"

libs/hwui/RecordingCanvas.cpp

diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp
index e1030b0..cb385d4 100644
--- a/libs/hwui/RecordingCanvas.cpp
+++ b/libs/hwui/RecordingCanvas.cpp
@@ -34,7 +34,6 @@
 #include "SkImageFilter.h"
 #include "SkImageInfo.h"
 #include "SkLatticeIter.h"
-#include "SkMath.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkRRect.h"

libs/hwui/SkiaInterpolator.cpp

diff --git a/libs/hwui/SkiaInterpolator.cpp b/libs/hwui/SkiaInterpolator.cpp
index 47bd0b9..b58f517 100644
--- a/libs/hwui/SkiaInterpolator.cpp
+++ b/libs/hwui/SkiaInterpolator.cpp
@@ -16,7 +16,6 @@
 
 #include "SkiaInterpolator.h"
 
-#include "include/core/SkMath.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkFixed.h"

libs/hwui/jni/BitmapFactory.cpp

diff --git a/libs/hwui/jni/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp
index c98b87a..2f3e9bf 100644
--- a/libs/hwui/jni/BitmapFactory.cpp
+++ b/libs/hwui/jni/BitmapFactory.cpp
@@ -14,7 +14,6 @@
 #include "SkColorSpace.h"
 #include "SkEncodedImageFormat.h"
 #include "SkImageInfo.h"
-#include "SkMath.h"
 #include "SkPaint.h"
 #include "SkPixelRef.h"
 #include "SkRect.h"

libs/hwui/jni/Graphics.cpp

diff --git a/libs/hwui/jni/Graphics.cpp b/libs/hwui/jni/Graphics.cpp
index c835849..ae2e974 100644
--- a/libs/hwui/jni/Graphics.cpp
+++ b/libs/hwui/jni/Graphics.cpp
@@ -14,7 +14,6 @@
 #include "SkColorSpace.h"
 #include "SkFontMetrics.h"
 #include "SkImageInfo.h"
-#include "SkMath.h"
 #include "SkPixelRef.h"
 #include "SkPoint.h"
 #include "SkRect.h"