Chromium Code Reviews Chromium Code Reviews
Issue 313233002:
Adding backgroundColor to WebCompositionUnderline and using it for InlineTextBox drawing. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 // Class WebCompositionUnderline is intended to be used with WebWidget's | 38 // Class WebCompositionUnderline is intended to be used with WebWidget's |
| 39 // setComposition() method. | 39 // setComposition() method. |
| 40 struct WebCompositionUnderline { | 40 struct WebCompositionUnderline { |
| 41 WebCompositionUnderline() | 41 WebCompositionUnderline() |
| 42 : startOffset(0) | 42 : startOffset(0) |
| 43 , endOffset(0) | 43 , endOffset(0) |
| 44 , color(0) | 44 , color(0) |
| 45 , thick(false) { } | 45 , thick(false) |
| 46 , backgroundColor(0) { } | |
| 46 | 47 |
| 48 // TODO(huangs): remove this constructor. | |
|
tkent
2014/06/13 04:31:43
Use FIXME: instead of TODO().
huangs
2014/06/13 17:22:25
Done.
| |
| 47 WebCompositionUnderline(unsigned s, unsigned e, WebColor c, bool t) | 49 WebCompositionUnderline(unsigned s, unsigned e, WebColor c, bool t) |
| 48 : startOffset(s) | 50 : startOffset(s) |
| 49 , endOffset(e) | 51 , endOffset(e) |
| 50 , color(c) | 52 , color(c) |
| 51 , thick(t) { } | 53 , thick(t) |
| 54 , backgroundColor(0) { } | |
| 52 | 55 |
| 56 WebCompositionUnderline(unsigned s, unsigned e, WebColor c, bool t, WebColor bc) | |
| 57 : startOffset(s) | |
| 58 , endOffset(e) | |
| 59 , color(c) | |
| 60 , thick(t) | |
| 61 , backgroundColor(bc) { } | |
| 62 | |
| 63 bool operator<(const WebCompositionUnderline& other) const | |
| 64 { | |
| 65 return startOffset != other.startOffset ? startOffset < other.startOffse t : endOffset < other.endOffset; | |
| 66 } | |
| 67 | |
| 68 // Need to update IPC_STRUCT_TRAITS_BEGIN(blink::WebCompositionUnderline) | |
| 69 // if members change. | |
| 53 unsigned startOffset; | 70 unsigned startOffset; |
| 54 unsigned endOffset; | 71 unsigned endOffset; |
| 55 WebColor color; | 72 WebColor color; |
| 56 bool thick; | 73 bool thick; |
| 74 WebColor backgroundColor; | |
| 57 }; | 75 }; |
| 58 | 76 |
| 59 } // namespace blink | 77 } // namespace blink |
| 60 | 78 |
| 61 #endif | 79 #endif |
| OLD | NEW |
