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

Unified Diff: sdk/lib/_internal/compiler/js_lib/preambles/jsshell.js

Issue 1130293002: dart2js: compute the currentScript in the preamble for d8 and jsshell. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 7 months 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 side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/compiler/js_lib/preambles/jsshell.js
diff --git a/sdk/lib/_internal/compiler/js_lib/preambles/jsshell.js b/sdk/lib/_internal/compiler/js_lib/preambles/jsshell.js
index 0012539c14e7abc42cbe76510ecad985696b6455..a33a58f1364579ccd9ac5b52d4fe4a3180489a88 100644
--- a/sdk/lib/_internal/compiler/js_lib/preambles/jsshell.js
+++ b/sdk/lib/_internal/compiler/js_lib/preambles/jsshell.js
@@ -18,6 +18,46 @@
self.location = { href: "file://" + workingDirectory + "/" };
+ function computeCurrentScript() {
+ try {
+ throw new Error();
+ } catch(e) {
+ var stack = e.stack;
+ print(stack);
+ // The jsshell stack looks like:
+ // computeCurrentScript@...preambles/jsshell.js:23:13
+ // self.document.currentScript@...preambles/jsshell.js:53:37
+ // @/tmp/foo.js:308:1
+ // @/tmp/foo.js:303:1
+ // @/tmp/foo.js:5:1
+ var re = new RegExp("^.*@(.*):[0-9]*:[0-9]*$", "mg");
+ var lastMatch = null;
+ do {
+ var match = re.exec(stack);
+ if (match != null) lastMatch = match;
+ } while (match != null);
+ return lastMatch[1];
+ }
+ }
+
+ // Adding a 'document' is dangerous since it invalidates the 'typeof document'
+ // test to see if we are running in the browser. It means that the runtime
+ // needs to do more precise checks.
+ // Note that we can't run "currentScript" right away, since that would give
+ // us the location of the preamble file. Instead we wait for the first access
+ // which should happen just before invoking main. At this point we are in
+ // the main file and setting the currentScript property is correct.
+ // Note that we cannot use `thisFileName()`, since that would give us the
+ // preamble and not the script file.
+ var cachedCurrentScript = null;
+ self.document = { get currentScript() {
+ if (cachedCurrentScript == null) {
+ cachedCurrentScript = {src: computeCurrentScript()};
+ }
+ return cachedCurrentScript;
+ }
+ };
+
// Support for deferred loading.
self.dartDeferredLibraryLoader = function(uri, successCallback, errorCallback) {
try {

Powered by Google App Engine
This is Rietveld 408576698