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

Side by Side Diff: content/renderer/render_widget.cc

Issue 11419218: Use textInputInfo instead of textInputType in getTextInputType (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after
1826 1826
1827 ui::TextInputType RenderWidget::WebKitToUiTextInputType( 1827 ui::TextInputType RenderWidget::WebKitToUiTextInputType(
1828 WebKit::WebTextInputType type) { 1828 WebKit::WebTextInputType type) {
1829 // Check the type is in the range representable by ui::TextInputType. 1829 // Check the type is in the range representable by ui::TextInputType.
1830 DCHECK_LE(type, static_cast<int>(ui::TEXT_INPUT_TYPE_MAX)) << 1830 DCHECK_LE(type, static_cast<int>(ui::TEXT_INPUT_TYPE_MAX)) <<
1831 "WebKit::WebTextInputType and ui::TextInputType not synchronized"; 1831 "WebKit::WebTextInputType and ui::TextInputType not synchronized";
1832 return static_cast<ui::TextInputType>(type); 1832 return static_cast<ui::TextInputType>(type);
1833 } 1833 }
1834 1834
1835 ui::TextInputType RenderWidget::GetTextInputType() { 1835 ui::TextInputType RenderWidget::GetTextInputType() {
1836 if (webwidget_) { 1836 if (webwidget_)
1837 WebKit::WebTextInputType type = webwidget_->textInputType(); 1837 return WebKitToUiTextInputType(webwidget_->textInputInfo().type);
1838 return WebKitToUiTextInputType(type);
1839 }
1840 return ui::TEXT_INPUT_TYPE_NONE; 1838 return ui::TEXT_INPUT_TYPE_NONE;
1841 } 1839 }
1842 1840
1843 void RenderWidget::GetCompositionCharacterBounds( 1841 void RenderWidget::GetCompositionCharacterBounds(
1844 std::vector<gfx::Rect>* bounds) { 1842 std::vector<gfx::Rect>* bounds) {
1845 DCHECK(bounds); 1843 DCHECK(bounds);
1846 bounds->clear(); 1844 bounds->clear();
1847 } 1845 }
1848 1846
1849 bool RenderWidget::CanComposeInline() { 1847 bool RenderWidget::CanComposeInline() {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 bool RenderWidget::WillHandleGestureEvent( 1960 bool RenderWidget::WillHandleGestureEvent(
1963 const WebKit::WebGestureEvent& event) { 1961 const WebKit::WebGestureEvent& event) {
1964 return false; 1962 return false;
1965 } 1963 }
1966 1964
1967 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const { 1965 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
1968 return false; 1966 return false;
1969 } 1967 }
1970 1968
1971 } // namespace content 1969 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698