Passing BackgroundColorSpan and UnderlineSpan from Clank to Blink.

ui/base/ime/input_method_chromeos_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/ime/input_method_chromeos.h"
 
 #include <X11/Xlib.h>
 #undef Bool
 #undef FocusIn
 #undef FocusOut
@@ skipping 655 matching lines @@
   EXPECT_EQ(kCursorPos, composition_text.selection.start());
   EXPECT_EQ(kCursorPos, composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.start_index),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.end_index),
             composition_text.underlines[0].end_offset);
   // Single underline represents as black thin line.
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_FALSE(composition_text.underlines[0].thick);
+  EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
+            composition_text.underlines[0].background_color);
 }
 
 TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_DoubleUnderline) {
   const uint32 kCursorPos = 2UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos::CompositionText::UnderlineAttribute underline;
   underline.type = chromeos::CompositionText::COMPOSITION_TEXT_UNDERLINE_DOUBLE;
@@ skipping 10 matching lines @@
   EXPECT_EQ(kCursorPos, composition_text.selection.start());
   EXPECT_EQ(kCursorPos, composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.start_index),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText, underline.end_index),
             composition_text.underlines[0].end_offset);
   // Double underline represents as black thick line.
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_TRUE(composition_text.underlines[0].thick);
+  EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
+            composition_text.underlines[0].background_color);
 }
 
 TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_ErrorUnderline) {
   const uint32 kCursorPos = 2UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos::CompositionText::UnderlineAttribute underline;
   underline.type = chromeos::CompositionText::COMPOSITION_TEXT_UNDERLINE_ERROR;
@@ skipping 35 matching lines @@
   EXPECT_EQ(kCursorPos, composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_start()),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_end()),
             composition_text.underlines[0].end_offset);
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_TRUE(composition_text.underlines[0].thick);
+  EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
+            composition_text.underlines[0].background_color);
 }
 
 TEST_F(InputMethodChromeOSTest,
        ExtractCompositionTextTest_SelectionStartWithCursor) {
   const uint32 kCursorPos = 1UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos_composition_text.set_selection_start(kCursorPos);
@@ skipping 12 matching lines @@
             composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_start()),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_end()),
             composition_text.underlines[0].end_offset);
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_TRUE(composition_text.underlines[0].thick);
+  EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
+            composition_text.underlines[0].background_color);
 }
 
 TEST_F(InputMethodChromeOSTest,
        ExtractCompositionTextTest_SelectionEndWithCursor) {
   const uint32 kCursorPos = 4UL;
 
   // Set up chromeos composition text with one underline attribute.
   chromeos::CompositionText chromeos_composition_text;
   chromeos_composition_text.set_text(kSampleText);
   chromeos_composition_text.set_selection_start(1UL);
@@ skipping 12 matching lines @@
             composition_text.selection.end());
   ASSERT_EQ(1UL, composition_text.underlines.size());
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_start()),
             composition_text.underlines[0].start_offset);
   EXPECT_EQ(GetOffsetInUTF16(kSampleText,
                              chromeos_composition_text.selection_end()),
             composition_text.underlines[0].end_offset);
   EXPECT_EQ(SK_ColorBLACK, composition_text.underlines[0].color);
   EXPECT_TRUE(composition_text.underlines[0].thick);
+  EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
+            composition_text.underlines[0].background_color);
 }
 
 TEST_F(InputMethodChromeOSTest, SurroundingText_NoSelectionTest) {
   ime_->Init(true);
   // Click a text input form.
   input_type_ = TEXT_INPUT_TYPE_TEXT;
   ime_->OnTextInputTypeChanged(this);
 
   // Set the TextInputClient behaviors.
   surrounding_text_ = UTF8ToUTF16("abcdef");
@@ skipping 217 matching lines @@
   ime_->ResetContext();
 
   // Do callback.
   mock_ime_engine_handler_->last_passed_callback().Run(true);
 
   EXPECT_EQ(0, ime_->process_key_event_post_ime_call_count());
 }
 // TODO(nona): Introduce ProcessKeyEventPostIME tests(crbug.com/156593).
 
 }  // namespace ui