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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.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
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 26e425bccaaec777f383371a9c807a740c03bca1..3c10f51e1456a5bde67c03abf805fff7c5862060 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1331,10 +1331,12 @@ void RenderWidgetHostViewAura::SetCompositionText(
for (std::vector<ui::CompositionUnderline>::const_iterator it =
composition.underlines.begin();
it != composition.underlines.end(); ++it) {
- underlines.push_back(blink::WebCompositionUnderline(it->start_offset,
- it->end_offset,
- it->color,
- it->thick));
+ underlines.push_back(
+ blink::WebCompositionUnderline(static_cast<unsigned>(it->start_offset),
+ static_cast<unsigned>(it->end_offset),
+ it->color,
+ it->thick,
+ it->background_color));
}
// TODO(suzhe): due to a bug of webkit, we can't use selection range with

Powered by Google App Engine
This is Rietveld 408576698