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

Unified Diff: ui/base/ime/composition_underline.h

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_text_util_pango_unittest.cc ('k') | ui/base/ime/input_method_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/composition_underline.h
diff --git a/ui/base/ime/composition_underline.h b/ui/base/ime/composition_underline.h
index c8d09d8416336eb0b86ece88b53af062a80efb04..a8c44b66854d534ef673c14fc073f4d8e9c41022 100644
--- a/ui/base/ime/composition_underline.h
+++ b/ui/base/ime/composition_underline.h
@@ -7,6 +7,7 @@
#include <vector>
+#include "base/basictypes.h"
#include "third_party/skia/include/core/SkColor.h"
namespace ui {
@@ -15,34 +16,43 @@ namespace ui {
// third_party/WebKit/public/web/WebCompositionUnderline.h
struct CompositionUnderline {
CompositionUnderline()
- : start_offset(0),
- end_offset(0),
- color(0),
- thick(false) {}
-
- CompositionUnderline(unsigned s, unsigned e, SkColor c, bool t)
- : start_offset(s),
- end_offset(e),
- color(c),
- thick(t) {}
+ : start_offset(0),
+ end_offset(0),
+ color(SK_ColorTRANSPARENT),
+ thick(false),
+ background_color(SK_ColorTRANSPARENT) {}
+
+ // TODO(huangs): remove this constructor.
+ CompositionUnderline(uint32 s, uint32 e, SkColor c, bool t)
+ : start_offset(s),
+ end_offset(e),
+ color(c),
+ thick(t),
+ background_color(SK_ColorTRANSPARENT) {}
+
+ CompositionUnderline(uint32 s, uint32 e, SkColor c, bool t, SkColor bc)
+ : start_offset(s),
+ end_offset(e),
+ color(c),
+ thick(t),
+ background_color(bc) {}
bool operator==(const CompositionUnderline& rhs) const {
return (this->start_offset == rhs.start_offset) &&
- (this->end_offset == rhs.end_offset) &&
- (this->color == rhs.color) &&
- (this->thick == rhs.thick);
+ (this->end_offset == rhs.end_offset) && (this->color == rhs.color) &&
+ (this->thick == rhs.thick) &&
+ (this->background_color == rhs.background_color);
}
bool operator!=(const CompositionUnderline& rhs) const {
return !(*this == rhs);
}
- // Though use of unsigned is discouraged, we use it here to make sure it's
- // identical to blink::WebCompositionUnderline.
- unsigned start_offset;
- unsigned end_offset;
+ uint32 start_offset;
+ uint32 end_offset;
SkColor color;
bool thick;
+ SkColor background_color;
};
typedef std::vector<CompositionUnderline> CompositionUnderlines;
« no previous file with comments | « ui/base/ime/composition_text_util_pango_unittest.cc ('k') | ui/base/ime/input_method_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698