diff options
| author | Brian Orr <brianorr@google.com> | 2021-06-15 12:47:53 -0700 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-06-17 13:37:54 -0700 |
| commit | 71c831703ae59baf47e0afe611fecd714c481cdf (patch) | |
| tree | 06731a987032723085b9e1a65951cf96abbc19cf /libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | |
| parent | 065c9e9a6e9d61d4383a91721eb56a3de253bdbe (diff) | |
| parent | 81833820d54b9a6b27894f9f8dfd72222d416992 (diff) | |
Merge SP1A.210604.001
Change-Id: I5200ee05285ae422d5e9c1c00f45709a5d6188be
Diffstat (limited to 'libs/hwui/pipeline/skia/RenderNodeDrawable.cpp')
| -rw-r--r-- | libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp index 1c5515c7deee..d7546d86e4f4 100644 --- a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp +++ b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp @@ -16,11 +16,11 @@ #include "RenderNodeDrawable.h" #include <SkPaintFilterCanvas.h> -#include "StretchMask.h" +#include <gui/TraceUtils.h> #include "RenderNode.h" #include "SkiaDisplayList.h" +#include "StretchMask.h" #include "TransformCanvas.h" -#include "utils/TraceUtils.h" #include <include/effects/SkImageFilters.h> @@ -248,7 +248,7 @@ void RenderNodeDrawable::drawContent(SkCanvas* canvas) const { const StretchEffect& stretch = properties.layerProperties().getStretchEffect(); if (stretch.isEmpty() || - Properties::stretchEffectBehavior == StretchEffectBehavior::UniformScale) { + Properties::getStretchEffectBehavior() == StretchEffectBehavior::UniformScale) { // If we don't have any stretch effects, issue the filtered // canvas draw calls to make sure we still punch a hole // with the same canvas transformation + clip into the target @@ -327,7 +327,7 @@ void RenderNodeDrawable::setViewProperties(const RenderProperties& properties, S canvas->concat(*properties.getTransformMatrix()); } } - if (Properties::stretchEffectBehavior == StretchEffectBehavior::UniformScale) { + if (Properties::getStretchEffectBehavior() == StretchEffectBehavior::UniformScale) { const StretchEffect& stretch = properties.layerProperties().getStretchEffect(); if (!stretch.isEmpty()) { canvas->concat( |