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

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

Issue 2568093003: Support parsing BackgroundSpans and UnderlineSpans in Android IME's commitText() (Closed)
Patch Set: Don't try to add default underline for commitText(), attempt to fix Mac builds Created 4 years 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 DoNotKeepSelection, 55 DoNotKeepSelection,
56 KeepSelection, 56 KeepSelection,
57 }; 57 };
58 58
59 static InputMethodController* create(LocalFrame&); 59 static InputMethodController* create(LocalFrame&);
60 virtual ~InputMethodController(); 60 virtual ~InputMethodController();
61 DECLARE_TRACE(); 61 DECLARE_TRACE();
62 62
63 // international text input composition 63 // international text input composition
64 bool hasComposition() const; 64 bool hasComposition() const;
65 void setComposition(const String&, 65 void setComposition(const String& text,
66 const Vector<CompositionUnderline>&, 66 const Vector<CompositionUnderline>& underlines,
67 int selectionStart, 67 int selectionStart,
68 int selectionEnd); 68 int selectionEnd);
69 void setCompositionFromExistingText(const Vector<CompositionUnderline>&, 69 void setCompositionFromExistingText(const Vector<CompositionUnderline>& text,
70 unsigned compositionStart, 70 unsigned compositionStart,
71 unsigned compositionEnd); 71 unsigned compositionEnd);
72 72
73 // Deletes ongoing composing text if any, inserts specified text, and 73 // Deletes ongoing composing text if any, inserts specified text, and
74 // changes the selection according to relativeCaretPosition, which is 74 // changes the selection according to relativeCaretPosition, which is
75 // relative to the end of the inserting text. 75 // relative to the end of the inserting text.
76 bool commitText(const String& text, int relativeCaretPosition); 76 bool commitText(const String& text,
77 const Vector<CompositionUnderline>& underlines,
78 int relativeCaretPosition);
77 79
78 // Inserts ongoing composing text; changes the selection to the end of 80 // Inserts ongoing composing text; changes the selection to the end of
79 // the inserting text if DoNotKeepSelection, or holds the selection if 81 // the inserting text if DoNotKeepSelection, or holds the selection if
80 // KeepSelection. 82 // KeepSelection.
81 bool finishComposingText(ConfirmCompositionBehavior); 83 bool finishComposingText(ConfirmCompositionBehavior);
82 84
83 // Deletes the existing composition text. 85 // Deletes the existing composition text.
84 void cancelComposition(); 86 void cancelComposition();
85 87
86 void cancelCompositionIfSelectionIsInvalid(); 88 void cancelCompositionIfSelectionIsInvalid();
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 int textInputFlags() const; 154 int textInputFlags() const;
153 WebTextInputMode inputModeOfFocusedElement() const; 155 WebTextInputMode inputModeOfFocusedElement() const;
154 156
155 // Implements |SynchronousMutationObserver|. 157 // Implements |SynchronousMutationObserver|.
156 void contextDestroyed() final; 158 void contextDestroyed() final;
157 }; 159 };
158 160
159 } // namespace blink 161 } // namespace blink
160 162
161 #endif // InputMethodController_h 163 #endif // InputMethodController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698