Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix size calculation" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-15 21:37:59 +00:00
committed by Android (Google) Code Review
parent 92716ec4ed dc323f27ad
commit 123079969d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
View File

@@ -60,12 +60,11 @@ void SkiaRecordingCanvas::punchHole(const SkRRect& rect) {
// Add the marker annotation to allow HWUI to determine where the current // Add the marker annotation to allow HWUI to determine where the current
// clip/transformation should be applied // clip/transformation should be applied
SkVector vector = rect.getSimpleRadii(); SkVector vector = rect.getSimpleRadii();
const int dataSize = 2; float data[2];
float data[dataSize];
data[0] = vector.x(); data[0] = vector.x();
data[1] = vector.y(); data[1] = vector.y();
mRecorder.drawAnnotation(rect.rect(), HOLE_PUNCH_ANNOTATION.c_str(), mRecorder.drawAnnotation(rect.rect(), HOLE_PUNCH_ANNOTATION.c_str(),
SkData::MakeWithCopy(data, dataSize)); SkData::MakeWithCopy(data, 2 * sizeof(float)));
// Clear the current rect within the layer itself // Clear the current rect within the layer itself
SkPaint paint = SkPaint(); SkPaint paint = SkPaint();

2
libs/hwui/pipeline/skia/TransformCanvas.cpp
View File

@@ -22,7 +22,7 @@ using namespace android::uirenderer::skiapipeline;
void TransformCanvas::onDrawAnnotation(const SkRect& rect, const char* key, SkData* value) { void TransformCanvas::onDrawAnnotation(const SkRect& rect, const char* key, SkData* value) {
if (HOLE_PUNCH_ANNOTATION == key) { if (HOLE_PUNCH_ANNOTATION == key) {
auto* rectParams = static_cast<const float*>(value->data()); auto* rectParams = reinterpret_cast<const float*>(value->data());
float radiusX = rectParams[0]; float radiusX = rectParams[0];
float radiusY = rectParams[1]; float radiusY = rectParams[1];
SkRRect roundRect = SkRRect::MakeRectXY(rect, radiusX, radiusY); SkRRect roundRect = SkRRect::MakeRectXY(rect, radiusX, radiusY);