Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 759553002: [Blink-in-JS] 'Import' function to load sub-modules and other resources for private scripts (Part-2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Corrected the include order Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 ui::SCALE_FACTOR_NONE }, 863 ui::SCALE_FACTOR_NONE },
864 { "InjectedScriptCanvasModuleSource.js", 864 { "InjectedScriptCanvasModuleSource.js",
865 IDR_INSPECTOR_INJECTED_SCRIPT_CANVAS_MODULE_SOURCE_JS, 865 IDR_INSPECTOR_INJECTED_SCRIPT_CANVAS_MODULE_SOURCE_JS,
866 ui::SCALE_FACTOR_NONE }, 866 ui::SCALE_FACTOR_NONE },
867 { "InjectedScriptSource.js", IDR_INSPECTOR_INJECTED_SCRIPT_SOURCE_JS, 867 { "InjectedScriptSource.js", IDR_INSPECTOR_INJECTED_SCRIPT_SOURCE_JS,
868 ui::SCALE_FACTOR_NONE }, 868 ui::SCALE_FACTOR_NONE },
869 { "DebuggerScriptSource.js", IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS, 869 { "DebuggerScriptSource.js", IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS,
870 ui::SCALE_FACTOR_NONE }, 870 ui::SCALE_FACTOR_NONE },
871 { "DocumentExecCommand.js", IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS, 871 { "DocumentExecCommand.js", IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS,
872 ui::SCALE_FACTOR_NONE }, 872 ui::SCALE_FACTOR_NONE },
873 { "DocumentXMLTreeViewer.css", IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS,
874 ui::SCALE_FACTOR_NONE },
873 { "DocumentXMLTreeViewer.js", IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS, 875 { "DocumentXMLTreeViewer.js", IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS,
874 ui::SCALE_FACTOR_NONE }, 876 ui::SCALE_FACTOR_NONE },
875 { "HTMLMarqueeElement.js", IDR_PRIVATE_SCRIPT_HTMLMARQUEEELEMENT_JS, 877 { "HTMLMarqueeElement.js", IDR_PRIVATE_SCRIPT_HTMLMARQUEEELEMENT_JS,
876 ui::SCALE_FACTOR_NONE }, 878 ui::SCALE_FACTOR_NONE },
877 { "PluginPlaceholderElement.js", 879 { "PluginPlaceholderElement.js",
878 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS, ui::SCALE_FACTOR_NONE }, 880 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS, ui::SCALE_FACTOR_NONE },
879 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, 881 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS,
880 ui::SCALE_FACTOR_NONE }, 882 ui::SCALE_FACTOR_NONE },
881 #ifdef IDR_PICKER_COMMON_JS 883 #ifdef IDR_PICKER_COMMON_JS
882 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, 884 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE },
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 } 1216 }
1215 1217
1216 // static 1218 // static
1217 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { 1219 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) {
1218 WebThreadImplForMessageLoop* impl = 1220 WebThreadImplForMessageLoop* impl =
1219 static_cast<WebThreadImplForMessageLoop*>(thread); 1221 static_cast<WebThreadImplForMessageLoop*>(thread);
1220 delete impl; 1222 delete impl;
1221 } 1223 }
1222 1224
1223 } // namespace content 1225 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698