diff options
| author | Stan Iliev <stani@google.com> | 2016-12-01 12:25:07 -0500 |
|---|---|---|
| committer | Stan Iliev <stani@google.com> | 2016-12-01 12:25:07 -0500 |
| commit | 347691f8d87157be0eaeca26f4003d8a06a275e3 (patch) | |
| tree | c4016adc24b4cdba0777a8cd921377c772f590ea /libs/hwui/pipeline/skia/ReorderBarrierDrawables.h | |
| parent | 4f8a7a5582f62c600e6840504d09d5f519bd6376 (diff) | |
Fix a crash in skia pipeline, when empty reorder block is first
Fix a crash in skia pipeline, which happens if an empty reorder
barrier is inserted at index 0 in a SkiaDisplayList.
Add a unit test that repro the bug (unit test is crashing wihtout
the fix and passing with the fix).
Test: built and ran skia pipeline with angler-eng and run HWUI unit
tests.
Change-Id: I4aded15021c70cc0ae8daa83bbe8ed0e10a41eef
Diffstat (limited to 'libs/hwui/pipeline/skia/ReorderBarrierDrawables.h')
| -rw-r--r-- | libs/hwui/pipeline/skia/ReorderBarrierDrawables.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/pipeline/skia/ReorderBarrierDrawables.h b/libs/hwui/pipeline/skia/ReorderBarrierDrawables.h index 298a7320df64..9f00d23ae985 100644 --- a/libs/hwui/pipeline/skia/ReorderBarrierDrawables.h +++ b/libs/hwui/pipeline/skia/ReorderBarrierDrawables.h @@ -47,8 +47,8 @@ protected: virtual void onDraw(SkCanvas* canvas) override; private: - size_t mEndChildIndex; - size_t mBeginChildIndex; + int mEndChildIndex; + int mBeginChildIndex; FatVector<RenderNodeDrawable*, 16> mChildren; SkiaDisplayList* mDisplayList; |