Remove Libtxt and Minikin

Author: jason-simmons

ci/licenses_golden/excluded_files

@@ -398,7 +398,6 @@
 ../../../flutter/third_party/txt/.clang-format
 ../../../flutter/third_party/txt/.gitattributes
 ../../../flutter/third_party/txt/.gitignore
-../../../flutter/third_party/txt/PATENTS
 ../../../flutter/third_party/txt/tests
 ../../../flutter/third_party/txt/third_party/fonts
 ../../../flutter/third_party/web_locale_keymap/CHANGELOG.md

ci/licenses_golden/licenses_flutter

@@ -14,12 +14,6 @@ declare_args() {
   # The runtime mode ("debug", "profile", "release", or "jit_release")
   flutter_runtime_mode = "debug"
 
-  # Whether to link the Skia text shaper module into the engine
-  flutter_enable_skshaper = false
-
-  # Whether to use the Skia text shaper module for all text rendering
-  flutter_always_use_skshaper = false
-
   # Whether to use a prebuilt Dart SDK instead of building one.
   flutter_prebuilt_dart_sdk = false
 

common/config.gni

@@ -205,9 +205,6 @@ struct Settings {
   // manager before creating the engine.
   bool prefetched_default_font_manager = false;
 
-  // Selects the SkParagraph implementation of the text layout engine.
-  bool enable_skparagraph = false;
-
   // Enable the rendering of colors outside of the sRGB gamut.
   bool enable_wide_gamut = false;
 

common/settings.h

@@ -182,12 +182,6 @@ source_set("ui") {
   if (!defined(defines)) {
     defines = []
   }
-  if (flutter_enable_skshaper) {
-    defines += [ "FLUTTER_ENABLE_SKSHAPER" ]
-  }
-  if (flutter_always_use_skshaper) {
-    defines += [ "FLUTTER_ALWAYS_USE_SKSHAPER" ]
-  }
   if (is_win) {
     # Required for M_PI and others.
     defines += [ "_USE_MATH_DEFINES" ]

lib/ui/BUILD.gn

@@ -65,13 +65,8 @@ void Paragraph::paint(Canvas* canvas, double x, double y) {
   }
 
   DisplayListBuilder* builder = canvas->builder();
-  if (builder && m_paragraph->Paint(builder, x, y)) {
-    return;
-  }
-  // Fall back to SkCanvas if painting to DisplayListBuilder is not supported.
-  SkCanvas* sk_canvas = canvas->canvas();
-  if (sk_canvas) {
-    m_paragraph->Paint(sk_canvas, x, y);
+  if (builder) {
+    m_paragraph->Paint(builder, x, y);
   }
 }
 

lib/ui/text/paragraph.cc

@@ -297,23 +297,8 @@ ParagraphBuilder::ParagraphBuilder(
                                         ->client()
                                         ->GetFontCollection();
 
-  typedef std::unique_ptr<txt::ParagraphBuilder> (*ParagraphBuilderFactory)(
-      const txt::ParagraphStyle& style,
-      std::shared_ptr<txt::FontCollection> font_collection);
-  ParagraphBuilderFactory factory = txt::ParagraphBuilder::CreateTxtBuilder;
-
-#if FLUTTER_ENABLE_SKSHAPER
-#if FLUTTER_ALWAYS_USE_SKSHAPER
-  bool enable_skparagraph = true;
-#else
-  bool enable_skparagraph = UIDartState::Current()->enable_skparagraph();
-#endif
-  if (enable_skparagraph) {
-    factory = txt::ParagraphBuilder::CreateSkiaBuilder;
-  }
-#endif  // FLUTTER_ENABLE_SKSHAPER
-
-  m_paragraphBuilder = factory(style, font_collection.GetFontCollection());
+  m_paragraphBuilder = txt::ParagraphBuilder::CreateSkiaBuilder(
+      style, font_collection.GetFontCollection());
 }
 
 ParagraphBuilder::~ParagraphBuilder() = default;

lib/ui/text/paragraph_builder.cc

@@ -60,7 +60,6 @@ UIDartState::UIDartState(
     LogMessageCallback log_message_callback,
     std::shared_ptr<IsolateNameServer> isolate_name_server,
     bool is_root_isolate,
-    bool enable_skparagraph,
     const UIDartState::Context& context)
     : add_callback_(std::move(add_callback)),
       remove_callback_(std::move(remove_callback)),
@@ -69,7 +68,6 @@ UIDartState::UIDartState(
       unhandled_exception_callback_(std::move(unhandled_exception_callback)),
       log_message_callback_(std::move(log_message_callback)),
       isolate_name_server_(std::move(isolate_name_server)),
-      enable_skparagraph_(enable_skparagraph),
       context_(context) {
   AddOrRemoveTaskObserver(true /* add */);
 }
@@ -234,10 +232,6 @@ void UIDartState::LogMessage(const std::string& tag,
   }
 }
 
-bool UIDartState::enable_skparagraph() const {
-  return enable_skparagraph_;
-}
-
 Dart_Handle UIDartState::HandlePlatformMessage(
     std::unique_ptr<PlatformMessage> message) {
   if (platform_configuration_) {

lib/ui/ui_dart_state.cc

@@ -153,8 +153,6 @@ class UIDartState : public tonic::DartState {
   // @param[in]  message  The message to be logged.
   void LogMessage(const std::string& tag, const std::string& message) const;
 
-  bool enable_skparagraph() const;
-
   template <class T>
   static flutter::SkiaGPUObject<T> CreateGPUObject(sk_sp<T> object) {
     if (!object) {
@@ -185,7 +183,6 @@ class UIDartState : public tonic::DartState {
               LogMessageCallback log_message_callback,
               std::shared_ptr<IsolateNameServer> isolate_name_server,
               bool is_root_isolate_,
-              bool enable_skparagraph,
               const UIDartState::Context& context);
 
   ~UIDartState() override;
@@ -210,7 +207,6 @@ class UIDartState : public tonic::DartState {
   UnhandledExceptionCallback unhandled_exception_callback_;
   LogMessageCallback log_message_callback_;
   const std::shared_ptr<IsolateNameServer> isolate_name_server_;
-  const bool enable_skparagraph_;
   UIDartState::Context context_;
 
   void AddOrRemoveTaskObserver(bool add);

lib/ui/ui_dart_state.h

@@ -284,7 +284,6 @@ DartIsolate::DartIsolate(const Settings& settings,
                   settings.log_message_callback,
                   DartVMRef::GetIsolateNameServer(),
                   is_root_isolate,
-                  settings.enable_skparagraph,
                   context),
       may_insecurely_connect_to_all_domains_(
           settings.may_insecurely_connect_to_all_domains),