Web Inspector: add runtime flag to determine if inspector's source files were flattened.

https://bugs.webkit.org/show_bug.cgi?id=111184

Patch by Andrey Lushnikov <lushnikov@chromium.org> on 2013-03-04
Reviewed by Pavel Feldman.

Source/WebCore:

- Add a file "buildSystemOnly.js" which will be included into
devtools.html only by GYP build system. This script sets a single flag
which essentially means that inspector source files were run
through a build system and flattened.
- Update "importScript" and "registerRequiredCSS" functions to correct
paths according to the "flattenImports" flag.

No new tests: no change in behaviour.

* WebCore.gypi:
* inspector/front-end/CodeMirrorTextEditor.js:
(WebInspector.CodeMirrorTextEditor):
* inspector/front-end/View.js:
(WebInspector.View.prototype.registerRequiredCSS):
* inspector/front-end/buildSystemOnly.js: Added.
* inspector/front-end/utilities.js:

Source/WebKit/chromium:

Included "buildSystemOnly.js" in devtools.html by generate_devtools_html.py script.

* WebKit.gyp:
* scripts/generate_devtools_html.py: Add script tag to include buildSystemOnly.js
(write_devtools_html):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144605 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cac2bd8187c4cb5b5da3d15eafc83b6e1af8f065..0903912415c9f30c8c308a90072eec4ceea50570 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2013-03-04  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: add runtime flag to determine if inspector's source files were flattened.
+        https://bugs.webkit.org/show_bug.cgi?id=111184
+
+        Reviewed by Pavel Feldman.
+
+        - Add a file "buildSystemOnly.js" which will be included into
+        devtools.html only by GYP build system. This script sets a single flag
+        which essentially means that inspector source files were run
+        through a build system and flattened.
+        - Update "importScript" and "registerRequiredCSS" functions to correct
+        paths according to the "flattenImports" flag.
+
+        No new tests: no change in behaviour.
+
+        * WebCore.gypi:
+        * inspector/front-end/CodeMirrorTextEditor.js:
+        (WebInspector.CodeMirrorTextEditor):
+        * inspector/front-end/View.js:
+        (WebInspector.View.prototype.registerRequiredCSS):
+        * inspector/front-end/buildSystemOnly.js: Added.
+        * inspector/front-end/utilities.js:
+
 2013-03-04  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Web Inspector: Fix front-end compilation

diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index 713fb8d992a2f4f392d15fe79e1aab5ce18b5415..53121df0ae26842317daa9e47c2212bb141c0735 100644 (file)
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -5431,11 +5431,12 @@
             'inspector/front-end/inspectorSyntaxHighlight.css',
             'inspector/front-end/popover.css',
             '<@(webinspector_modules_js_files)',
-            '<@(webinspector_standalone_css_files)',
+            '<@(webinspector_standalone_files)',
         ],
