1 files changed, 65 insertions, 2 deletions

diff --git a/chromium/third_party/blink/renderer/core/editing/markers/composition_marker_test.cc b/chromium/third_party/blink/renderer/core/editing/markers/composition_marker_test.cc
index 5bf0d806048..d0c8083a91d 100644
--- a/chromium/third_party/blink/renderer/core/editing/markers/composition_marker_test.cc
+++ b/chromium/third_party/blink/renderer/core/editing/markers/composition_marker_test.cc
@@ -7,6 +7,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ui::mojom::ImeTextSpanThickness;
+using ui::mojom::ImeTextSpanUnderlineStyle;
 
 namespace blink {
 
@@ -15,6 +16,7 @@ class CompositionMarkerTest : public testing::Test {};
 TEST_F(CompositionMarkerTest, MarkerType) {
   DocumentMarker* marker = MakeGarbageCollected<CompositionMarker>(
       0, 1, Color::kTransparent, ImeTextSpanThickness::kNone,
+      ImeTextSpanUnderlineStyle::kNone, Color::kTransparent,
       Color::kTransparent);
   EXPECT_EQ(DocumentMarker::kComposition, marker->GetType());
 }
@@ -22,20 +24,81 @@ TEST_F(CompositionMarkerTest, MarkerType) {
 TEST_F(CompositionMarkerTest, IsStyleableMarker) {
   DocumentMarker* marker = MakeGarbageCollected<CompositionMarker>(
       0, 1, Color::kTransparent, ImeTextSpanThickness::kNone,
+      ImeTextSpanUnderlineStyle::kNone, Color::kTransparent,
       Color::kTransparent);
   EXPECT_TRUE(IsStyleableMarker(*marker));
 }
 
 TEST_F(CompositionMarkerTest, ConstructorAndGetters) {
   CompositionMarker* marker = MakeGarbageCollected<CompositionMarker>(
-      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThin, Color::kGray);
+      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThin,
+      ImeTextSpanUnderlineStyle::kSolid, Color::kTransparent, Color::kGray);
   EXPECT_EQ(Color::kDarkGray, marker->UnderlineColor());
   EXPECT_TRUE(marker->HasThicknessThin());
+  EXPECT_EQ(ImeTextSpanUnderlineStyle::kSolid, marker->UnderlineStyle());
+  EXPECT_EQ(Color::kTransparent, marker->TextColor());
   EXPECT_EQ(Color::kGray, marker->BackgroundColor());
 
   CompositionMarker* thick_marker = MakeGarbageCollected<CompositionMarker>(
-      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThick, Color::kGray);
+      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThick,
+      ImeTextSpanUnderlineStyle::kSolid, Color::kTransparent, Color::kGray);
   EXPECT_TRUE(thick_marker->HasThicknessThick());
+  EXPECT_EQ(ImeTextSpanUnderlineStyle::kSolid, marker->UnderlineStyle());
+  EXPECT_EQ(Color::kTransparent, marker->TextColor());
+}
+
+TEST_F(CompositionMarkerTest, UnderlineStyleDottedAndGrayText) {
+  CompositionMarker* marker = MakeGarbageCollected<CompositionMarker>(
+      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThin,
+      ImeTextSpanUnderlineStyle::kDot, Color::kGray, Color::kGray);
+  EXPECT_EQ(Color::kDarkGray, marker->UnderlineColor());
+  EXPECT_TRUE(marker->HasThicknessThin());
+  EXPECT_EQ(ImeTextSpanUnderlineStyle::kDot, marker->UnderlineStyle());
+  EXPECT_EQ(Color::kGray, marker->TextColor());
+  EXPECT_EQ(Color::kGray, marker->BackgroundColor());
+
+  CompositionMarker* thick_marker = MakeGarbageCollected<CompositionMarker>(
+      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThick,
+      ImeTextSpanUnderlineStyle::kDot, Color::kGray, Color::kGray);
+  EXPECT_TRUE(thick_marker->HasThicknessThick());
+  EXPECT_EQ(ImeTextSpanUnderlineStyle::kDot, marker->UnderlineStyle());
+  EXPECT_EQ(Color::kGray, marker->TextColor());
+}
+
+TEST_F(CompositionMarkerTest, UnderlineStyleDashed) {
+  CompositionMarker* marker = MakeGarbageCollected<CompositionMarker>(
+      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThin,
+      ImeTextSpanUnderlineStyle::kDash, Color::kTransparent, Color::kGray);
+  EXPECT_EQ(Color::kDarkGray, marker->UnderlineColor());
+  EXPECT_TRUE(marker->HasThicknessThin());
+  EXPECT_EQ(ImeTextSpanUnderlineStyle::kDash, marker->UnderlineStyle());
+  EXPECT_EQ(Color::kTransparent, marker->TextColor());
+  EXPECT_EQ(Color::kGray, marker->BackgroundColor());
+
+  CompositionMarker* thick_marker = MakeGarbageCollected<CompositionMarker>(
+      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThick,
+      ImeTextSpanUnderlineStyle::kDash, Color::kTransparent, Color::kGray);
+  EXPECT_TRUE(thick_marker->HasThicknessThick());
+  EXPECT_EQ(ImeTextSpanUnderlineStyle::kDash, marker->UnderlineStyle());
+  EXPECT_EQ(Color::kTransparent, marker->TextColor());
+}
+
+TEST_F(CompositionMarkerTest, UnderlineStyleSquiggled) {
+  CompositionMarker* marker = MakeGarbageCollected<CompositionMarker>(
+      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThin,
+      ImeTextSpanUnderlineStyle::kSquiggle, Color::kTransparent, Color::kGray);
+  EXPECT_EQ(Color::kDarkGray, marker->UnderlineColor());
+  EXPECT_TRUE(marker->HasThicknessThin());
+  EXPECT_EQ(ImeTextSpanUnderlineStyle::kSquiggle, marker->UnderlineStyle());
+  EXPECT_EQ(Color::kTransparent, marker->TextColor());
+  EXPECT_EQ(Color::kGray, marker->BackgroundColor());
+
+  CompositionMarker* thick_marker = MakeGarbageCollected<CompositionMarker>(
+      0, 1, Color::kDarkGray, ImeTextSpanThickness::kThick,
+      ImeTextSpanUnderlineStyle::kSquiggle, Color::kTransparent, Color::kGray);
+  EXPECT_TRUE(thick_marker->HasThicknessThick());
+  EXPECT_EQ(ImeTextSpanUnderlineStyle::kSquiggle, marker->UnderlineStyle());
+  EXPECT_EQ(Color::kTransparent, marker->TextColor());
 }
 
 }  // namespace blink