diff options
| author | 2024-02-20 23:25:43 +0000 | |
|---|---|---|
| committer | 2024-02-20 23:25:43 +0000 | |
| commit | 2521e6dfc73e371f202eace44c6ce8483daef304 (patch) | |
| tree | 9a3dd54364413fd0f6d1ae84018727e038d85681 | |
| parent | 69a65985cb6c2f5515415f494182076ae1887a60 (diff) | |
| parent | 2458071b3115c4b244c50b1bfb1e76cf8cd5b41a (diff) | |
Merge "Reduce some redundant steps" into main am: 2458071b31
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2950305
Change-Id: I7e06b809ba2fd950506d87437f52a3788a9ea84d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/hwui/DamageAccumulator.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/DamageAccumulator.cpp b/libs/hwui/DamageAccumulator.cpp index fd276419f5e5..28d85bd860df 100644 --- a/libs/hwui/DamageAccumulator.cpp +++ b/libs/hwui/DamageAccumulator.cpp @@ -218,7 +218,7 @@ void DamageAccumulator::applyRenderNodeTransform(DirtyStack* frame) { } // Perform clipping - if (props.getClipDamageToBounds() && !frame->pendingDirty.isEmpty()) { + if (props.getClipDamageToBounds()) { if (!frame->pendingDirty.intersect(SkRect::MakeIWH(props.getWidth(), props.getHeight()))) { frame->pendingDirty.setEmpty(); } diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 9c7f7cc24266..1d0330185b1c 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -1067,6 +1067,7 @@ SkRect CanvasContext::computeDirtyRect(const Frame& frame, SkRect* dirty) { if (dirty->isEmpty()) { dirty->setIWH(frame.width(), frame.height()); + return *dirty; } // At this point dirty is the area of the window to update. However, |