Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Unified Diff: ui/base/ime/input_method_chromeos.cc

Issue 313053007: Passing BackgroundColorSpan and UnderlineSpan from Clank to Blink. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Putting back import java.lang.CharSequence for android_aosp. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/composition_underline.h ('k') | ui/base/ime/input_method_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/input_method_chromeos.cc
diff --git a/ui/base/ime/input_method_chromeos.cc b/ui/base/ime/input_method_chromeos.cc
index 799b3a352c132d1004d183374af57ba3d196fecd..a37cb72e50bd4696c3dc3c224fb934c9b2c4efce 100644
--- a/ui/base/ime/input_method_chromeos.cc
+++ b/ui/base/ime/input_method_chromeos.cc
@@ -608,9 +608,11 @@ void InputMethodChromeOS::ExtractCompositionText(
const uint32 end = underline_attributes[i].end_index;
if (start >= end)
continue;
- CompositionUnderline underline(
- char16_offsets[start], char16_offsets[end],
- SK_ColorBLACK, false /* thick */);
+ CompositionUnderline underline(char16_offsets[start],
+ char16_offsets[end],
+ SK_ColorBLACK,
+ false /* thick */,
+ SK_ColorTRANSPARENT);
if (underline_attributes[i].type ==
chromeos::CompositionText::COMPOSITION_TEXT_UNDERLINE_DOUBLE)
underline.thick = true;
@@ -625,9 +627,11 @@ void InputMethodChromeOS::ExtractCompositionText(
if (text.selection_start() < text.selection_end()) {
const uint32 start = text.selection_start();
const uint32 end = text.selection_end();
- CompositionUnderline underline(
- char16_offsets[start], char16_offsets[end],
- SK_ColorBLACK, true /* thick */);
+ CompositionUnderline underline(char16_offsets[start],
+ char16_offsets[end],
+ SK_ColorBLACK,
+ true /* thick */,
+ SK_ColorTRANSPARENT);
out_composition->underlines.push_back(underline);
// If the cursor is at start or end of this underline, then we treat
@@ -645,7 +649,7 @@ void InputMethodChromeOS::ExtractCompositionText(
// Use a black thin underline by default.
if (out_composition->underlines.empty()) {
out_composition->underlines.push_back(CompositionUnderline(
- 0, length, SK_ColorBLACK, false /* thick */));
+ 0, length, SK_ColorBLACK, false /* thick */, SK_ColorTRANSPARENT));
}
}
« no previous file with comments | « ui/base/ime/composition_underline.h ('k') | ui/base/ime/input_method_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698