Changeset 128149 in webkit
- Timestamp:
- Sep 10, 2012 10:44:07 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 added
- 35 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r128143 r128149 1421 1421 html/ImageInputType.cpp 1422 1422 html/InputType.cpp 1423 html/InputTypeNames.cpp 1423 1424 html/LabelableElement.cpp 1424 1425 html/LabelsNodeList.cpp -
trunk/Source/WebCore/ChangeLog
r128148 r128149 1 2012-09-10 Keishi Hattori <keishi@webkit.org> 2 3 Move InputTypeNames to a separate file 4 https://bugs.webkit.org/show_bug.cgi?id=96255 5 6 Reviewed by Kent Tamura. 7 8 We want to move InputTypeNames to a separate file so we can use it without including InputType.h. 9 10 No new tests. No behavior change. 11 12 * CMakeLists.txt: 13 * GNUmakefile.list.am: 14 * Target.pri: 15 * WebCore.gypi: 16 * WebCore.vcproj/WebCore.vcproj: 17 * WebCore.xcodeproj/project.pbxproj: 18 * html/ButtonInputType.cpp: 19 * html/CheckboxInputType.cpp: 20 * html/ColorInputType.cpp: 21 * html/DateInputType.cpp: 22 * html/DateTimeInputType.cpp: 23 * html/DateTimeLocalInputType.cpp: 24 * html/EmailInputType.cpp: 25 * html/FileInputType.cpp: 26 * html/HiddenInputType.cpp: 27 * html/ImageInputType.cpp: 28 * html/InputType.cpp: 29 * html/InputType.h: 30 * html/InputTypeNames.cpp: Added. 31 (WebCore): 32 (InputTypeNames): 33 (WebCore::InputTypeNames::button): 34 (WebCore::InputTypeNames::checkbox): 35 (WebCore::InputTypeNames::color): 36 (WebCore::InputTypeNames::date): 37 (WebCore::InputTypeNames::datetime): 38 (WebCore::InputTypeNames::datetimelocal): 39 (WebCore::InputTypeNames::email): 40 (WebCore::InputTypeNames::file): 41 (WebCore::InputTypeNames::hidden): 42 (WebCore::InputTypeNames::image): 43 (WebCore::InputTypeNames::month): 44 (WebCore::InputTypeNames::number): 45 (WebCore::InputTypeNames::password): 46 (WebCore::InputTypeNames::radio): 47 (WebCore::InputTypeNames::range): 48 (WebCore::InputTypeNames::reset): 49 (WebCore::InputTypeNames::search): 50 (WebCore::InputTypeNames::submit): 51 (WebCore::InputTypeNames::telephone): 52 (WebCore::InputTypeNames::text): 53 (WebCore::InputTypeNames::time): 54 (WebCore::InputTypeNames::url): 55 (WebCore::InputTypeNames::week): 56 * html/InputTypeNames.h: Added. 57 (WebCore): 58 (InputTypeNames): 59 * html/MonthInputType.cpp: 60 * html/NumberInputType.cpp: 61 * html/PasswordInputType.cpp: 62 * html/RadioInputType.cpp: 63 * html/RangeInputType.cpp: 64 * html/ResetInputType.cpp: 65 * html/SearchInputType.cpp: 66 * html/SubmitInputType.cpp: 67 * html/TelephoneInputType.cpp: 68 * html/TextInputType.cpp: 69 * html/TimeInputType.cpp: 70 * html/URLInputType.cpp: 71 * html/WeekInputType.cpp: 72 * html/parser/HTMLPreloadScanner.cpp: 73 * platform/efl/RenderThemeEfl.cpp: 74 * rendering/RenderThemeChromiumCommon.cpp: 75 1 76 2012-09-10 Yoshifumi Inoue <yosin@chromium.org> 2 77 -
trunk/Source/WebCore/GNUmakefile.list.am
r128083 r128149 3435 3435 Source/WebCore/html/InputType.cpp \ 3436 3436 Source/WebCore/html/InputType.h \ 3437 Source/WebCore/html/InputTypeNames.cpp \ 3438 Source/WebCore/html/InputTypeNames.h \ 3437 3439 Source/WebCore/html/LabelableElement.cpp \ 3438 3440 Source/WebCore/html/LabelableElement.h \ -
trunk/Source/WebCore/Target.pri
r128083 r128149 663 663 html/ImageInputType.cpp \ 664 664 html/InputType.cpp \ 665 html/InputTypeNames.cpp \ 665 666 html/LabelableElement.cpp \ 666 667 html/LabelsNodeList.cpp \ -
trunk/Source/WebCore/WebCore.gypi
r128147 r128149 4208 4208 'html/ImageInputType.h', 4209 4209 'html/InputType.cpp', 4210 'html/InputTypeNames.cpp', 4211 'html/InputTypeNames.h', 4210 4212 'html/LabelableElement.cpp', 4211 4213 'html/LabelsNodeList.cpp', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r128083 r128149 63614 63614 RelativePath="..\html\InputType.h" 63615 63615 > 63616 </File> 63617 <File 63618 RelativePath="..\html\InputTypeNames.cpp" 63619 > 63620 </File> 63621 <File 63622 RelativePath="..\html\InputTypeNames.h" 63623 > 63616 63624 </File> 63617 63625 <File -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r128147 r128149 5775 5775 C33EE5C414FB49610002095A /* BaseClickableWithKeyInputType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C33EE5C214FB49610002095A /* BaseClickableWithKeyInputType.cpp */; }; 5776 5776 C33EE5C514FB49610002095A /* BaseClickableWithKeyInputType.h in Headers */ = {isa = PBXBuildFile; fileRef = C33EE5C314FB49610002095A /* BaseClickableWithKeyInputType.h */; }; 5777 C348612315FDE21E007A1CC9 /* InputTypeNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C348612115FDE21E007A1CC9 /* InputTypeNames.cpp */; }; 5778 C348612415FDE21E007A1CC9 /* InputTypeNames.h in Headers */ = {isa = PBXBuildFile; fileRef = C348612215FDE21E007A1CC9 /* InputTypeNames.h */; }; 5777 5779 C37CDEBD149EF2030042090D /* ColorChooserClient.h in Headers */ = {isa = PBXBuildFile; fileRef = C37CDEBC149EF2030042090D /* ColorChooserClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5778 5780 C3CF17A415B0063F00276D39 /* IdTargetObserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3CF17A015B0063F00276D39 /* IdTargetObserver.cpp */; }; … … 13098 13100 C33EE5C214FB49610002095A /* BaseClickableWithKeyInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseClickableWithKeyInputType.cpp; sourceTree = "<group>"; }; 13099 13101 C33EE5C314FB49610002095A /* BaseClickableWithKeyInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseClickableWithKeyInputType.h; sourceTree = "<group>"; }; 13102 C348612115FDE21E007A1CC9 /* InputTypeNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InputTypeNames.cpp; sourceTree = "<group>"; }; 13103 C348612215FDE21E007A1CC9 /* InputTypeNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputTypeNames.h; sourceTree = "<group>"; }; 13100 13104 C37CDEBC149EF2030042090D /* ColorChooserClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorChooserClient.h; sourceTree = "<group>"; }; 13101 13105 C3CF17A015B0063F00276D39 /* IdTargetObserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IdTargetObserver.cpp; sourceTree = "<group>"; }; … … 17648 17652 37E3524A12450C5200BAF5D9 /* InputType.cpp */, 17649 17653 37E3524C12450C6600BAF5D9 /* InputType.h */, 17654 C348612115FDE21E007A1CC9 /* InputTypeNames.cpp */, 17655 C348612215FDE21E007A1CC9 /* InputTypeNames.h */, 17650 17656 450CEBEE15073BBE002BB149 /* LabelableElement.cpp */, 17651 17657 450CEBEF15073BBE002BB149 /* LabelableElement.h */, … … 23734 23740 BCEA485A097D93020094C9E4 /* InlineTextBox.h in Headers */, 23735 23741 37E3524D12450C6600BAF5D9 /* InputType.h in Headers */, 23742 C348612415FDE21E007A1CC9 /* InputTypeNames.h in Headers */, 23736 23743 93309DEA099E64920056E581 /* InsertIntoTextNodeCommand.h in Headers */, 23737 23744 57CF497514EE36D700ECFF14 /* InsertionPoint.h in Headers */, … … 26931 26938 BCEA4859097D93020094C9E4 /* InlineTextBox.cpp in Sources */, 26932 26939 37E3524B12450C5200BAF5D9 /* InputType.cpp in Sources */, 26940 C348612315FDE21E007A1CC9 /* InputTypeNames.cpp in Sources */, 26933 26941 93309DE9099E64920056E581 /* InsertIntoTextNodeCommand.cpp in Sources */, 26934 26942 57CF497414EE36D700ECFF14 /* InsertionPoint.cpp in Sources */, -
trunk/Source/WebCore/html/ButtonInputType.cpp
r95901 r128149 32 32 #include "ButtonInputType.h" 33 33 34 #include "InputTypeNames.h" 34 35 #include <wtf/PassOwnPtr.h> 35 36 -
trunk/Source/WebCore/html/CheckboxInputType.cpp
r107555 r128149 34 34 35 35 #include "HTMLInputElement.h" 36 #include "InputTypeNames.h" 36 37 #include "KeyboardEvent.h" 37 38 #include "LocalizedStrings.h" -
trunk/Source/WebCore/html/ColorInputType.cpp
r128006 r128149 40 40 #include "HTMLInputElement.h" 41 41 #include "HTMLOptionElement.h" 42 #include "InputTypeNames.h" 42 43 #include "MouseEvent.h" 43 44 #include "RenderObject.h" -
trunk/Source/WebCore/html/DateInputType.cpp
r125886 r128149 36 36 #include "HTMLInputElement.h" 37 37 #include "HTMLNames.h" 38 #include "InputTypeNames.h" 38 39 #include "KeyboardEvent.h" 39 40 #include "LocalizedDate.h" -
trunk/Source/WebCore/html/DateTimeInputType.cpp
r120313 r128149 35 35 #include "HTMLInputElement.h" 36 36 #include "HTMLNames.h" 37 #include "InputTypeNames.h" 37 38 #include <wtf/CurrentTime.h> 38 39 #include <wtf/PassOwnPtr.h> -
trunk/Source/WebCore/html/DateTimeLocalInputType.cpp
r120313 r128149 35 35 #include "HTMLInputElement.h" 36 36 #include "HTMLNames.h" 37 #include "InputTypeNames.h" 37 38 #include <wtf/PassOwnPtr.h> 38 39 -
trunk/Source/WebCore/html/EmailInputType.cpp
r116757 r128149 27 27 #include "HTMLInputElement.h" 28 28 #include "HTMLParserIdioms.h" 29 #include "InputTypeNames.h" 29 30 #include "LocalizedStrings.h" 30 31 #include "RegularExpression.h" -
trunk/Source/WebCore/html/FileInputType.cpp
r125759 r128149 36 36 #include "HTMLNames.h" 37 37 #include "Icon.h" 38 #include "InputTypeNames.h" 38 39 #include "LocalizedStrings.h" 39 40 #include "RenderFileUploadControl.h" -
trunk/Source/WebCore/html/HiddenInputType.cpp
r121519 r128149 37 37 #include "HTMLInputElement.h" 38 38 #include "HTMLNames.h" 39 #include "InputTypeNames.h" 39 40 #include <wtf/PassOwnPtr.h> 40 41 -
trunk/Source/WebCore/html/ImageInputType.cpp
r126968 r128149 30 30 #include "HTMLNames.h" 31 31 #include "HTMLParserIdioms.h" 32 #include "InputTypeNames.h" 32 33 #include "MouseEvent.h" 33 34 #include "RenderImage.h" -
trunk/Source/WebCore/html/InputType.cpp
r127525 r128149 52 52 #include "HiddenInputType.h" 53 53 #include "ImageInputType.h" 54 #include "InputTypeNames.h" 54 55 #include "KeyboardEvent.h" 55 56 #include "LocalizedStrings.h" … … 1114 1115 } 1115 1116 1116 namespace InputTypeNames {1117 1118 // The type names must be lowercased because they will be the return values of1119 // input.type and input.type must be lowercase according to DOM Level 2.1120 1121 const AtomicString& button()1122 {1123 DEFINE_STATIC_LOCAL(AtomicString, name, ("button", AtomicString::ConstructFromLiteral));1124 return name;1125 }1126 1127 const AtomicString& checkbox()1128 {1129 DEFINE_STATIC_LOCAL(AtomicString, name, ("checkbox", AtomicString::ConstructFromLiteral));1130 return name;1131 }1132 1133 #if ENABLE(INPUT_TYPE_COLOR)1134 const AtomicString& color()1135 {1136 DEFINE_STATIC_LOCAL(AtomicString, name, ("color", AtomicString::ConstructFromLiteral));1137 return name;1138 }1139 #endif1140 1141 const AtomicString& date()1142 {1143 DEFINE_STATIC_LOCAL(AtomicString, name, ("date", AtomicString::ConstructFromLiteral));1144 return name;1145 }1146 1147 const AtomicString& datetime()1148 {1149 DEFINE_STATIC_LOCAL(AtomicString, name, ("datetime", AtomicString::ConstructFromLiteral));1150 return name;1151 }1152 1153 const AtomicString& datetimelocal()1154 {1155 DEFINE_STATIC_LOCAL(AtomicString, name, ("datetime-local", AtomicString::ConstructFromLiteral));1156 return name;1157 }1158 1159 const AtomicString& email()1160 {1161 DEFINE_STATIC_LOCAL(AtomicString, name, ("email", AtomicString::ConstructFromLiteral));1162 return name;1163 }1164 1165 const AtomicString& file()1166 {1167 DEFINE_STATIC_LOCAL(AtomicString, name, ("file", AtomicString::ConstructFromLiteral));1168 return name;1169 }1170 1171 const AtomicString& hidden()1172 {1173 DEFINE_STATIC_LOCAL(AtomicString, name, ("hidden", AtomicString::ConstructFromLiteral));1174 return name;1175 }1176 1177 const AtomicString& image()1178 {1179 DEFINE_STATIC_LOCAL(AtomicString, name, ("image", AtomicString::ConstructFromLiteral));1180 return name;1181 }1182 1183 const AtomicString& month()1184 {1185 DEFINE_STATIC_LOCAL(AtomicString, name, ("month", AtomicString::ConstructFromLiteral));1186 return name;1187 }1188 1189 const AtomicString& number()1190 {1191 DEFINE_STATIC_LOCAL(AtomicString, name, ("number", AtomicString::ConstructFromLiteral));1192 return name;1193 }1194 1195 const AtomicString& password()1196 {1197 DEFINE_STATIC_LOCAL(AtomicString, name, ("password", AtomicString::ConstructFromLiteral));1198 return name;1199 }1200 1201 const AtomicString& radio()1202 {1203 DEFINE_STATIC_LOCAL(AtomicString, name, ("radio", AtomicString::ConstructFromLiteral));1204 return name;1205 }1206 1207 const AtomicString& range()1208 {1209 DEFINE_STATIC_LOCAL(AtomicString, name, ("range", AtomicString::ConstructFromLiteral));1210 return name;1211 }1212 1213 const AtomicString& reset()1214 {1215 DEFINE_STATIC_LOCAL(AtomicString, name, ("reset", AtomicString::ConstructFromLiteral));1216 return name;1217 }1218 1219 const AtomicString& search()1220 {1221 DEFINE_STATIC_LOCAL(AtomicString, name, ("search", AtomicString::ConstructFromLiteral));1222 return name;1223 }1224 1225 const AtomicString& submit()1226 {1227 DEFINE_STATIC_LOCAL(AtomicString, name, ("submit", AtomicString::ConstructFromLiteral));1228 return name;1229 }1230 1231 const AtomicString& telephone()1232 {1233 DEFINE_STATIC_LOCAL(AtomicString, name, ("tel", AtomicString::ConstructFromLiteral));1234 return name;1235 }1236 1237 const AtomicString& text()1238 {1239 DEFINE_STATIC_LOCAL(AtomicString, name, ("text", AtomicString::ConstructFromLiteral));1240 return name;1241 }1242 1243 const AtomicString& time()1244 {1245 DEFINE_STATIC_LOCAL(AtomicString, name, ("time", AtomicString::ConstructFromLiteral));1246 return name;1247 }1248 1249 const AtomicString& url()1250 {1251 DEFINE_STATIC_LOCAL(AtomicString, name, ("url", AtomicString::ConstructFromLiteral));1252 return name;1253 }1254 1255 const AtomicString& week()1256 {1257 DEFINE_STATIC_LOCAL(AtomicString, name, ("week", AtomicString::ConstructFromLiteral));1258 return name;1259 }1260 1261 } // namespace WebCore::InputTypeNames1262 1117 } // namespace WebCore -
trunk/Source/WebCore/html/InputType.h
r127140 r128149 327 327 }; 328 328 329 namespace InputTypeNames {330 331 const AtomicString& button();332 const AtomicString& checkbox();333 #if ENABLE(INPUT_TYPE_COLOR)334 const AtomicString& color();335 #endif336 const AtomicString& date();337 const AtomicString& datetime();338 const AtomicString& datetimelocal();339 const AtomicString& email();340 const AtomicString& file();341 const AtomicString& hidden();342 const AtomicString& image();343 const AtomicString& month();344 const AtomicString& number();345 const AtomicString& password();346 const AtomicString& radio();347 const AtomicString& range();348 const AtomicString& reset();349 const AtomicString& search();350 const AtomicString& submit();351 const AtomicString& telephone();352 const AtomicString& text();353 const AtomicString& time();354 const AtomicString& url();355 const AtomicString& week();356 357 } // namespace WebCore::InputTypeNames358 359 329 } // namespace WebCore 360 330 -
trunk/Source/WebCore/html/MonthInputType.cpp
r122937 r128149 35 35 #include "HTMLInputElement.h" 36 36 #include "HTMLNames.h" 37 #include "InputTypeNames.h" 37 38 #include <wtf/CurrentTime.h> 38 39 #include <wtf/DateMath.h> -
trunk/Source/WebCore/html/NumberInputType.cpp
r125522 r128149 38 38 #include "HTMLNames.h" 39 39 #include "HTMLParserIdioms.h" 40 #include "InputTypeNames.h" 40 41 #include "KeyboardEvent.h" 41 42 #include "LocalizedNumber.h" -
trunk/Source/WebCore/html/PasswordInputType.cpp
r122414 r128149 35 35 #include "FormController.h" 36 36 #include "HTMLInputElement.h" 37 #include "InputTypeNames.h" 37 38 #include <wtf/Assertions.h> 38 39 #include <wtf/PassOwnPtr.h> -
trunk/Source/WebCore/html/RadioInputType.cpp
r120695 r128149 26 26 #include "HTMLInputElement.h" 27 27 #include "HTMLNames.h" 28 #include "InputTypeNames.h" 28 29 #include "KeyboardEvent.h" 29 30 #include "LocalizedStrings.h" -
trunk/Source/WebCore/html/RangeInputType.cpp
r127140 r128149 39 39 #include "HTMLNames.h" 40 40 #include "HTMLParserIdioms.h" 41 #include "InputTypeNames.h" 41 42 #include "KeyboardEvent.h" 42 43 #include "MouseEvent.h" -
trunk/Source/WebCore/html/ResetInputType.cpp
r99395 r128149 36 36 #include "HTMLFormElement.h" 37 37 #include "HTMLInputElement.h" 38 #include "InputTypeNames.h" 38 39 #include "LocalizedStrings.h" 39 40 #include <wtf/PassOwnPtr.h> -
trunk/Source/WebCore/html/SearchInputType.cpp
r125984 r128149 34 34 #include "HTMLInputElement.h" 35 35 #include "HTMLNames.h" 36 #include "InputTypeNames.h" 36 37 #include "KeyboardEvent.h" 37 38 #include "RenderSearchField.h" -
trunk/Source/WebCore/html/SubmitInputType.cpp
r99395 r128149 37 37 #include "HTMLFormElement.h" 38 38 #include "HTMLInputElement.h" 39 #include "InputTypeNames.h" 39 40 #include "LocalizedStrings.h" 40 41 #include <wtf/PassOwnPtr.h> -
trunk/Source/WebCore/html/TelephoneInputType.cpp
r95901 r128149 32 32 #include "TelephoneInputType.h" 33 33 34 #include "InputTypeNames.h" 34 35 #include <wtf/PassOwnPtr.h> 35 36 -
trunk/Source/WebCore/html/TextInputType.cpp
r95901 r128149 32 32 #include "TextInputType.h" 33 33 34 #include "InputTypeNames.h" 34 35 #include <wtf/PassOwnPtr.h> 35 36 -
trunk/Source/WebCore/html/TimeInputType.cpp
r127226 r128149 35 35 #include "HTMLInputElement.h" 36 36 #include "HTMLNames.h" 37 #include "InputTypeNames.h" 37 38 #include <wtf/CurrentTime.h> 38 39 #include <wtf/DateMath.h> -
trunk/Source/WebCore/html/URLInputType.cpp
r95901 r128149 33 33 34 34 #include "HTMLInputElement.h" 35 #include "InputTypeNames.h" 35 36 #include "LocalizedStrings.h" 36 37 #include "KURL.h" -
trunk/Source/WebCore/html/WeekInputType.cpp
r120313 r128149 35 35 #include "HTMLInputElement.h" 36 36 #include "HTMLNames.h" 37 #include "InputTypeNames.h" 37 38 #include <wtf/PassOwnPtr.h> 38 39 -
trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp
r123581 r128149 31 31 #include "CachedResourceLoader.h" 32 32 #include "Document.h" 33 #include "InputType.h"34 33 #include "HTMLDocumentParser.h" 35 34 #include "HTMLTokenizer.h" 36 35 #include "HTMLNames.h" 37 36 #include "HTMLParserIdioms.h" 37 #include "InputTypeNames.h" 38 38 #include "LinkRelAttribute.h" 39 39 #include "MediaList.h" -
trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp
r128049 r128149 32 32 #include "GraphicsContext.h" 33 33 #include "HTMLInputElement.h" 34 #include "InputType .h"34 #include "InputTypeNames.h" 35 35 #include "NotImplemented.h" 36 36 #include "Page.h" -
trunk/Source/WebCore/rendering/RenderThemeChromiumCommon.cpp
r125048 r128149 27 27 #include "RenderThemeChromiumCommon.h" 28 28 29 #include "InputType.h" 29 #include "FractionalLayoutUnit.h" 30 #include "InputTypeNames.h" 30 31 31 32 namespace WebCore {
Note: See TracChangeset
for help on using the changeset viewer.