| 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 805 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 816 ui::SCALE_FACTOR_NONE}, | 816 ui::SCALE_FACTOR_NONE}, |
| 817 { "InspectorOverlayPage.html", IDR_INSPECTOR_OVERLAY_PAGE_HTML, | 817 { "InspectorOverlayPage.html", IDR_INSPECTOR_OVERLAY_PAGE_HTML, |
| 818 ui::SCALE_FACTOR_NONE }, | 818 ui::SCALE_FACTOR_NONE }, |
| 819 { "InjectedScriptCanvasModuleSource.js", | 819 { "InjectedScriptCanvasModuleSource.js", |
| 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 { "DocumentExecCommand.js", IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS, |
| 827 ui::SCALE_FACTOR_NONE }, |
| 826 { "DocumentXMLTreeViewer.js", IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS, | 828 { "DocumentXMLTreeViewer.js", IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS, |
| 827 ui::SCALE_FACTOR_NONE }, | 829 ui::SCALE_FACTOR_NONE }, |
| 828 { "HTMLMarqueeElement.js", IDR_PRIVATE_SCRIPT_HTMLMARQUEEELEMENT_JS, | 830 { "HTMLMarqueeElement.js", IDR_PRIVATE_SCRIPT_HTMLMARQUEEELEMENT_JS, |
| 829 ui::SCALE_FACTOR_NONE }, | 831 ui::SCALE_FACTOR_NONE }, |
| 830 { "PluginPlaceholderElement.js", | 832 { "PluginPlaceholderElement.js", |
| 831 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS, ui::SCALE_FACTOR_NONE }, | 833 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS, ui::SCALE_FACTOR_NONE }, |
| 832 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, | 834 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, |
| 833 ui::SCALE_FACTOR_NONE }, | 835 ui::SCALE_FACTOR_NONE }, |
| 834 #ifdef IDR_PICKER_COMMON_JS | 836 #ifdef IDR_PICKER_COMMON_JS |
| 835 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, | 837 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1189 } | 1191 } |
| 1190 | 1192 |
| 1191 // static | 1193 // static |
| 1192 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { | 1194 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { |
| 1193 WebThreadImplForMessageLoop* impl = | 1195 WebThreadImplForMessageLoop* impl = |
| 1194 static_cast<WebThreadImplForMessageLoop*>(thread); | 1196 static_cast<WebThreadImplForMessageLoop*>(thread); |
| 1195 delete impl; | 1197 delete impl; |
| 1196 } | 1198 } |
| 1197 | 1199 |
| 1198 } // namespace content | 1200 } // namespace content |
| OLD | NEW |