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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2608293002: [reland, refactor] - Move textInputInfo() and textInputType() from WebWidget to WebInputMethodContr… (Closed)
Patch Set: Addressing wjmaclean@'s comments Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 97b239bca9e784930ef1cdd502f10efc62b75382..2548ea1633497463ad4ccd87891aa1cc407bd68c 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -2339,20 +2339,6 @@ WebRange WebViewImpl::compositionRange() {
return PlainTextRange::create(*editable, range);
}
-WebTextInputInfo WebViewImpl::textInputInfo() {
- LocalFrame* focused = focusedLocalFrameInWidget();
- if (!focused)
- return WebTextInputInfo();
- return focused->inputMethodController().textInputInfo();
-}
-
-WebTextInputType WebViewImpl::textInputType() {
- LocalFrame* focused = focusedLocalFrameInWidget();
- if (!focused)
- return WebTextInputTypeNone;
- return focused->inputMethodController().textInputType();
-}
-
// TODO(ekaramad):This method is almost duplicated in WebFrameWidgetImpl as
// well. This code needs to be refactored (http://crbug.com/629721).
bool WebViewImpl::selectionBounds(WebRect& anchor, WebRect& focus) const {
@@ -3583,8 +3569,7 @@ bool WebViewImpl::isTransparent() const {
WebInputMethodControllerImpl* WebViewImpl::getActiveWebInputMethodController()
const {
- return WebInputMethodControllerImpl::fromFrame(
- focusedLocalFrameAvailableForIme());
+ return WebInputMethodControllerImpl::fromFrame(focusedLocalFrameInWidget());
}
void WebViewImpl::setBaseBackgroundColor(WebColor color) {
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698