summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Derek Sollenberger <djsollen@google.com> 2021-02-02 15:15:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-02-02 15:15:09 +0000
commitd7816b614044ab0922ca4c008423a6091c05a51c (patch)
treed3840938a579bc95b8cd8073fae6a5cf656a87a6
parent7cf75f0b150f1a2b99a74671b578f2889a2e5e3b (diff)
parent27bf51dc50b36e3c8c6f73b205e21a2f65205273 (diff)
Merge "Pass sampling or nothing to surface.draw" into sc-dev
-rw-r--r--libs/hwui/RecordingCanvas.cpp2
-rw-r--r--libs/hwui/pipeline/skia/GLFunctorDrawable.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp
index 96118aaec29b..64b8b711f0a8 100644
--- a/libs/hwui/RecordingCanvas.cpp
+++ b/libs/hwui/RecordingCanvas.cpp
@@ -561,7 +561,7 @@ public:
return;
}
c->concat(invertedMatrix);
- mLayerSurface->draw(c, deviceBounds.fLeft, deviceBounds.fTop, nullptr);
+ mLayerSurface->draw(c, deviceBounds.fLeft, deviceBounds.fTop);
} else {
c->drawDrawable(drawable.get());
}
diff --git a/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp b/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp
index c6c9e9dc869a..71f533c3fc4f 100644
--- a/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp
+++ b/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp
@@ -194,7 +194,7 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) {
canvas->concat(invertedMatrix);
const SkIRect deviceBounds = canvas->getDeviceClipBounds();
- tmpSurface->draw(canvas, deviceBounds.fLeft, deviceBounds.fTop, nullptr);
+ tmpSurface->draw(canvas, deviceBounds.fLeft, deviceBounds.fTop);
}
}