firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace skstd::optional with std::optional. (flutter/engine#31193)

Browse Source
This commit is contained in:
John Stiles
2022-02-01 17:40:02 -05:00
committed by GitHub
parent 46d8b2e23c
commit d1e6245833
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/display_list/display_list_builder.cc
View File

@@ -187,7 +187,7 @@ void DisplayListBuilder::setAttributesFromPaint(
setColor(paint.getColor());
}
if (flags.applies_blend()) {
skstd::optional<SkBlendMode> mode_optional = paint.asBlendMode();
std::optional<SkBlendMode> mode_optional = paint.asBlendMode();
if (mode_optional) {
setBlendMode(mode_optional.value());
} else {

2
engine/src/flutter/display_list/display_list_utils.h
View File

@@ -564,7 +564,7 @@ class DisplayListBoundsCalculator final
static constexpr SkScalar kMinStrokeWidth = 0.01;
skstd::optional<SkBlendMode> blend_mode_ = SkBlendMode::kSrcOver;
std::optional<SkBlendMode> blend_mode_ = SkBlendMode::kSrcOver;
sk_sp<SkColorFilter> color_filter_;
SkScalar half_stroke_width_ = kMinStrokeWidth;