| OLD | NEW |
| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 | 128 |
| 129 bool WebViewFrameWidget::setComposition( | 129 bool WebViewFrameWidget::setComposition( |
| 130 const WebString& text, | 130 const WebString& text, |
| 131 const WebVector<WebCompositionUnderline>& underlines, | 131 const WebVector<WebCompositionUnderline>& underlines, |
| 132 int selectionStart, | 132 int selectionStart, |
| 133 int selectionEnd) | 133 int selectionEnd) |
| 134 { | 134 { |
| 135 return m_webView->setComposition(text, underlines, selectionStart, selection
End); | 135 return m_webView->setComposition(text, underlines, selectionStart, selection
End); |
| 136 } | 136 } |
| 137 | 137 |
| 138 bool WebViewFrameWidget::confirmComposition() | 138 bool WebViewFrameWidget::confirmComposition(int newCursorPosition) |
| 139 { | 139 { |
| 140 return m_webView->confirmComposition(); | 140 return m_webView->confirmComposition(newCursorPosition); |
| 141 } | 141 } |
| 142 | 142 |
| 143 bool WebViewFrameWidget::confirmComposition(ConfirmCompositionBehavior selection
Behavior) | 143 bool WebViewFrameWidget::confirmComposition(ConfirmCompositionBehavior selection
Behavior, int newCursorPosition) |
| 144 { | 144 { |
| 145 return m_webView->confirmComposition(selectionBehavior); | 145 return m_webView->confirmComposition(selectionBehavior, newCursorPosition); |
| 146 } | 146 } |
| 147 | 147 |
| 148 bool WebViewFrameWidget::confirmComposition(const WebString& text) | 148 bool WebViewFrameWidget::confirmComposition(const WebString& text, int newCursor
Position) |
| 149 { | 149 { |
| 150 return m_webView->confirmComposition(text); | 150 return m_webView->confirmComposition(text, newCursorPosition); |
| 151 } | 151 } |
| 152 | 152 |
| 153 bool WebViewFrameWidget::compositionRange(size_t* location, size_t* length) | 153 bool WebViewFrameWidget::compositionRange(size_t* location, size_t* length) |
| 154 { | 154 { |
| 155 return m_webView->compositionRange(location, length); | 155 return m_webView->compositionRange(location, length); |
| 156 } | 156 } |
| 157 | 157 |
| 158 WebTextInputInfo WebViewFrameWidget::textInputInfo() | 158 WebTextInputInfo WebViewFrameWidget::textInputInfo() |
| 159 { | 159 { |
| 160 return m_webView->textInputInfo(); | 160 return m_webView->textInputInfo(); |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 { | 254 { |
| 255 m_webView->setBaseBackgroundColor(color); | 255 m_webView->setBaseBackgroundColor(color); |
| 256 } | 256 } |
| 257 | 257 |
| 258 void WebViewFrameWidget::scheduleAnimation() | 258 void WebViewFrameWidget::scheduleAnimation() |
| 259 { | 259 { |
| 260 m_webView->scheduleAnimation(); | 260 m_webView->scheduleAnimation(); |
| 261 } | 261 } |
| 262 | 262 |
| 263 } // namespace blink | 263 } // namespace blink |
| OLD | NEW |