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

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

Issue 2445383003: Revert "Simplify handling of text input types in RenderWidget." (Closed)
Patch Set: Created 4 years, 1 month 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 | « content/renderer/render_widget.cc ('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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 if (type == InputTypeNames::search) 699 if (type == InputTypeNames::search)
700 return WebTextInputTypeSearch; 700 return WebTextInputTypeSearch;
701 if (type == InputTypeNames::email) 701 if (type == InputTypeNames::email)
702 return WebTextInputTypeEmail; 702 return WebTextInputTypeEmail;
703 if (type == InputTypeNames::number) 703 if (type == InputTypeNames::number)
704 return WebTextInputTypeNumber; 704 return WebTextInputTypeNumber;
705 if (type == InputTypeNames::tel) 705 if (type == InputTypeNames::tel)
706 return WebTextInputTypeTelephone; 706 return WebTextInputTypeTelephone;
707 if (type == InputTypeNames::url) 707 if (type == InputTypeNames::url)
708 return WebTextInputTypeURL; 708 return WebTextInputTypeURL;
709 if (type == InputTypeNames::date)
710 return WebTextInputTypeDate;
711 if (type == InputTypeNames::datetime_local)
712 return WebTextInputTypeDateTimeLocal;
713 if (type == InputTypeNames::month)
714 return WebTextInputTypeMonth;
715 if (type == InputTypeNames::time)
716 return WebTextInputTypeTime;
717 if (type == InputTypeNames::week)
718 return WebTextInputTypeWeek;
709 if (type == InputTypeNames::text) 719 if (type == InputTypeNames::text)
710 return WebTextInputTypeText; 720 return WebTextInputTypeText;
711 721
712 return WebTextInputTypeNone; 722 return WebTextInputTypeNone;
713 } 723 }
714 724
715 if (isHTMLTextAreaElement(*element)) { 725 if (isHTMLTextAreaElement(*element)) {
716 if (toHTMLTextAreaElement(*element).isDisabledOrReadOnly()) 726 if (toHTMLTextAreaElement(*element).isDisabledOrReadOnly())
717 return WebTextInputTypeNone; 727 return WebTextInputTypeNone;
718 return WebTextInputTypeTextArea; 728 return WebTextInputTypeTextArea;
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
1522 return flags; 1532 return flags;
1523 } 1533 }
1524 1534
1525 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const { 1535 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
1526 if (!m_imeAcceptEvents) 1536 if (!m_imeAcceptEvents)
1527 return nullptr; 1537 return nullptr;
1528 return focusedLocalFrameInWidget(); 1538 return focusedLocalFrameInWidget();
1529 } 1539 }
1530 1540
1531 } // namespace blink 1541 } // namespace blink
OLDNEW
« no previous file with comments | « content/renderer/render_widget.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698