[fuchsia] Cherry-pick: Restructure Flatland vsync loop

.pylintrc

@@ -158,10 +158,10 @@ const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
 class-rgx=[A-Z_][a-zA-Z0-9]+$
 
 # Regular expression which should only match correct function names
-function-rgx=[a-z_][a-z0-9_]{2,30}$
+function-rgx=[a-z_][a-z0-9_]{2,60}$
 
 # Regular expression which should only match correct method names
-method-rgx=[a-z_][a-z0-9_]{2,30}$
+method-rgx=[a-z_][a-z0-9_]{2,60}$
 
 # Regular expression which should only match correct instance attribute names
 attr-rgx=[a-z_][a-z0-9_]{2,30}$

DEPS

@@ -18,7 +18,7 @@ vars = {
   'llvm_git': 'https://llvm.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': 'e6eb56d9b074100e9e5e660bdb85f51c0a4156ba',
+  'skia_revision': '185fbe1a264de4a02296e2de87b6d62faf2942a0',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -886,7 +886,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'QKekosWnIY_ObKstnfItjOWSgi14RL_O43p2q4KSarUC'
+        'version': 'gWpPuUyuR_hmz9XmgcrDgQq664PRigdV2BgG77idOv4C'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -924,7 +924,7 @@ deps = {
       'packages': [
         {
           'package': 'flutter/flutter_font_fallbacks',
-          'version': 'fb4add6305d783cdb1e722dbb24b135d13faced57905fb814d7964113be2f84a'
+          'version': 'ba9a3d16939f9576afa67273198d779270cd768ae2867209ff3d72bab9acd3f6'
         }
       ],
       'dep_type': 'cipd',

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: 7ffdb065da3dfdf19d012821904be7f4
+Signature: a482454a8599b3c244185a234bf6442c
 
 ====================================================================================================
 LIBRARY: etc1
@@ -388,6 +388,7 @@ FILE: ../../../third_party/skia/package-lock.json
 FILE: ../../../third_party/skia/relnotes/sksl_always_on.md
 FILE: ../../../third_party/skia/relnotes/sksl_comma_array.md
 FILE: ../../../third_party/skia/relnotes/sksl_ganesh_dawn_removed.md
+FILE: ../../../third_party/skia/relnotes/sktime.md
 FILE: ../../../third_party/skia/relnotes/vk_backend_surface.md
 FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h
 FILE: ../../../third_party/skia/src/gpu/gpu_workaround_list.txt
@@ -419,6 +420,7 @@ FILE: ../../../third_party/skia/src/sksl/sksl_public.sksl
 FILE: ../../../third_party/skia/src/sksl/sksl_rt_shader.sksl
 FILE: ../../../third_party/skia/src/sksl/sksl_shared.sksl
 FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl
+FILE: ../../../third_party/skia/third_party/go.mod
 FILE: ../../../third_party/skia/third_party/libmicrohttpd/MHD_config.h
 FILE: ../../../third_party/skia/toolchain/linux_trampolines/IWYU_mapping.imp
 FILE: ../../../third_party/skia/toolchain/ndk.BUILD
@@ -3868,7 +3870,6 @@ ORIGIN: ../../../third_party/skia/src/core/SkColorSpace.cpp + ../../../third_par
 ORIGIN: ../../../third_party/skia/src/core/SkColorSpacePriv.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/core/SkCpu.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/core/SkCpu.h + ../../../third_party/skia/LICENSE
-ORIGIN: ../../../third_party/skia/src/core/SkFuzzLogging.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/core/SkGlobalInitialization_core.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/core/SkImageFilterCache.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/core/SkImageFilterCache.h + ../../../third_party/skia/LICENSE
@@ -4176,7 +4177,6 @@ FILE: ../../../third_party/skia/src/core/SkColorSpace.cpp
 FILE: ../../../third_party/skia/src/core/SkColorSpacePriv.h
 FILE: ../../../third_party/skia/src/core/SkCpu.cpp
 FILE: ../../../third_party/skia/src/core/SkCpu.h
-FILE: ../../../third_party/skia/src/core/SkFuzzLogging.h
 FILE: ../../../third_party/skia/src/core/SkGlobalInitialization_core.cpp
 FILE: ../../../third_party/skia/src/core/SkImageFilterCache.cpp
 FILE: ../../../third_party/skia/src/core/SkImageFilterCache.h

impeller/display_list/dl_dispatcher.cc

@@ -1118,12 +1118,10 @@ void DlDispatcher::drawTextBlob(const sk_sp<SkTextBlob>& blob,
   const auto text_frame = maybe_text_frame.value();
   if (paint_.style == Paint::Style::kStroke ||
       paint_.color_source.GetType() != ColorSource::Type::kColor) {
-    auto path = skia_conversions::PathDataFromTextBlob(blob);
     auto bounds = blob->bounds();
-    canvas_.Save();
-    canvas_.Translate({x + bounds.left(), y + bounds.top(), 0.0});
+    auto path = skia_conversions::PathDataFromTextBlob(blob);
+    path.Shift(Point(x + bounds.left(), y + bounds.top()));
     canvas_.DrawPath(path, paint_);
-    canvas_.Restore();
     return;
   }
 

impeller/entity/contents/text_contents.cc

@@ -166,13 +166,17 @@ bool TextContents::Render(const ContentContext& renderer,
           const Font& font = run.GetFont();
           Scalar rounded_scale = TextFrame::RoundScaledFontSize(
               scale_, font.GetMetrics().point_size);
+          const FontGlyphAtlas* font_atlas =
+              atlas->GetFontGlyphAtlas(font, rounded_scale);
+          if (!font_atlas) {
+            VALIDATION_LOG << "Could not find font in the atlas.";
+            continue;
+          }
 
           for (const TextRun::GlyphPosition& glyph_position :
                run.GetGlyphPositions()) {
-            FontGlyphPair font_glyph_pair{font, glyph_position.glyph,
-                                          rounded_scale};
             std::optional<Rect> maybe_atlas_glyph_bounds =
-                atlas->FindFontGlyphBounds(font_glyph_pair);
+                font_atlas->FindGlyphBounds(glyph_position.glyph);
             if (!maybe_atlas_glyph_bounds.has_value()) {
               VALIDATION_LOG << "Could not find glyph position in the atlas.";
               continue;

impeller/geometry/geometry_unittests.cc

@@ -2373,6 +2373,42 @@ TEST(GeometryTest, HalfConversions) {
 #endif  // FML_OS_WIN
 }
 
+TEST(GeometryTest, PathShifting) {
+  PathBuilder builder{};
+  auto path =
+      builder.AddLine(Point(0, 0), Point(10, 10))
+          .AddQuadraticCurve(Point(10, 10), Point(15, 15), Point(20, 20))
+          .AddCubicCurve(Point(20, 20), Point(25, 25), Point(-5, -5),
+                         Point(30, 30))
+          .Close()
+          .TakePath();
+  path.Shift(Point(1, 1));
+
+  ContourComponent contour;
+  LinearPathComponent linear;
+  QuadraticPathComponent quad;
+  CubicPathComponent cubic;
+
+  ASSERT_TRUE(path.GetContourComponentAtIndex(0, contour));
+  ASSERT_TRUE(path.GetLinearComponentAtIndex(1, linear));
+  ASSERT_TRUE(path.GetQuadraticComponentAtIndex(3, quad));
+  ASSERT_TRUE(path.GetCubicComponentAtIndex(5, cubic));
+
+  ASSERT_EQ(contour.destination, Point(1, 1));
+
+  ASSERT_EQ(linear.p1, Point(1, 1));
+  ASSERT_EQ(linear.p2, Point(11, 11));
+
+  ASSERT_EQ(quad.cp, Point(16, 16));
+  ASSERT_EQ(quad.p1, Point(11, 11));
+  ASSERT_EQ(quad.p2, Point(21, 21));
+
+  ASSERT_EQ(cubic.cp1, Point(26, 26));
+  ASSERT_EQ(cubic.cp2, Point(-4, -4));
+  ASSERT_EQ(cubic.p1, Point(21, 21));
+  ASSERT_EQ(cubic.p2, Point(31, 31));
+}
+
 }  // namespace testing
 }  // namespace impeller
 

impeller/geometry/path.cc

@@ -61,6 +61,33 @@ void Path::SetConvexity(Convexity value) {
   convexity_ = value;
 }
 
+void Path::Shift(Point shift) {
+  size_t currentIndex = 0;
+  for (const auto& component : components_) {
+    switch (component.type) {
+      case ComponentType::kLinear:
+        linears_[component.index].p1 += shift;
+        linears_[component.index].p2 += shift;
+        break;
+      case ComponentType::kQuadratic:
+        quads_[component.index].cp += shift;
+        quads_[component.index].p1 += shift;
+        quads_[component.index].p2 += shift;
+        break;
+      case ComponentType::kCubic:
+        cubics_[component.index].cp1 += shift;
+        cubics_[component.index].cp2 += shift;
+        cubics_[component.index].p1 += shift;
+        cubics_[component.index].p2 += shift;
+        break;
+      case ComponentType::kContour:
+        contours_[component.index].destination += shift;
+        break;
+    }
+    currentIndex++;
+  }
+}
+
 Path& Path::AddLinearComponent(Point p1, Point p2) {
   linears_.emplace_back(p1, p2);
   components_.emplace_back(ComponentType::kLinear, linears_.size() - 1);

impeller/geometry/path.h

@@ -111,6 +111,9 @@ class Path {
 
   void SetContourClosed(bool is_closed);
 
+  /// @brief Transform the path by the given offset in-place.
+  void Shift(Point shift);
+
   template <class T>
   using Applier = std::function<void(size_t index, const T& component)>;
   void EnumerateComponents(