Th24 RC 3

2025-01-09 11:27:32 -03:00 · 2024-08-28 23:18:42 -05:00 · 2024-08-28 23:18:42 -05:00 · fccb8c1621
commit fccb8c1621
parent 99b530e3a8
13 changed files with 330 additions and 10 deletions
--- a/TODO.md
+++ b/TODO.md
@ -39,8 +39,6 @@ Dino strings in components/error_page_strings.grdp

 - Add GPC patch

- - Re-add FILL_RULE_NONZERO, to bookmark_chrome_refresh.icon back_arrow_chrome_refresh.icon forward_arrow_chrome_refresh.icon
-
 Remove media/filters/win/media_foundation_audio_decoder.cc in M127

 Make hover over link always show full url without delay
--- a/infra/DEBUG/Thorium_Debug_Shell.sh
+++ b/infra/DEBUG/Thorium_Debug_Shell.sh
@ -6,4 +6,4 @@
 LD_LIBRARY_PATH="$(pwd)/lib"
 export LD_LIBRARY_PATH

-./thorium_ui_debug_shell --debug
+./thorium_ui_debug_shell --debug $@
--- a/infra/DEBUG/build_debug_linux.sh
+++ b/infra/DEBUG/build_debug_linux.sh
@ -65,7 +65,7 @@ cp -r -f -v ~/chromium/src/out/thorium/locales ~/chromium/src/out/thorium/Thoriu
 cp -r -f -v ~/chromium/src/out/thorium/test_fonts ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
 cp -r -f -v ~/chromium/src/out/thorium/resources ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
 cp -r -f -v ~/chromium/src/out/thorium/ui ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
-cp -r -f -v ~/chromium/src/out/thorium/libffmpeg.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
+# cp -r -f -v ~/chromium/src/out/thorium/libffmpeg.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
 cp -r -f -v ~/chromium/src/out/thorium/libffmpeg.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/lib &&
 # cp -r -f -v ~/chromium/src/out/thorium/libblink_test_plugin.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
 cp -r -f -v ~/chromium/src/out/thorium/icudtl.dat ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
--- a/infra/DEBUG/build_debug_shell_linux.sh
+++ b/infra/DEBUG/build_debug_shell_linux.sh
@ -65,7 +65,7 @@ cp -r -f -v ${CR_SRC_DIR}/out/thorium/locales ${CR_SRC_DIR}/out/thorium/Thorium_
 cp -r -f -v ${CR_SRC_DIR}/out/thorium/test_fonts ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell/ &&
 cp -r -f -v ${CR_SRC_DIR}/out/thorium/resources ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell/ &&
 cp -r -f -v ${CR_SRC_DIR}/out/thorium/ui ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell/ &&
-cp -r -f -v ${CR_SRC_DIR}/out/thorium/libffmpeg.so ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell/ &&
+# cp -r -f -v ${CR_SRC_DIR}/out/thorium/libffmpeg.so ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell/ &&
 cp -r -f -v ${CR_SRC_DIR}/out/thorium/libffmpeg.so ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell/lib &&
 # cp -r -f -v ${CR_SRC_DIR}/out/thorium/libblink_test_plugin.so ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell/ &&
 # cp -r -f -v ${CR_SRC_DIR}/out/thorium/libmojo_core.so ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell/ &&
