Changeset 275262 in webkit for trunk/Source/JavaScriptCore/Scripts

Timestamp:

Mar 30, 2021, 8:01:11 PM (4 years ago)

Author:

Devin Rousso

Message:

REGRESSION(r274607): media controls script is visible in Web Inspector even without the engineering "Show WebKit-internal scripts" enabled
​https://bugs.webkit.org/show_bug.cgi?id=223961

Reviewed by Yusuke Suzuki.

It turns out that Web Inspector will only ignore scripts that have a source URL directive
that matches __InjectedScript_*.js, not those that have a (source) URL matching that.

In addition to Web Inspector ignoring these scripts in the UI, it will also cause the
Debugger to not pause in scripts with a matching source URL directive (unless the
local build engineering only "Pause in WebKit-internal scripts" is enabled).

Source/JavaScriptCore:

• Scripts/make-js-file-arrays.py:

(main):
Add a //# sourceURL=__InjectedScript_*.js to the contents before it's encoded.

Source/WebCore:

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript):
Change the ScriptSourceCode here to not have a URL and have make-js-file-arrays.py
add a //# sourceURL=__InjectedScript_*.js to the contents before it's encoded.

File:

• trunk/Source/JavaScriptCore/Scripts/make-js-file-arrays.py (modified) (3 diffs)

trunk/Source/JavaScriptCore/Scripts/make-js-file-arrays.py

@@ -71 +71 @@
 
     for inputFileName in inputPaths:
+        variableName = os.path.splitext(os.path.basename(inputFileName))[0]
+        sourceURLDirective = "//# sourceURL=__InjectedScript_" + variableName + ".js\n"
 
         if is_3:
@@ -80 +82 @@
 
         if not options.no_minify:
-            characters = jsmin(data)
+            characters = sourceURLDirective + jsmin(data)
         else:
-            characters = data
+            characters = sourceURLDirective + data
 
         if options.fail_if_non_ascii:
@@ -98 +100 @@
         size = len(codepoints)
 
-        variableName = os.path.splitext(os.path.basename(inputFileName))[0]
-
         print('extern const char {0:s}JavaScript[{1:d}];'.format(variableName, size), file=headerFile)
         print('const char {0:s}JavaScript[{1:d}] = {{'.format(variableName, size), file=sourceFile)