| OLD | NEW |
| 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 "webkit/glue/webkitplatformsupport_impl.h" | 5 #include "webkit/glue/webkitplatformsupport_impl.h" |
| 6 | 6 |
| 7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <malloc.h> | 8 #include <malloc.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 111 |
| 112 base::Lock lock_; | 112 base::Lock lock_; |
| 113 }; | 113 }; |
| 114 | 114 |
| 115 } // anonymous namespace | 115 } // anonymous namespace |
| 116 | 116 |
| 117 namespace webkit_glue { | 117 namespace webkit_glue { |
| 118 | 118 |
| 119 static int ToMessageID(WebLocalizedString::Name name) { | 119 static int ToMessageID(WebLocalizedString::Name name) { |
| 120 switch (name) { | 120 switch (name) { |
| 121 case WebLocalizedString::SubmitButtonDefaultLabel: | 121 case WebLocalizedString::AXButtonActionVerb: |
| 122 return IDS_FORM_SUBMIT_LABEL; | 122 return IDS_AX_BUTTON_ACTION_VERB; |
| 123 case WebLocalizedString::InputElementAltText: | 123 case WebLocalizedString::AXCheckedCheckBoxActionVerb: |
| 124 return IDS_FORM_INPUT_ALT; | 124 return IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB; |
| 125 case WebLocalizedString::ResetButtonDefaultLabel: | 125 case WebLocalizedString::AXHeadingText: |
| 126 return IDS_FORM_RESET_LABEL; | 126 return IDS_AX_ROLE_HEADING; |
| 127 case WebLocalizedString::AXImageMapText: |
| 128 return IDS_AX_ROLE_IMAGE_MAP; |
| 129 case WebLocalizedString::AXLinkActionVerb: |
| 130 return IDS_AX_LINK_ACTION_VERB; |
| 131 case WebLocalizedString::AXLinkText: |
| 132 return IDS_AX_ROLE_LINK; |
| 133 case WebLocalizedString::AXListMarkerText: |
| 134 return IDS_AX_ROLE_LIST_MARKER; |
| 135 case WebLocalizedString::AXRadioButtonActionVerb: |
| 136 return IDS_AX_RADIO_BUTTON_ACTION_VERB; |
| 137 case WebLocalizedString::AXTextFieldActionVerb: |
| 138 return IDS_AX_TEXT_FIELD_ACTION_VERB; |
| 139 case WebLocalizedString::AXUncheckedCheckBoxActionVerb: |
| 140 return IDS_AX_UNCHECKED_CHECK_BOX_ACTION_VERB; |
| 141 case WebLocalizedString::AXWebAreaText: |
| 142 return IDS_AX_ROLE_WEB_AREA; |
| 143 case WebLocalizedString::DetailsLabel: |
| 144 return IDS_DETAILS_WITHOUT_SUMMARY_LABEL; |
| 127 case WebLocalizedString::FileButtonChooseFileLabel: | 145 case WebLocalizedString::FileButtonChooseFileLabel: |
| 128 return IDS_FORM_FILE_BUTTON_LABEL; | 146 return IDS_FORM_FILE_BUTTON_LABEL; |
| 129 case WebLocalizedString::FileButtonChooseMultipleFilesLabel: | 147 case WebLocalizedString::FileButtonChooseMultipleFilesLabel: |
| 130 return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL; | 148 return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL; |
| 131 case WebLocalizedString::FileButtonNoFileSelectedLabel: | 149 case WebLocalizedString::FileButtonNoFileSelectedLabel: |
| 132 return IDS_FORM_FILE_NO_FILE_LABEL; | 150 return IDS_FORM_FILE_NO_FILE_LABEL; |
| 151 case WebLocalizedString::InputElementAltText: |
| 152 return IDS_FORM_INPUT_ALT; |
| 153 case WebLocalizedString::KeygenMenuHighGradeKeySize: |
| 154 return IDS_KEYGEN_HIGH_GRADE_KEY; |
| 155 case WebLocalizedString::KeygenMenuMediumGradeKeySize: |
| 156 return IDS_KEYGEN_MED_GRADE_KEY; |
| 157 case WebLocalizedString::MissingPluginText: |
| 158 return IDS_PLUGIN_INITIALIZATION_ERROR; |
| 133 case WebLocalizedString::MultipleFileUploadText: | 159 case WebLocalizedString::MultipleFileUploadText: |
| 134 return IDS_FORM_FILE_MULTIPLE_UPLOAD; | 160 return IDS_FORM_FILE_MULTIPLE_UPLOAD; |
| 135 case WebLocalizedString::DetailsLabel: | 161 case WebLocalizedString::ResetButtonDefaultLabel: |
| 136 return IDS_DETAILS_WITHOUT_SUMMARY_LABEL; | 162 return IDS_FORM_RESET_LABEL; |
| 137 case WebLocalizedString::SearchableIndexIntroduction: | 163 case WebLocalizedString::SearchableIndexIntroduction: |
| 138 return IDS_SEARCHABLE_INDEX_INTRO; | 164 return IDS_SEARCHABLE_INDEX_INTRO; |
| 165 case WebLocalizedString::SearchMenuClearRecentSearchesText: |
| 166 return IDS_RECENT_SEARCHES_CLEAR; |
| 139 case WebLocalizedString::SearchMenuNoRecentSearchesText: | 167 case WebLocalizedString::SearchMenuNoRecentSearchesText: |
| 140 return IDS_RECENT_SEARCHES_NONE; | 168 return IDS_RECENT_SEARCHES_NONE; |
| 141 case WebLocalizedString::SearchMenuRecentSearchesText: | 169 case WebLocalizedString::SearchMenuRecentSearchesText: |
| 142 return IDS_RECENT_SEARCHES; | 170 return IDS_RECENT_SEARCHES; |
| 143 case WebLocalizedString::SearchMenuClearRecentSearchesText: | 171 case WebLocalizedString::SubmitButtonDefaultLabel: |
| 144 return IDS_RECENT_SEARCHES_CLEAR; | 172 return IDS_FORM_SUBMIT_LABEL; |
| 145 case WebLocalizedString::AXWebAreaText: | 173 case WebLocalizedString::ValidationPatternMismatch: |
| 146 return IDS_AX_ROLE_WEB_AREA; | 174 return IDS_FORM_VALIDATION_PATTERN_MISMATCH; |
| 147 case WebLocalizedString::AXLinkText: | 175 case WebLocalizedString::ValidationRangeOverflow: |
| 148 return IDS_AX_ROLE_LINK; | 176 return IDS_FORM_VALIDATION_RANGE_OVERFLOW; |
| 149 case WebLocalizedString::AXListMarkerText: | 177 case WebLocalizedString::ValidationRangeUnderflow: |
| 150 return IDS_AX_ROLE_LIST_MARKER; | 178 return IDS_FORM_VALIDATION_RANGE_UNDERFLOW; |
| 151 case WebLocalizedString::AXImageMapText: | 179 case WebLocalizedString::ValidationStepMismatch: |
| 152 return IDS_AX_ROLE_IMAGE_MAP; | 180 return IDS_FORM_VALIDATION_STEP_MISMATCH; |
| 153 case WebLocalizedString::AXHeadingText: | 181 case WebLocalizedString::ValidationTooLong: |
| 154 return IDS_AX_ROLE_HEADING; | 182 return IDS_FORM_VALIDATION_TOO_LONG; |
| 155 case WebLocalizedString::AXButtonActionVerb: | 183 case WebLocalizedString::ValidationTypeMismatch: |
| 156 return IDS_AX_BUTTON_ACTION_VERB; | 184 return IDS_FORM_VALIDATION_TYPE_MISMATCH; |
| 157 case WebLocalizedString::AXRadioButtonActionVerb: | 185 case WebLocalizedString::ValidationTypeMismatchForEmail: |
| 158 return IDS_AX_RADIO_BUTTON_ACTION_VERB; | 186 return IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL; |
| 159 case WebLocalizedString::AXTextFieldActionVerb: | 187 case WebLocalizedString::ValidationTypeMismatchForMultipleEmail: |
| 160 return IDS_AX_TEXT_FIELD_ACTION_VERB; | 188 return IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL; |
| 161 case WebLocalizedString::AXCheckedCheckBoxActionVerb: | 189 case WebLocalizedString::ValidationTypeMismatchForURL: |
| 162 return IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB; | 190 return IDS_FORM_VALIDATION_TYPE_MISMATCH_URL; |
| 163 case WebLocalizedString::AXUncheckedCheckBoxActionVerb: | |
| 164 return IDS_AX_UNCHECKED_CHECK_BOX_ACTION_VERB; | |
| 165 case WebLocalizedString::AXLinkActionVerb: | |
| 166 return IDS_AX_LINK_ACTION_VERB; | |
| 167 case WebLocalizedString::KeygenMenuHighGradeKeySize: | |
| 168 return IDS_KEYGEN_HIGH_GRADE_KEY; | |
| 169 case WebLocalizedString::KeygenMenuMediumGradeKeySize: | |
| 170 return IDS_KEYGEN_MED_GRADE_KEY; | |
| 171 case WebLocalizedString::ValidationValueMissing: | 191 case WebLocalizedString::ValidationValueMissing: |
| 172 return IDS_FORM_VALIDATION_VALUE_MISSING; | 192 return IDS_FORM_VALIDATION_VALUE_MISSING; |
| 173 case WebLocalizedString::ValidationValueMissingForCheckbox: | 193 case WebLocalizedString::ValidationValueMissingForCheckbox: |
| 174 return IDS_FORM_VALIDATION_VALUE_MISSING_CHECKBOX; | 194 return IDS_FORM_VALIDATION_VALUE_MISSING_CHECKBOX; |
| 175 case WebLocalizedString::ValidationValueMissingForFile: | 195 case WebLocalizedString::ValidationValueMissingForFile: |
| 176 return IDS_FORM_VALIDATION_VALUE_MISSING_FILE; | 196 return IDS_FORM_VALIDATION_VALUE_MISSING_FILE; |
| 177 case WebLocalizedString::ValidationValueMissingForMultipleFile: | 197 case WebLocalizedString::ValidationValueMissingForMultipleFile: |
| 178 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE; | 198 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE; |
| 179 case WebLocalizedString::ValidationValueMissingForRadio: | 199 case WebLocalizedString::ValidationValueMissingForRadio: |
| 180 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO; | 200 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO; |
| 181 case WebLocalizedString::ValidationValueMissingForSelect: | 201 case WebLocalizedString::ValidationValueMissingForSelect: |
| 182 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT; | 202 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT; |
| 183 case WebLocalizedString::ValidationTypeMismatch: | |
| 184 return IDS_FORM_VALIDATION_TYPE_MISMATCH; | |
| 185 case WebLocalizedString::ValidationTypeMismatchForEmail: | |
| 186 return IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL; | |
| 187 case WebLocalizedString::ValidationTypeMismatchForMultipleEmail: | |
| 188 return IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL; | |
| 189 case WebLocalizedString::ValidationTypeMismatchForURL: | |
| 190 return IDS_FORM_VALIDATION_TYPE_MISMATCH_URL; | |
| 191 case WebLocalizedString::ValidationPatternMismatch: | |
| 192 return IDS_FORM_VALIDATION_PATTERN_MISMATCH; | |
| 193 case WebLocalizedString::ValidationTooLong: | |
| 194 return IDS_FORM_VALIDATION_TOO_LONG; | |
| 195 case WebLocalizedString::ValidationRangeUnderflow: | |
| 196 return IDS_FORM_VALIDATION_RANGE_UNDERFLOW; | |
| 197 case WebLocalizedString::ValidationRangeOverflow: | |
| 198 return IDS_FORM_VALIDATION_RANGE_OVERFLOW; | |
| 199 case WebLocalizedString::ValidationStepMismatch: | |
| 200 return IDS_FORM_VALIDATION_STEP_MISMATCH; | |
| 201 // This "default:" line exists to avoid compile warnings about enum | 203 // This "default:" line exists to avoid compile warnings about enum |
| 202 // coverage when we add a new symbol to WebLocalizedString.h in WebKit. | 204 // coverage when we add a new symbol to WebLocalizedString.h in WebKit. |
| 203 // After a planned WebKit patch is landed, we need to add a case statement | 205 // After a planned WebKit patch is landed, we need to add a case statement |
| 204 // for the added symbol here. | 206 // for the added symbol here. |
| 205 default: | 207 default: |
| 206 break; | 208 break; |
| 207 } | 209 } |
| 208 return -1; | 210 return -1; |
| 209 } | 211 } |
| 210 | 212 |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 706 worker_task_runner->OnWorkerRunLoopStarted(runLoop); | 708 worker_task_runner->OnWorkerRunLoopStarted(runLoop); |
| 707 } | 709 } |
| 708 | 710 |
| 709 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( | 711 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( |
| 710 const WebKit::WebWorkerRunLoop& runLoop) { | 712 const WebKit::WebWorkerRunLoop& runLoop) { |
| 711 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); | 713 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); |
| 712 worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 714 worker_task_runner->OnWorkerRunLoopStopped(runLoop); |
| 713 } | 715 } |
| 714 | 716 |
| 715 } // namespace webkit_glue | 717 } // namespace webkit_glue |
| OLD | NEW |