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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.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_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 184424649f62c354859406fbafa6850430cb817c..d05bd44da8b60ce99a06f215c99e5a660cc7b736 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -760,11 +760,11 @@ TEST_F(RenderWidgetHostViewAuraTest, SetCompositionText) {
// Focused segment
composition_text.underlines.push_back(
- ui::CompositionUnderline(0, 3, 0xff000000, true));
+ ui::CompositionUnderline(0, 3, 0xff000000, true, 0x78563412));
- // Non-focused segment
+ // Non-focused segment, with different background color.
composition_text.underlines.push_back(
- ui::CompositionUnderline(3, 4, 0xff000000, false));
+ ui::CompositionUnderline(3, 4, 0xff000000, false, 0xefcdab90));
const ui::CompositionUnderlines& underlines = composition_text.underlines;
@@ -790,6 +790,7 @@ TEST_F(RenderWidgetHostViewAuraTest, SetCompositionText) {
EXPECT_EQ(underlines[i].end_offset, params.b[i].endOffset);
EXPECT_EQ(underlines[i].color, params.b[i].color);
EXPECT_EQ(underlines[i].thick, params.b[i].thick);
+ EXPECT_EQ(underlines[i].background_color, params.b[i].backgroundColor);
}
// highlighted range
EXPECT_EQ(4, params.c) << "Should be the same to the caret pos";

Powered by Google App Engine
This is Rietveld 408576698