summaryrefslogtreecommitdiff
path: root/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp
diff options
context:
space:
mode:
authorBen Wagner <bungeman@google.com>2018-08-20 18:36:05 -0400
committerBen Wagner <bungeman@google.com>2018-08-21 11:11:37 -0400
commit1d155336a89abb51f9f86f735750eac4c13ac081 (patch)
tree0ad31582109b8aadc3700ef0c844a7c896e2710e /libs/hwui/pipeline/skia/RenderNodeDrawable.cpp
parent7fd08795de83dd461f68791c77c9d2d82573e489 (diff)
Remove use of SkTLazy.
Skia is planning to make SkTLazy private to Skia. This changes uses of SkTLazy to std::optional. Test: refactoring CL. Existing unit tests still pass. Change-Id: Id92c27cb8b3b41eb2e531b1a930511064a47a6f7
Diffstat (limited to 'libs/hwui/pipeline/skia/RenderNodeDrawable.cpp')
-rw-r--r--libs/hwui/pipeline/skia/RenderNodeDrawable.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp
index 85fdc103b1e3..ea14d11b7b3e 100644
--- a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp
+++ b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp
@@ -21,6 +21,8 @@
#include "SkiaPipeline.h"
#include "utils/TraceUtils.h"
+#include <optional>
+
namespace android {
namespace uirenderer {
namespace skiapipeline {
@@ -171,9 +173,9 @@ public:
protected:
bool onFilter(SkTCopyOnFirstWrite<SkPaint>* paint, Type t) const override {
- SkTLazy<SkPaint> defaultPaint;
+ std::optional<SkPaint> defaultPaint;
if (!*paint) {
- paint->init(*defaultPaint.init());
+ paint->init(defaultPaint.emplace());
}
paint->writable()->setAlpha((uint8_t)(*paint)->getAlpha() * mAlpha);
return true;