| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/child/blink_platform_impl.h" | 5 #include "content/child/blink_platform_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 873 ui::SCALE_FACTOR_NONE }, | 873 ui::SCALE_FACTOR_NONE }, |
| 874 { "PluginPlaceholderElement.js", | 874 { "PluginPlaceholderElement.js", |
| 875 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS, ui::SCALE_FACTOR_NONE }, | 875 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS, ui::SCALE_FACTOR_NONE }, |
| 876 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, | 876 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, |
| 877 ui::SCALE_FACTOR_NONE }, | 877 ui::SCALE_FACTOR_NONE }, |
| 878 #ifdef IDR_PICKER_COMMON_JS | 878 #ifdef IDR_PICKER_COMMON_JS |
| 879 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, | 879 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, |
| 880 { "pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE }, | 880 { "pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE }, |
| 881 { "calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE }, | 881 { "calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
| 882 { "calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE }, | 882 { "calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
| 883 { "listPicker.js", IDR_LIST_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
| 884 { "listPicker.css", IDR_LIST_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
| 883 { "pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE }, | 885 { "pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE }, |
| 884 { "suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, | 886 { "suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
| 885 { "suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, | 887 { "suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
| 886 { "colorSuggestionPicker.js", | 888 { "colorSuggestionPicker.js", |
| 887 IDR_COLOR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, | 889 IDR_COLOR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
| 888 { "colorSuggestionPicker.css", | 890 { "colorSuggestionPicker.css", |
| 889 IDR_COLOR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, | 891 IDR_COLOR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
| 890 #endif | 892 #endif |
| 891 }; | 893 }; |
| 892 | 894 |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1235 } | 1237 } |
| 1236 | 1238 |
| 1237 // static | 1239 // static |
| 1238 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { | 1240 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { |
| 1239 WebThreadImplForMessageLoop* impl = | 1241 WebThreadImplForMessageLoop* impl = |
| 1240 static_cast<WebThreadImplForMessageLoop*>(thread); | 1242 static_cast<WebThreadImplForMessageLoop*>(thread); |
| 1241 delete impl; | 1243 delete impl; |
| 1242 } | 1244 } |
| 1243 | 1245 |
| 1244 } // namespace content | 1246 } // namespace content |
| OLD | NEW |