diff --git a/engine/src/flutter/impeller/core/formats.h b/engine/src/flutter/impeller/core/formats.h index 76afebefac..e74c88c2ec 100644 --- a/engine/src/flutter/impeller/core/formats.h +++ b/engine/src/flutter/impeller/core/formats.h @@ -352,13 +352,13 @@ enum class IndexType { enum class PrimitiveType : uint8_t { /// Draws a triangle for each separate set of three vertices. /// - /// Vertices [A, B, C, D, E, F] will produce triages + /// Vertices [A, B, C, D, E, F] will produce triangles /// [ABC, DEF]. kTriangle, /// Draws a triangle for every adjacent three vertices. /// - /// Vertices [A, B, C, D, E, F] will produce triages + /// Vertices [A, B, C, D, E, F] will produce triangles /// [ABC, BCD, CDE, DEF]. kTriangleStrip, diff --git a/engine/src/flutter/impeller/display_list/canvas.cc b/engine/src/flutter/impeller/display_list/canvas.cc index 026cf41044..ab50145a57 100644 --- a/engine/src/flutter/impeller/display_list/canvas.cc +++ b/engine/src/flutter/impeller/display_list/canvas.cc @@ -820,7 +820,7 @@ void Canvas::DrawVertices(const std::shared_ptr& vertices, src_coverage = // Covered by FML_CHECK. // NOLINTNEXTLINE(bugprone-unchecked-optional-access) - vertices->GetTextureCoordinateCoverge().value_or(cvg.value()); + vertices->GetTextureCoordinateCoverage().value_or(cvg.value()); } src_contents = src_paint.CreateContents(); diff --git a/engine/src/flutter/impeller/display_list/dl_vertices_geometry.cc b/engine/src/flutter/impeller/display_list/dl_vertices_geometry.cc index 0c2f742929..4fa86ac207 100644 --- a/engine/src/flutter/impeller/display_list/dl_vertices_geometry.cc +++ b/engine/src/flutter/impeller/display_list/dl_vertices_geometry.cc @@ -87,7 +87,7 @@ bool DlVerticesGeometry::HasTextureCoordinates() const { return vertices_->texture_coordinate_data() != nullptr; } -std::optional DlVerticesGeometry::GetTextureCoordinateCoverge() const { +std::optional DlVerticesGeometry::GetTextureCoordinateCoverage() const { if (!HasTextureCoordinates()) { return std::nullopt; } diff --git a/engine/src/flutter/impeller/display_list/dl_vertices_geometry.h b/engine/src/flutter/impeller/display_list/dl_vertices_geometry.h index c433d2fe55..093cb64ce1 100644 --- a/engine/src/flutter/impeller/display_list/dl_vertices_geometry.h +++ b/engine/src/flutter/impeller/display_list/dl_vertices_geometry.h @@ -37,7 +37,7 @@ class DlVerticesGeometry final : public VerticesGeometry { bool HasTextureCoordinates() const override; - std::optional GetTextureCoordinateCoverge() const override; + std::optional GetTextureCoordinateCoverage() const override; private: PrimitiveType GetPrimitiveType() const; diff --git a/engine/src/flutter/impeller/entity/geometry/vertices_geometry.h b/engine/src/flutter/impeller/entity/geometry/vertices_geometry.h index d32bb6c1d1..47d2e78613 100644 --- a/engine/src/flutter/impeller/entity/geometry/vertices_geometry.h +++ b/engine/src/flutter/impeller/entity/geometry/vertices_geometry.h @@ -23,7 +23,7 @@ class VerticesGeometry : public Geometry { virtual bool HasTextureCoordinates() const = 0; - virtual std::optional GetTextureCoordinateCoverge() const = 0; + virtual std::optional GetTextureCoordinateCoverage() const = 0; }; } // namespace impeller diff --git a/engine/src/flutter/impeller/entity/save_layer_utils_unittests.cc b/engine/src/flutter/impeller/entity/save_layer_utils_unittests.cc index 5139204d7c..4b79ada40d 100644 --- a/engine/src/flutter/impeller/entity/save_layer_utils_unittests.cc +++ b/engine/src/flutter/impeller/entity/save_layer_utils_unittests.cc @@ -265,7 +265,7 @@ TEST( } TEST(SaveLayerUtilsTest, - CoverageLimitRespectedIfSubstantiallyDifferentFromContentCoverge) { + CoverageLimitRespectedIfSubstantiallyDifferentFromContentCoverage) { auto image_filter = FilterContents::MakeMatrixFilter( FilterInput::Make(Rect()), Matrix::MakeScale({2, 2, 1}), {}); diff --git a/engine/src/flutter/impeller/geometry/path.cc b/engine/src/flutter/impeller/geometry/path.cc index 99e0923ddc..9920f12a8f 100644 --- a/engine/src/flutter/impeller/geometry/path.cc +++ b/engine/src/flutter/impeller/geometry/path.cc @@ -60,7 +60,7 @@ bool Path::IsEmpty() const { } bool Path::IsSingleContour() const { - return data_->single_countour; + return data_->single_contour; } /// Determine required storage for points and indices. diff --git a/engine/src/flutter/impeller/geometry/path.h b/engine/src/flutter/impeller/geometry/path.h index af01441683..93c46f7367 100644 --- a/engine/src/flutter/impeller/geometry/path.h +++ b/engine/src/flutter/impeller/geometry/path.h @@ -225,7 +225,7 @@ class Path { FillType fill = FillType::kNonZero; Convexity convexity = Convexity::kUnknown; - bool single_countour = true; + bool single_contour = true; std::optional bounds; std::vector points; std::vector components; diff --git a/engine/src/flutter/impeller/geometry/path_builder.cc b/engine/src/flutter/impeller/geometry/path_builder.cc index 0cf2063917..a42a3adfd0 100644 --- a/engine/src/flutter/impeller/geometry/path_builder.cc +++ b/engine/src/flutter/impeller/geometry/path_builder.cc @@ -18,7 +18,7 @@ PathBuilder::~PathBuilder() = default; Path PathBuilder::CopyPath(FillType fill) { prototype_.fill = fill; - prototype_.single_countour = + prototype_.single_contour = current_contour_location_ == 0u || (contour_count_ == 2 && prototype_.components.back() == Path::ComponentType::kContour); @@ -28,7 +28,7 @@ Path PathBuilder::CopyPath(FillType fill) { Path PathBuilder::TakePath(FillType fill) { prototype_.fill = fill; UpdateBounds(); - prototype_.single_countour = + prototype_.single_contour = current_contour_location_ == 0u || (contour_count_ == 2 && prototype_.components.back() == Path::ComponentType::kContour); diff --git a/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc index c8900d6e0c..cbfd26f503 100644 --- a/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc +++ b/engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc @@ -252,7 +252,7 @@ void RenderPassGLES::ResetGLState(const ProcTableGLES& gl) { auto status = gl.CheckFramebufferStatus(GL_FRAMEBUFFER); if (status != GL_FRAMEBUFFER_COMPLETE) { - VALIDATION_LOG << "Could not create a complete frambuffer: " + VALIDATION_LOG << "Could not create a complete framebuffer: " << DebugToFramebufferError(status); return false; }