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

Unified Diff: ui/base/ime/composition_text_util_pango.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/aura/remote_window_tree_host_win.cc ('k') | ui/base/ime/composition_text_util_pango_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/composition_text_util_pango.cc
diff --git a/ui/base/ime/composition_text_util_pango.cc b/ui/base/ime/composition_text_util_pango.cc
index 98dadb6cc407cad8042833ffd472caa0c1790e45..325cdd61d924f630e01c708d42ff395faddb77c2 100644
--- a/ui/base/ime/composition_text_util_pango.cc
+++ b/ui/base/ime/composition_text_util_pango.cc
@@ -75,8 +75,11 @@ void ExtractCompositionTextFromGtkPreedit(const gchar* utf8_text,
if (background_attr || underline_attr) {
// Use a black thin underline by default.
- CompositionUnderline underline(
- char16_offsets[start], char16_offsets[end], SK_ColorBLACK, false);
+ CompositionUnderline underline(char16_offsets[start],
+ char16_offsets[end],
+ SK_ColorBLACK,
+ false,
+ SK_ColorTRANSPARENT);
// Always use thick underline for a range with background color, which
// is usually the selection range.
@@ -108,8 +111,8 @@ void ExtractCompositionTextFromGtkPreedit(const gchar* utf8_text,
// Use a black thin underline by default.
if (composition->underlines.empty()) {
- composition->underlines.push_back(
- CompositionUnderline(0, length, SK_ColorBLACK, false));
+ composition->underlines.push_back(CompositionUnderline(
+ 0, length, SK_ColorBLACK, false, SK_ColorTRANSPARENT));
}
}
« no previous file with comments | « ui/aura/remote_window_tree_host_win.cc ('k') | ui/base/ime/composition_text_util_pango_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698