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

Side by Side Diff: third_party/WebKit/Source/core/editing/CompositionUnderline.h

Issue 2650113004: [WIP] Add support for Android SuggestionSpans when editing text (Closed)
Patch Set: Remove logging statements, fix copyright years in new files Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef CompositionUnderline_h 26 #ifndef CompositionUnderline_h
27 #define CompositionUnderline_h 27 #define CompositionUnderline_h
28 28
29 #include "core/CoreExport.h" 29 #include "core/CoreExport.h"
30 #include "platform/graphics/Color.h" 30 #include "platform/graphics/Color.h"
31 #include "wtf/Allocator.h" 31 #include "wtf/Allocator.h"
32 #include <vector>
32 33
33 namespace blink { 34 namespace blink {
34 35
35 class CORE_EXPORT CompositionUnderline { 36 class CORE_EXPORT CompositionUnderline {
36 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); 37 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
37 38
38 public: 39 public:
39 CompositionUnderline(unsigned startOffset, 40 CompositionUnderline(unsigned startOffset,
40 unsigned endOffset, 41 unsigned endOffset,
41 const Color&, 42 const Color&,
42 bool thick, 43 bool thick,
43 const Color& backgroundColor); 44 const Color& backgroundColor);
45 CompositionUnderline(unsigned startOffset,
46 unsigned endOffset,
47 const Color&,
48 bool thick,
49 const Color& backgroundColor,
50 const std::vector<std::string>& suggestions);
44 51
45 unsigned startOffset() const { return m_startOffset; } 52 unsigned startOffset() const { return m_startOffset; }
46 unsigned endOffset() const { return m_endOffset; } 53 unsigned endOffset() const { return m_endOffset; }
47 const Color& color() const { return m_color; } 54 const Color& color() const { return m_color; }
48 bool thick() const { return m_thick; } 55 bool thick() const { return m_thick; }
49 const Color& backgroundColor() const { return m_backgroundColor; } 56 const Color& backgroundColor() const { return m_backgroundColor; }
57 const std::vector<std::string>& suggestions() const { return m_suggestions; }
50 58
51 private: 59 private:
52 unsigned m_startOffset; 60 unsigned m_startOffset;
53 unsigned m_endOffset; 61 unsigned m_endOffset;
54 Color m_color; 62 Color m_color;
55 bool m_thick; 63 bool m_thick;
56 Color m_backgroundColor; 64 Color m_backgroundColor;
65 std::vector<std::string> m_suggestions;
esprehn 2017/01/31 22:41:34 no std:: in blink. This should be Vector<String>
rlanday 2017/01/31 23:30:09 Ok
57 }; 66 };
58 67
59 } // namespace blink 68 } // namespace blink
60 69
61 #endif // CompositionUnderline_h 70 #endif // CompositionUnderline_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698