Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.h - Issue 12159003: Merge 141195

Side by Side Diff: Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.h

Issue 12159003: Merge 141195 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 10 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:

« no previous file with comments | « Source/WebCore/css/html.css ('k') | Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2010 Google Inc. All rights reserved.	2 * Copyright (C) 2010 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 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 virtual bool hasBadInput() const OVERRIDE;	85 virtual bool hasBadInput() const OVERRIDE;

86 virtual bool hasCustomFocusLogic() const OVERRIDE FINAL;	86 virtual bool hasCustomFocusLogic() const OVERRIDE FINAL;

87 virtual bool isKeyboardFocusable(KeyboardEvent*) const OVERRIDE FINAL;	87 virtual bool isKeyboardFocusable(KeyboardEvent*) const OVERRIDE FINAL;

88 virtual bool isMouseFocusable() const OVERRIDE FINAL;	88 virtual bool isMouseFocusable() const OVERRIDE FINAL;

89 virtual bool isTextField() const OVERRIDE FINAL;	89 virtual bool isTextField() const OVERRIDE FINAL;

90 virtual void minOrMaxAttributeChanged() OVERRIDE FINAL;	90 virtual void minOrMaxAttributeChanged() OVERRIDE FINAL;

91 virtual void readonlyAttributeChanged() OVERRIDE FINAL;	91 virtual void readonlyAttributeChanged() OVERRIDE FINAL;

92 virtual void restoreFormControlState(const FormControlState&) OVERRIDE FINAL ;	92 virtual void restoreFormControlState(const FormControlState&) OVERRIDE FINAL ;

93 virtual FormControlState saveFormControlState() const OVERRIDE FINAL;	93 virtual FormControlState saveFormControlState() const OVERRIDE FINAL;

94 virtual void setValue(const String&, bool valueChanged, TextFieldEventBehavi or) OVERRIDE FINAL;	94 virtual void setValue(const String&, bool valueChanged, TextFieldEventBehavi or) OVERRIDE FINAL;

	95 virtual bool shouldApplyLocaleDirection() const OVERRIDE;

95 virtual bool shouldUseInputMethod() const OVERRIDE FINAL;	96 virtual bool shouldUseInputMethod() const OVERRIDE FINAL;

96 virtual void stepAttributeChanged() OVERRIDE FINAL;	97 virtual void stepAttributeChanged() OVERRIDE FINAL;

97 virtual void updateInnerTextValue() OVERRIDE FINAL;	98 virtual void updateInnerTextValue() OVERRIDE FINAL;

98 virtual void listAttributeTargetChanged() OVERRIDE FINAL;	99 virtual void listAttributeTargetChanged() OVERRIDE FINAL;

99	100

100 void showPickerIndicator();	101 void showPickerIndicator();

101 void hidePickerIndicator();	102 void hidePickerIndicator();

102 void updatePickerIndicatorVisibility();	103 void updatePickerIndicatorVisibility();

103	104

104 DateTimeEditElement* m_dateTimeEditElement;	105 DateTimeEditElement* m_dateTimeEditElement;

105 SpinButtonElement* m_spinButtonElement;	106 SpinButtonElement* m_spinButtonElement;

106 PickerIndicatorElement* m_pickerIndicatorElement;	107 PickerIndicatorElement* m_pickerIndicatorElement;

107 bool m_pickerIndicatorIsVisible;	108 bool m_pickerIndicatorIsVisible;

108 bool m_pickerIndicatorIsAlwaysVisible;	109 bool m_pickerIndicatorIsAlwaysVisible;

109 };	110 };

110	111

111 } // namespace WebCore	112 } // namespace WebCore

112	113

113 #endif	114 #endif

114 #endif // TimeInputType_h	115 #endif // TimeInputType_h

OLD	NEW