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

Side by Side Diff: third_party/WebKit/Source/web/WebViewFrameWidget.cpp

Issue 1995333002: Handle newCursorPosition correctly for Android's commitText() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adjust selection in confirmCompositionOrInsertText() Created 4 years, 4 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be found 2 // Use of this source code is governed by a BSD-style license that can be found
3 // in the LICENSE file. 3 // in the LICENSE file.
4 4
5 #include "web/WebViewFrameWidget.h" 5 #include "web/WebViewFrameWidget.h"
6 6
7 #include "web/WebLocalFrameImpl.h" 7 #include "web/WebLocalFrameImpl.h"
8 #include "web/WebViewImpl.h" 8 #include "web/WebViewImpl.h"
9 9
10 namespace blink { 10 namespace blink {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 bool WebViewFrameWidget::setComposition( 131 bool WebViewFrameWidget::setComposition(
132 const WebString& text, 132 const WebString& text,
133 const WebVector<WebCompositionUnderline>& underlines, 133 const WebVector<WebCompositionUnderline>& underlines,
134 int selectionStart, 134 int selectionStart,
135 int selectionEnd) 135 int selectionEnd)
136 { 136 {
137 return m_webView->setComposition(text, underlines, selectionStart, selection End); 137 return m_webView->setComposition(text, underlines, selectionStart, selection End);
138 } 138 }
139 139
140 bool WebViewFrameWidget::confirmComposition() 140 bool WebViewFrameWidget::confirmComposition(int newCursorPosition)
141 { 141 {
142 return m_webView->confirmComposition(); 142 return m_webView->confirmComposition(newCursorPosition);
143 } 143 }
144 144
145 bool WebViewFrameWidget::confirmComposition(ConfirmCompositionBehavior selection Behavior) 145 bool WebViewFrameWidget::confirmComposition(ConfirmCompositionBehavior selection Behavior, int newCursorPosition)
146 { 146 {
147 return m_webView->confirmComposition(selectionBehavior); 147 return m_webView->confirmComposition(selectionBehavior, newCursorPosition);
148 } 148 }
149 149
150 bool WebViewFrameWidget::confirmComposition(const WebString& text) 150 bool WebViewFrameWidget::confirmComposition(const WebString& text, int newCursor Position)
151 { 151 {
152 return m_webView->confirmComposition(text); 152 return m_webView->confirmComposition(text, newCursorPosition);
153 } 153 }
154 154
155 bool WebViewFrameWidget::compositionRange(size_t* location, size_t* length) 155 bool WebViewFrameWidget::compositionRange(size_t* location, size_t* length)
156 { 156 {
157 return m_webView->compositionRange(location, length); 157 return m_webView->compositionRange(location, length);
158 } 158 }
159 159
160 WebTextInputInfo WebViewFrameWidget::textInputInfo() 160 WebTextInputInfo WebViewFrameWidget::textInputInfo()
161 { 161 {
162 return m_webView->textInputInfo(); 162 return m_webView->textInputInfo();
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 { 276 {
277 m_webView->attachCompositorAnimationTimeline(compositorTimeline); 277 m_webView->attachCompositorAnimationTimeline(compositorTimeline);
278 } 278 }
279 279
280 void WebViewFrameWidget::detachCompositorAnimationTimeline(CompositorAnimationTi meline* compositorTimeline) 280 void WebViewFrameWidget::detachCompositorAnimationTimeline(CompositorAnimationTi meline* compositorTimeline)
281 { 281 {
282 m_webView->detachCompositorAnimationTimeline(compositorTimeline); 282 m_webView->detachCompositorAnimationTimeline(compositorTimeline);
283 } 283 }
284 284
285 } // namespace blink 285 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698