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 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
820 IDR_INSPECTOR_INJECTED_SCRIPT_CANVAS_MODULE_SOURCE_JS, | 820 IDR_INSPECTOR_INJECTED_SCRIPT_CANVAS_MODULE_SOURCE_JS, |
821 ui::SCALE_FACTOR_NONE }, | 821 ui::SCALE_FACTOR_NONE }, |
822 { "InjectedScriptSource.js", IDR_INSPECTOR_INJECTED_SCRIPT_SOURCE_JS, | 822 { "InjectedScriptSource.js", IDR_INSPECTOR_INJECTED_SCRIPT_SOURCE_JS, |
823 ui::SCALE_FACTOR_NONE }, | 823 ui::SCALE_FACTOR_NONE }, |
824 { "DebuggerScriptSource.js", IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS, | 824 { "DebuggerScriptSource.js", IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS, |
825 ui::SCALE_FACTOR_NONE }, | 825 ui::SCALE_FACTOR_NONE }, |
826 { "DocumentXMLTreeViewer.js", IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS, | 826 { "DocumentXMLTreeViewer.js", IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS, |
827 ui::SCALE_FACTOR_NONE }, | 827 ui::SCALE_FACTOR_NONE }, |
828 { "HTMLMarqueeElement.js", IDR_PRIVATE_SCRIPT_HTMLMARQUEEELEMENT_JS, | 828 { "HTMLMarqueeElement.js", IDR_PRIVATE_SCRIPT_HTMLMARQUEEELEMENT_JS, |
829 ui::SCALE_FACTOR_NONE }, | 829 ui::SCALE_FACTOR_NONE }, |
| 830 { "PluginPlaceholderElement.js", |
| 831 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS, ui::SCALE_FACTOR_NONE }, |
830 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, | 832 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, |
831 ui::SCALE_FACTOR_NONE }, | 833 ui::SCALE_FACTOR_NONE }, |
832 #ifdef IDR_PICKER_COMMON_JS | 834 #ifdef IDR_PICKER_COMMON_JS |
833 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, | 835 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, |
834 { "pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE }, | 836 { "pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE }, |
835 { "calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE }, | 837 { "calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
836 { "calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE }, | 838 { "calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
837 { "pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE }, | 839 { "pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE }, |
838 { "suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, | 840 { "suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
839 { "suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, | 841 { "suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1187 } | 1189 } |
1188 | 1190 |
1189 // static | 1191 // static |
1190 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { | 1192 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { |
1191 WebThreadImplForMessageLoop* impl = | 1193 WebThreadImplForMessageLoop* impl = |
1192 static_cast<WebThreadImplForMessageLoop*>(thread); | 1194 static_cast<WebThreadImplForMessageLoop*>(thread); |
1193 delete impl; | 1195 delete impl; |
1194 } | 1196 } |
1195 | 1197 |
1196 } // namespace content | 1198 } // namespace content |
OLD | NEW |