-        'webinspector_standalone_css_files': [
+        'webinspector_standalone_files': [
             'inspector/front-end/auditsPanel.css',
             'inspector/front-end/breadcrumbList.css',
+            'inspector/front-end/buildSystemOnly.js',
             'inspector/front-end/cm/cmdevtools.css',
             'inspector/front-end/cm/codemirror.css',
             'inspector/front-end/cssNamedFlows.css',

diff --git a/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js b/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js
index 282c66ab5d0d2bb7f0d2e36034221b71e5f32660..d7450a1c8e0b5edd8684ffcba106103e59fe1915 100644 (file)
--- a/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js
+++ b/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js
@@ -47,8 +47,8 @@ WebInspector.CodeMirrorTextEditor = function(url, delegate)
     this._delegate = delegate;
     this._url = url;
 
-    this.registerRequiredCSS("codemirror.css");
-    this.registerRequiredCSS("cmdevtools.css");
+    this.registerRequiredCSS("cm/codemirror.css");
+    this.registerRequiredCSS("cm/cmdevtools.css");
 
     this._codeMirror = window.CodeMirror(this.element, {
         lineNumbers: true,

diff --git a/Source/WebCore/inspector/front-end/View.js b/Source/WebCore/inspector/front-end/View.js
index 7bf3c55c930aa363ca0a4ea6880ce2725b7bb94e..e1e601f12ba0e857b7bb136ad31c8a46add790fa 100644 (file)
--- a/Source/WebCore/inspector/front-end/View.js
+++ b/Source/WebCore/inspector/front-end/View.js
@@ -299,6 +299,8 @@ WebInspector.View.prototype = {
 
     registerRequiredCSS: function(cssFile)
     {
+        if (window.flattenImports)
+            cssFile = cssFile.split("/").reverse()[0];
         this._cssFiles.push(cssFile);
     },
 

diff --git a/Source/WebCore/inspector/front-end/buildSystemOnly.js b/Source/WebCore/inspector/front-end/buildSystemOnly.js
new file mode 100644 (file)
index 0000000..1fcd75c
--- /dev/null
+++ b/Source/WebCore/inspector/front-end/buildSystemOnly.js
@@ -0,0 +1,6 @@
+/**
+ * This flag notifies inspector that it was deployed with the help
+ * of a build system. Build system flattenes all css and js files,
+ * so in this case inspector has to correct paths for dynamic resource loading.
+ */
+window.flattenImports = true;

diff --git a/Source/WebCore/inspector/front-end/utilities.js b/Source/WebCore/inspector/front-end/utilities.js
index 8dd23847dc5fb94d436eb4e1ab0b07b2e48d94ef..d415ca0c3a3219dc26792d2ddba48891a8ae7964 100644 (file)
--- a/Source/WebCore/inspector/front-end/utilities.js
+++ b/Source/WebCore/inspector/front-end/utilities.js
@@ -982,15 +982,10 @@ function importScript(scriptName)
         return;
     var xhr = new XMLHttpRequest();
     _importedScripts[scriptName] = true;
-    try {
-        xhr.open("GET", scriptName, false);
-        xhr.send(null);
-    } catch (e) {
-        // Try to load file from the root directory
+    if (window.flattenImports)
         scriptName = scriptName.split("/").reverse()[0];
-        xhr.open("GET", scriptName, false);
-        xhr.send(null);
-    }
+    xhr.open("GET", scriptName, false);
+    xhr.send(null);
     var sourceURL = WebInspector.ParsedURL.completeURL(window.location.href, scriptName); 
     window.eval(xhr.responseText + "\n//@ sourceURL=" + sourceURL);
 }

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 6643a356d16b2e57ea634697393970a6f9c17fd1..7bb871b9c3ddf0353c06201a0448a82d90509b0a 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2013-03-04  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: add runtime flag to determine if inspector's source files were flattened.
+        https://bugs.webkit.org/show_bug.cgi?id=111184
+
+        Reviewed by Pavel Feldman.
+
+        Included "buildSystemOnly.js" in devtools.html by generate_devtools_html.py script.
+
+        * WebKit.gyp:
+        * scripts/generate_devtools_html.py: Add script tag to include buildSystemOnly.js
+        (write_devtools_html):
+
 2013-03-03  Alexandre Elias  <aelias@chromium.org>
 
         [chromium] Remove WebLayerTreeView::setViewportSize call

diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
index f78544c61f58f452e05671157362819da7763e52..e41ee41135e00ff740eb63f52a6453b0c3108347 100644 (file)
--- a/Source/WebKit/chromium/WebKit.gyp
+++ b/Source/WebKit/chromium/WebKit.gyp
@@ -956,7 +956,7 @@
                             '<(PRODUCT_DIR)/resources/inspector/ScriptFormatterWorker.js',
                             '<(PRODUCT_DIR)/resources/inspector/devTools.css',
                             '<(PRODUCT_DIR)/resources/inspector/devtools_extension_api.js',
-                            '<@(webinspector_standalone_css_files)',
+                            '<@(webinspector_standalone_files)',
                         ],
                         'images': [
                             '<@(webinspector_image_files)',
@@ -1251,7 +1251,7 @@
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)/resources/inspector',
                         'files': [
-                            '<@(webinspector_standalone_css_files)',
+                            '<@(webinspector_standalone_files)',
                         ],
                     }],
                 },

diff --git a/Source/WebKit/chromium/scripts/generate_devtools_html.py b/Source/WebKit/chromium/scripts/generate_devtools_html.py
index 66255a84ceb0a84c31daf2f4d15409bad7dfa980..4ea2e278ae12dd3ee2b49805c2eba391c7cc80ed 100644 (file)
--- a/Source/WebKit/chromium/scripts/generate_devtools_html.py
+++ b/Source/WebKit/chromium/scripts/generate_devtools_html.py
@@ -57,6 +57,8 @@ def write_devtools_html(inspector_file, devtools_file, debug, debug_files):
                 devtools_file.write(generate_include_tag("devTools.css"))
                 devtools_file.write(generate_include_tag("DevTools.js"))
         devtools_file.write(line)
+        if '<head>' in line:
+            devtools_file.write(generate_include_tag("buildSystemOnly.js"))
 
 
 def main(argv):