--- a/other/thorium-2024-ui.patch
+++ b/other/thorium-2024-ui.patch
@ -1,5 +1,31 @@
+diff --git a/chrome/browser/resources/downloads/item.html b/chrome/browser/resources/downloads/item.html
+index 0197942167f44..9535c3a076409 100644
+--- a/chrome/browser/resources/downloads/item.html
+++ b/chrome/browser/resources/downloads/item.html
+@@ -523,7 +523,7 @@
+     </div>
+     <div class="more-options">
+       <!-- Only show the "x" button in the old UX. -->
+-      <template is="dom-if" if="[[!improvedDownloadWarningsUx_]]">
+      <template is="dom-if" if="[[improvedDownloadWarningsUx_]]">
+         <div role="gridcell">
+           <cr-icon-button class="icon-clear"
+               style$="[[computeRemoveStyle_(isDangerous_, showCancel_)]]"
+diff --git a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
+index 64948595a4bc6..a568c893736ca 100644
+--- a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
+@@ -47,7 +47,7 @@ using bookmarks::BookmarkNode;
+ 
+ namespace chrome {
+ 
+-size_t kNumBookmarkUrlsBeforePrompting = 15;
+size_t kNumBookmarkUrlsBeforePrompting = 50;
+ 
+ static BookmarkNavigationWrapper* g_nav_wrapper_test_instance = nullptr;
+ 
 diff --git a/chrome/browser/ui/layout_constants.cc b/chrome/browser/ui/layout_constants.cc
-index bba403a7e5068..e14bb1d796a35 100644
+index bba403a7e5068..056b405e46ec6 100644
 --- a/chrome/browser/ui/layout_constants.cc
 +++ b/chrome/browser/ui/layout_constants.cc
@@ -1,12 +1,14 @@
@ -144,7 +170,7 @@ index bec499693cd91..404316da5bcd2 100644
     AddItem(
         TabStripModel::CommandAddToReadLater,
 diff --git a/chrome/browser/ui/tabs/tab_style.cc b/chrome/browser/ui/tabs/tab_style.cc
-index aa9cd30374311..5d5a40f92f922 100644
+index aa9cd30374311..c5d3cbd005dae 100644
 --- a/chrome/browser/ui/tabs/tab_style.cc
 +++ b/chrome/browser/ui/tabs/tab_style.cc
@@ -1,27 +1,32 @@
@ -356,8 +382,30 @@ index ae3b649cfcdc6..3bcf134a9b744 100644
   bool CanPaintThrobberToLayer() const override;
   bool HasVisibleBackgroundTabShapes() const override;
   SkColor GetTabSeparatorColor() const override;
+diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
+index 83defaaaad55d..3c36bede863ef 100644
+--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
+@@ -213,6 +213,7 @@
+ #include "ui/gl/gl_switches.h"
+ #include "url/gurl.h"
+ #include "url/origin.h"
+#include "url/url_constants.h"
+ 
+ #if BUILDFLAG(IS_ANDROID)
+ #include "base/android/child_process_binding_types.h"
+@@ -4412,6 +4413,9 @@ RenderProcessHost::FilterURLResult RenderProcessHostImpl::FilterURL(
+     *url = GURL(kBlockedURL);
+     return FilterURLResult::kBlocked;
+   }
+  if (url.SchemeIs(url::kFtpScheme)) {
+    return FilterURLResult::kAllowed;
+  }
+   return FilterURLResult::kAllowed;
+ }
+ 
 diff --git a/ui/views/controls/menu/menu_config.cc b/ui/views/controls/menu/menu_config.cc
-index 83c7f06f1b236..576150ff56af4 100644
+index 83c7f06f1b236..173b829890079 100644
 --- a/ui/views/controls/menu/menu_config.cc
 +++ b/ui/views/controls/menu/menu_config.cc
@@ -1,10 +1,11 @@
@ -391,7 +439,7 @@ index 83c7f06f1b236..576150ff56af4 100644
 
 // static
 diff --git a/ui/views/layout/layout_provider.cc b/ui/views/layout/layout_provider.cc
-index 3684e27766834..d62fe3f96ab62 100644
+index 3684e27766834..72f1751f64c46 100644
 --- a/ui/views/layout/layout_provider.cc
 +++ b/ui/views/layout/layout_provider.cc
@@ -1,4 +1,4 @@
--- a/src/chrome/browser/ash/settings/stats_reporting_controller.cc
+++ b/src/chrome/browser/ash/settings/stats_reporting_controller.cc
@ -6,7 +6,7 @@

 #include "base/functional/bind.h"
 #include "base/logging.h"
-#include "chrome/browser/ash/settings/cros_settings.h"
+#include "chromeos/ash/components/settings/cros_settings.h"
 #include "chromeos/ash/components/settings/cros_settings_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
--- a/src/components/omnibox/browser/vector_icons/bookmark_chrome_refresh.icon
+++ b/src/components/omnibox/browser/vector_icons/bookmark_chrome_refresh.icon
@ -4,6 +4,7 @@
 // You can obtain one at http://mozilla.org/MPL/2.0/.

 CANVAS_DIMENSIONS, 24,
+FILL_RULE_NONZERO,
 MOVE_TO, 20.46f, 20.46f,
 R_H_LINE_TO, -0.59f,
 R_ARC_TO, 7.61f, 7.61f, 0, 0, 1, 0, -3.08f,
--- a/src/components/vector_icons/back_arrow_chrome_refresh.icon
+++ b/src/components/vector_icons/back_arrow_chrome_refresh.icon
@ -4,6 +4,7 @@
 // You can obtain one at http://mozilla.org/MPL/2.0/.

 CANVAS_DIMENSIONS, 24,
+FILL_RULE_NONZERO,
 MOVE_TO, 15.12f, 3.17f,
 R_ARC_TO, 0.92f, 0.92f, 0, 1, 1, 1.3f, 1.3f,
 R_LINE_TO, -7.1f, 7.1f,
--- a/src/components/vector_icons/forward_arrow_chrome_refresh.icon
+++ b/src/components/vector_icons/forward_arrow_chrome_refresh.icon
@ -4,6 +4,7 @@
 // You can obtain one at http://mozilla.org/MPL/2.0/.

 CANVAS_DIMENSIONS, 24,
+FILL_RULE_NONZERO,
 MOVE_TO, 8.88f, 3.17f,
 R_ARC_TO, 0.92f, 0.92f, 0, 0, 0, -1.3f, 1.3f,
 R_LINE_TO, 7.1f, 7.1f,
--- a/src/components/vector_icons/volume_off.icon
+++ b/src/components/vector_icons/volume_off.icon
@ -0,0 +1,51 @@
+// Copyright 2024 The Chromium Authors and Alex313031
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 24,
+NEW_PATH,
+PATH_COLOR_ARGB, 0xFF, 0xAA, 0x00, 0xAA,
+NEW_PATH,
+PATH_COLOR_ARGB, 0xFF, 0xAA, 0x00, 0xAA,
+MOVE_TO, 2.81f, 2.81f,
+LINE_TO, 1.39f, 4.22f,
+LINE_TO, 6.17f, 9,
+H_LINE_TO, 3,
+R_V_LINE_TO, 6,
+R_H_LINE_TO, 4,
+R_LINE_TO, 5, 5,
+R_V_LINE_TO, -5.17f,
+R_LINE_TO, 3.32f, 3.32f,
+R_CUBIC_TO, -0.42f, 0.23f, -0.85f, 0.42f, -1.32f, 0.56f,
+R_V_LINE_TO, 2.06f,
+R_CUBIC_TO, 1, -0.23f, 1.93f, -0.64f, 2.77f, -1.17f,
+R_LINE_TO, 3.01f, 3.01f,
+R_LINE_TO, 1.41f, -1.41f,
+LINE_TO, 2.81f, 2.81f,
+CLOSE,
+MOVE_TO, 10, 15.17f,
+LINE_TO, 7.83f, 13,
+H_LINE_TO, 5,
+R_V_LINE_TO, -2,
+R_H_LINE_TO, 3.17f,
+LINE_TO, 10, 12.83f,
+R_V_LINE_TO, 2.34f,
+CLOSE,
+MOVE_TO, 12, 4,
+LINE_TO, 9.41f, 6.59f,
+LINE_TO, 12, 9.17f,
+CLOSE,
+R_MOVE_TO, 4.5f, 8,
+ARC_TO, 4.5f, 4.5f, 0, 0, 0, 14, 7.97f,
+R_V_LINE_TO, 3.2f,
+R_LINE_TO, 2.26f, 2.26f,
+R_CUBIC_TO, 0.15f, -0.45f, 0.24f, -0.93f, 0.24f, -1.43f,
+CLOSE,
+R_MOVE_TO, 2.5f, 0,
+R_CUBIC_TO, 0, 1.2f, -0.31f, 2.34f, -0.84f, 3.33f,
+R_LINE_TO, 1.46f, 1.46f,
+ARC_TO, 9, 9, 0, 0, 0, 21, 12,
+R_CUBIC_TO, 0, -4.28f, -2.99f, -7.86f, -7, -8.77f,
+R_V_LINE_TO, 2.06f,
+R_CUBIC_TO, 2.89f, 0.86f, 5, 3.54f, 5, 6.71f,
+CLOSE
--- a/src/components/vector_icons/volume_off_chrome_refresh.icon
+++ b/src/components/vector_icons/volume_off_chrome_refresh.icon
@ -0,0 +1,112 @@
+// Copyright 2024 The Chromium Authors and Alex313031
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+PATH_COLOR_ARGB, 0xFF, 0xAA, 0x00, 0xAA,
+FILL_RULE_NONZERO,
+R_MOVE_TO, 16, 18.13f,
+R_LINE_TO, -2.23f, -2.23f,
+R_ARC_TO, 6.93f, 6.93f, 0, 0, 1, -1.09f, 0.55f,
+R_CUBIC_TO, -0.42f, 0.17f, -0.82f, 0.3f, -1.18f, 0.38f,
+R_V_LINE_TO, -1.54f,
+R_CUBIC_TO, 0.17f, -0.07f, 0.36f, -0.15f, 0.59f, -0.24f,
+R_CUBIC_TO, 0.23f, -0.09f, 0.42f, -0.18f, 0.57f, -0.26f,
+LINE_TO, 10, 12.13f,
+R_V_LINE_TO, 3.9f,
+R_LINE_TO, -4, -4,
+H_LINE_TO, 3,
+R_V_LINE_TO, -4,
+R_H_LINE_TO, 2.88f,
+R_LINE_TO, -4, -4.02f,
+R_LINE_TO, 1.06f, -1.06f,
+R_LINE_TO, 14.12f, 14.13f,
+CLOSE,
+R_MOVE_TO, -0.12f, -4.36f,
+R_LINE_TO, -1.08f, -1.08f,
+R_CUBIC_TO, 0.22f, -0.4f, 0.4f, -0.83f, 0.52f, -1.28f,
+R_CUBIC_TO, 0.12f, -0.45f, 0.19f, -0.91f, 0.19f, -1.39f,
+R_ARC_TO, 5.27f, 5.27f, 0, 0, 0, -1.11f, -3.3f,
+ARC_TO, 5.64f, 5.64f, 0, 0, 0, 11.5f, 4.73f,
+V_LINE_TO, 3.19f,
+R_CUBIC_TO, 1.63f, 0.32f, 2.95f, 1.13f, 3.97f, 2.42f,
+CUBIC_TO, 16.49f, 6.9f, 17, 8.37f, 17, 10.02f,
+R_CUBIC_TO, 0, 0.67f, -0.1f, 1.32f, -0.29f, 1.95f,
+R_ARC_TO, 7.31f, 7.31f, 0, 0, 1, -0.83f, 1.8f,
+CLOSE,
+R_MOVE_TO, -2.58f, -2.58f,
+LINE_TO, 11.5f, 9.4f,
+R_V_LINE_TO, -2.54f,
+R_ARC_TO, 3.21f, 3.21f, 0, 0, 1, 1.47f, 1.28f,
+R_ARC_TO, 3.51f, 3.51f, 0, 0, 1, 0.53f, 1.88f,
+R_CUBIC_TO, 0, 0.2f, -0.02f, 0.39f, -0.04f, 0.59f,
+R_ARC_TO, 2.37f, 2.37f, 0, 0, 1, -0.16f, 0.58f,
+CLOSE,
+MOVE_TO, 10, 7.89f,
+LINE_TO, 8.06f, 5.96f,
+LINE_TO, 10, 4.02f,
+CLOSE,
+R_MOVE_TO, -1.5f, 4.5f,
+R_V_LINE_TO, -1.77f,
+LINE_TO, 7, 9.13f,
+R_LINE_TO, -0.37f, 0.4f,
+H_LINE_TO, 4.5f,
+R_V_LINE_TO, 1,
+R_H_LINE_TO, 2.13f,
+CLOSE,
+R_MOVE_TO, -0.75f, -2.52f,
+CLOSE
+
+CANVAS_DIMENSIONS, 16,
+PATH_COLOR_ARGB, 0xFF, 0xAA, 0x00, 0xAA,
+FILL_RULE_NONZERO,
+R_MOVE_TO, 12.84f, 14.63f,
+R_LINE_TO, -1.79f, -1.8f,
+R_ARC_TO, 5.1f, 5.1f, 0, 0, 1, -0.84f, 0.41f,
+R_CUBIC_TO, -0.33f, 0.13f, -0.63f, 0.23f, -0.91f, 0.29f,
+R_V_LINE_TO, -1.3f,
+R_CUBIC_TO, 0.11f, -0.05f, 0.25f, -0.11f, 0.41f, -0.17f,
+R_CUBIC_TO, 0.16f, -0.07f, 0.3f, -0.12f, 0.41f, -0.18f,
+LINE_TO, 8.1f, 9.86f,
+R_V_LINE_TO, 3.28f,
+LINE_TO, 4.71f, 9.75f,
+H_LINE_TO, 2.23f,
+V_LINE_TO, 6.28f,
+H_LINE_TO, 4.54f,
+LINE_TO, 1.36f, 3.07f,
+R_LINE_TO, 0.89f, -0.89f,
+R_LINE_TO, 11.48f, 11.56f,
+CLOSE,
+R_MOVE_TO, 0, -3.57f,
+R_LINE_TO, -0.91f, -0.92f,
+R_CUBIC_TO, 0.18f, -0.32f, 0.32f, -0.66f, 0.42f, -1.02f,
+R_CUBIC_TO, 0.1f, -0.36f, 0.15f, -0.73f, 0.15f, -1.1f,
+R_ARC_TO, 4.2f, 4.2f, 0, 0, 0, -0.89f, -2.63f,
+R_ARC_TO, 4.57f, 4.57f, 0, 0, 0, -2.3f, -1.6f,
+V_LINE_TO, 2.48f,
+R_ARC_TO, 5.31f, 5.31f, 0, 0, 1, 3.22f, 1.96f,
+R_ARC_TO, 5.6f, 5.6f, 0, 0, 1, 1.24f, 3.58f,
+R_CUBIC_TO, 0, 0.55f, -0.08f, 1.07f, -0.24f, 1.58f,
+R_CUBIC_TO, -0.16f, 0.51f, -0.39f, 1, -0.68f, 1.46f,
+CLOSE,
+MOVE_TO, 10.78f, 8.98f,
+R_LINE_TO, -1.48f, -1.49f,
+V_LINE_TO, 5.43f,
+R_ARC_TO, 2.82f, 2.82f, 0, 0, 1, 1.66f, 2.58f,
+R_CUBIC_TO, 0, 0.16f, -0.02f, 0.33f, -0.04f, 0.49f,
+R_ARC_TO, 1.79f, 1.79f, 0, 0, 1, -0.14f, 0.48f,
+CLOSE,
+R_MOVE_TO, -2.68f, -2.7f,
+LINE_TO, 6.42f, 4.58f,
+R_LINE_TO, 1.69f, -1.68f,
+CLOSE,
+MOVE_TO, 6.72f, 9.8f,
+V_LINE_TO, 8.46f,
+LINE_TO, 5.61f, 7.35f,
+R_LINE_TO, -0.3f, 0.32f,
+H_LINE_TO, 3.62f,
+R_V_LINE_TO, 0.7f,
+R_H_LINE_TO, 1.67f,
+CLOSE,
+R_MOVE_TO, -0.55f, -1.9f,
+CLOSE
--- a/src/components/vector_icons/volume_up.icon
+++ b/src/components/vector_icons/volume_up.icon
@ -0,0 +1,27 @@
+// Copyright 2024 The Chromium Authors and Alex313031
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 16,
+PATH_COLOR_ARGB, 0xFF, 0xAA, 0x00, 0xAA,
+MOVE_TO, 2, 5.95f,
+R_V_LINE_TO, 4.1f,
+R_H_LINE_TO, 2.67f,
+LINE_TO, 8, 13.47f,
+V_LINE_TO, 2.53f,
+R_LINE_TO, -3.33f, 3.42f,
+H_LINE_TO, 2,
+CLOSE,
+MOVE_TO, 11, 8,
+R_CUBIC_TO, 0, -1.21f, -0.68f, -2.25f, -1.67f, -2.76f,
+R_V_LINE_TO, 5.51f,
+CUBIC_TO, 10.32f, 10.25f, 11, 9.21f, 11, 8,
+CLOSE,
+MOVE_TO, 9.33f, 2,
+R_V_LINE_TO, 1.41f,
+R_CUBIC_TO, 1.93f, 0.59f, 3.33f, 2.42f, 3.33f, 4.59f,
+R_CUBIC_TO, 0, 2.17f, -1.41f, 4, -3.33f, 4.59f,
+V_LINE_TO, 14,
+CUBIC_TO, 12.01f, 13.38f, 14, 10.93f, 14, 8,
+R_CUBIC_TO, 0, -2.93f, -1.99f, -5.38f, -4.67f, -6,
+CLOSE
--- a/src/components/vector_icons/volume_up_chrome_refresh.icon
+++ b/src/components/vector_icons/volume_up_chrome_refresh.icon
@ -0,0 +1,81 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+PATH_COLOR_ARGB, 0xFF, 0xAA, 0x00, 0xAA,
+FILL_RULE_NONZERO,
+MOVE_TO, 11.5f, 16.83f,
+V_LINE_TO, 15.27f,
+R_ARC_TO, 5.18f, 5.18f, 0, 0, 0, 2.9f, -1.94f,
+R_CUBIC_TO, 0.74f, -0.98f, 1.11f, -2.08f, 1.11f, -3.32f,
+R_CUBIC_TO, 0, -1.24f, -0.37f, -2.34f, -1.11f, -3.3f,
+ARC_TO, 5.67f, 5.67f, 0, 0, 0, 11.5f, 4.71f,
+V_LINE_TO, 3.15f,
+R_CUBIC_TO, 1.61f, 0.35f, 2.93f, 1.16f, 3.96f, 2.44f,
+CUBIC_TO, 16.48f, 6.86f, 17, 8.33f, 17, 9.98f,
+R_CUBIC_TO, 0, 1.65f, -0.51f, 3.12f, -1.53f, 4.41f,
+R_CUBIC_TO, -1.02f, 1.29f, -2.34f, 2.1f, -3.97f, 2.44f,
+CLOSE,
+MOVE_TO, 3, 11.98f,
+R_V_LINE_TO, -4,
+R_H_LINE_TO, 3,
+R_LINE_TO, 4, -4,
+R_V_LINE_TO, 12,
+R_LINE_TO, -4, -4,
+CLOSE,
+R_MOVE_TO, 8.5f, 1.15f,
+V_LINE_TO, 6.83f,
+R_CUBIC_TO, 0.63f, 0.28f, 1.12f, 0.71f, 1.47f, 1.28f,
+R_CUBIC_TO, 0.36f, 0.57f, 0.53f, 1.19f, 0.53f, 1.88f,
+R_CUBIC_TO, 0, 0.68f, -0.18f, 1.29f, -0.53f, 1.86f,
+R_ARC_TO, 3.3f, 3.3f, 0, 0, 1, -1.47f, 1.28f,
+CLOSE,
+R_MOVE_TO, -3, -5.52f,
+LINE_TO, 6.63f, 9.48f,
+H_LINE_TO, 4.5f,
+R_V_LINE_TO, 1,
+R_H_LINE_TO, 2.13f,
+LINE_TO, 8.5f, 12.36f,
+CLOSE,
+MOVE_TO, 6.61f, 9.96f,
+CLOSE
+
+CANVAS_DIMENSIONS, 16,
+PATH_COLOR_ARGB, 0xFF, 0xAA, 0x00, 0xAA,
+FILL_RULE_NONZERO,
+MOVE_TO, 9.31f, 13.54f,
+R_V_LINE_TO, -1.32f,
+R_ARC_TO, 4.19f, 4.19f, 0, 0, 0, 2.31f, -1.56f,
+R_ARC_TO, 4.28f, 4.28f, 0, 0, 0, 0.89f, -2.65f,
+R_ARC_TO, 4.2f, 4.2f, 0, 0, 0, -0.89f, -2.64f,
+R_ARC_TO, 4.58f, 4.58f, 0, 0, 0, -2.3f, -1.6f,
+V_LINE_TO, 2.45f,
+R_CUBIC_TO, 1.3f, 0.28f, 2.38f, 0.94f, 3.21f, 1.97f,
+R_CUBIC_TO, 0.84f, 1.03f, 1.25f, 2.22f, 1.25f, 3.56f,
+R_ARC_TO, 5.57f, 5.57f, 0, 0, 1, -1.24f, 3.57f,
+R_CUBIC_TO, -0.83f, 1.04f, -1.9f, 1.7f, -3.21f, 1.98f,
+CLOSE,
+MOVE_TO, 2.24f, 9.72f,
+V_LINE_TO, 6.25f,
+R_H_LINE_TO, 2.48f,
+R_LINE_TO, 3.39f, -3.39f,
+R_V_LINE_TO, 10.25f,
+LINE_TO, 4.72f, 9.72f,
+CLOSE,
+R_MOVE_TO, 7.07f, 0.83f,
+V_LINE_TO, 5.42f,
+R_CUBIC_TO, 0.51f, 0.23f, 0.91f, 0.58f, 1.21f, 1.04f,
+R_CUBIC_TO, 0.3f, 0.46f, 0.45f, 0.97f, 0.45f, 1.54f,
+R_CUBIC_TO, 0, 0.55f, -0.15f, 1.06f, -0.45f, 1.52f,
+R_CUBIC_TO, -0.3f, 0.46f, -0.7f, 0.81f, -1.21f, 1.04f,
+CLOSE,
+MOVE_TO, 6.72f, 6.2f,
+R_LINE_TO, -1.43f, 1.43f,
+H_LINE_TO, 3.62f,
+R_V_LINE_TO, 0.7f,
+H_LINE_TO, 5.29f,
+LINE_TO, 6.72f, 9.77f,
+CLOSE,
+MOVE_TO, 5.25f, 7.97f,
+CLOSE