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

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 408883003: Remove shouldUseInputMethod (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove shouldUseInputMethod completely Created 6 years, 5 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
« no previous file with comments | « Source/core/html/forms/TextFieldInputType.cpp ('k') | 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 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 2244 matching lines...) Expand 10 before | Expand all | Expand 10 after
2255 return WebTextInputTypeTextArea; 2255 return WebTextInputTypeTextArea;
2256 } 2256 }
2257 2257
2258 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) 2258 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
2259 if (element->isHTMLElement()) { 2259 if (element->isHTMLElement()) {
2260 if (toHTMLElement(element)->isDateTimeFieldElement()) 2260 if (toHTMLElement(element)->isDateTimeFieldElement())
2261 return WebTextInputTypeDateTimeField; 2261 return WebTextInputTypeDateTimeField;
2262 } 2262 }
2263 #endif 2263 #endif
2264 2264
2265 if (element->shouldUseInputMethod()) 2265 if (element->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable))
2266 return WebTextInputTypeContentEditable; 2266 return WebTextInputTypeContentEditable;
2267 2267
2268 return WebTextInputTypeNone; 2268 return WebTextInputTypeNone;
2269 } 2269 }
2270 2270
2271 WebString WebViewImpl::inputModeOfFocusedElement() 2271 WebString WebViewImpl::inputModeOfFocusedElement()
2272 { 2272 {
2273 if (!RuntimeEnabledFeatures::inputModeAttributeEnabled()) 2273 if (!RuntimeEnabledFeatures::inputModeAttributeEnabled())
2274 return WebString(); 2274 return WebString();
2275 2275
(...skipping 1977 matching lines...) Expand 10 before | Expand all | Expand 10 after
4253 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4253 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4254 4254
4255 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4255 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4256 return false; 4256 return false;
4257 4257
4258 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4258 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4259 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4259 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4260 } 4260 }
4261 4261
4262 } // namespace blink 4262 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/forms/TextFieldInputType.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698