Commit5be21e2

authored

[Impeller] Fix AtlasContents crash (#40637)

1 parent61b92a7 commit5be21e2Copy full SHA for 5be21e2

File tree

+12

-9

lines changed

+12

-9

lines changed

Lines changed: 10 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -304,15 +304,18 @@ bool AtlasTextureContents::Render(const ContentContext& renderer,`
`304`	`304`	`using VS = TextureFillVertexShader;`
`305`	`305`	`using FS = TextureFillFragmentShader;`
`306`	`306`
`307`		`-auto texture = texture_.value_or(parent_.GetTexture());`
	`307`	`+auto texture = texture_ ? texture_ : parent_.GetTexture();`
	`308`	`+if (texture ==nullptr) {`
	`309`	`+returntrue;`
	`310`	`+ }`
	`311`	`+`
`308`	`312`	`std::vector<Rect> texture_coords;`
`309`	`313`	`std::vector<Matrix> transforms;`
`310`		`-if (subatlas_.has_value()) {`
`311`		`-auto subatlas = subatlas_.value();`
`312`		`- texture_coords = use_destination_ ? subatlas->result_texture_coords`
`313`		`- : subatlas->sub_texture_coords;`
`314`		`- transforms = use_destination_ ? subatlas->result_transforms`
`315`		`- : subatlas->sub_transforms;`
	`314`	`+if (subatlas_) {`
	`315`	`+ texture_coords = use_destination_ ? subatlas_->result_texture_coords`
	`316`	`+ : subatlas_->sub_texture_coords;`
	`317`	`+ transforms = use_destination_ ? subatlas_->result_transforms`
	`318`	`+ : subatlas_->sub_transforms;`
`316`	`319`	`}else {`
`317`	`320`	`texture_coords = parent_.GetTextureCoordinates();`
`318`	`321`	`transforms = parent_.GetTransforms();`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,9 @@ class AtlasTextureContents final : public Contents {`
`118`	`118`	`const AtlasContents& parent_;`
`119`	`119`	`Scalar alpha_ =1.0;`
`120`	`120`	`Rect coverage_;`
`121`		`- std::optional<std::shared_ptr<Texture>> texture_;`
	`121`	`+ std::shared_ptr<Texture> texture_;`
`122`	`122`	`bool use_destination_ =false;`
`123`		`- std::optional<std::shared_ptr<SubAtlasResult>> subatlas_ = std::nullopt;`
	`123`	`+ std::shared_ptr<SubAtlasResult> subatlas_;`
`124`	`124`
`125`	`125`	`FML_DISALLOW_COPY_AND_ASSIGN(AtlasTextureContents);`
`126`	`126`	`};`

Comments

(0)