Skip to content

Commit

Permalink
update patches
Browse files Browse the repository at this point in the history
  • Loading branch information
electron-bot authored and ppontes committed Dec 10, 2020
1 parent 4455114 commit a4b2d1d
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions patches/chromium/cherry-pick-ecdec1fb0f42.patch
@@ -1,7 +1,7 @@
From ecdec1fb0f42b4d1db9cb3d2cd76466fc3958bde Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Etienne Bergeron <etienneb@chromium.org>
Date: Fri, 13 Nov 2020 17:40:59 +0000
Subject: [PATCH] [merge M86] Fix text eliding for single-codepoint text with BiDi
Subject: Fix text eliding for single-codepoint text with BiDi

This CL is fixing a corner case where RenderText::Elide(...) may
produce a text with more codepoints than the original one. This is
Expand Down Expand Up @@ -38,13 +38,12 @@ Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537931
Reviewed-by: Etienne Bergeron <etienneb@chromium.org>
Cr-Commit-Position: refs/branch-heads/4240@{#1450}
Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}
---

diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
index 3dc9e4d..50f2ef0 100644
index 7d5fb0c4d6e609d99533a10f26cf5ef195b4c18a..5a32f3f0987f7c4f94ba471876e9a0ff4ff91751 100644
--- a/ui/gfx/render_text.cc
+++ b/ui/gfx/render_text.cc
@@ -2059,8 +2059,10 @@
@@ -2067,8 +2067,10 @@ base::string16 RenderText::Elide(const base::string16& text,
}

// Append the ellipsis and the optional directional marker characters.
Expand All @@ -57,10 +56,10 @@ index 3dc9e4d..50f2ef0 100644
new_text += base::i18n::kLeftToRightMark;
else
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 0c92673..33d4f57 100644
index 6796016d97a6c167a31482e353e4faac652ce2a4..80b9d756a52f8df2a4420ffd3c275d529ef95bfb 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -1906,7 +1906,7 @@
@@ -1851,7 +1851,7 @@ const ElideTextCase kElideTailTextCases[] = {
{"ltr_0", L"abc", L""},
{"rtl_3", L"\u05d0\u05d1\u05d2", L"\u05d0\u05d1\u05d2"},
{"rtl_2", L"\u05d0\u05d1\u05d2", L"\u05d0\u2026"},
Expand Down

0 comments on commit a4b2d1d

Please sign in to comment.