Changeset 103411 in webkit

Timestamp:

Dec 21, 2011 9:20:43 AM (12 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: [Extension API] refactor extension API build code, expose experimental APIs conditionally in chromium
​https://bugs.webkit.org/show_bug.cgi?id=74941

Reviewed by Pavel Feldman.

Source/WebCore:

• WebCore.gypi:
• inspector/front-end/ExtensionAPI.js:

(buildPlatformExtensionAPI.platformExtensionAPI):
(buildPlatformExtensionAPI):
(buildExtensionAPIInjectedScript):

• inspector/front-end/ExtensionServer.js:

(WebInspector.ExtensionServer.prototype._addExtensions):
(WebInspector.ExtensionServer.prototype._addExtension):
(window.addExtension):

Source/WebKit/chromium:

• WebKit.gyp:
• WebKit.gypi:
• scripts/concatenate_js_files.py:

(main):

• scripts/generate_devtools_extension_api.py:

(write_devtools_extension_api):

• src/js/DevTools.js:

():

LayoutTests:

• http/tests/inspector/extensions-test.js:

(initialize_ExtensionsTest.InspectorTest.runExtensionTests):
(initialize_ExtensionsTest):

• platform/chromium/inspector/extensions/extensions-api-expected.txt: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/extensions-test.js (modified) (1 diff)
• LayoutTests/platform/chromium/inspector/extensions/extensions-api-expected.txt (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.gypi (modified) (3 diffs)
• Source/WebCore/inspector/front-end/ExtensionAPI.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/ExtensionServer.js (modified) (4 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/WebKit.gyp (modified) (3 diffs)
• Source/WebKit/chromium/WebKit.gypi (modified) (1 diff)
• Source/WebKit/chromium/scripts/concatenate_js_files.py (modified) (1 diff)
• Source/WebKit/chromium/scripts/generate_devtools_extension_api.py (modified) (1 diff)
• Source/WebKit/chromium/src/js/DevTools.js (modified) (2 diffs)
• Source/WebKit/chromium/src/js/DevToolsExtensionAPI.js (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-20  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: [Extension API] refactor extension API build code, expose experimental APIs conditionally in chromium
+        https://bugs.webkit.org/show_bug.cgi?id=74941
+
+        Reviewed by Pavel Feldman.
+
+        * http/tests/inspector/extensions-test.js:
+        (initialize_ExtensionsTest.InspectorTest.runExtensionTests):
+        (initialize_ExtensionsTest):
+        * platform/chromium/inspector/extensions/extensions-api-expected.txt: Removed.
+
 2011-12-12  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/LayoutTests/http/tests/inspector/extensions-test.js

@@ -51 +51 @@
             pageURL.replace(/\/inspector\/extensions\/[^/]*$/, "/http/tests")) +
             "/inspector/resources/extension-main.html";
-        WebInspector.addExtensions([{ startPage: extensionURL, name: "test extension" }]);
+        WebInspector.addExtensions([{ startPage: extensionURL, name: "test extension", exposeWebInspectorNamespace: true }]);
     });
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-20  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: [Extension API] refactor extension API build code, expose experimental APIs conditionally in chromium
+        https://bugs.webkit.org/show_bug.cgi?id=74941
+
+        Reviewed by Pavel Feldman.
+
+        * WebCore.gypi:
+        * inspector/front-end/ExtensionAPI.js:
+        (buildPlatformExtensionAPI.platformExtensionAPI):
+        (buildPlatformExtensionAPI):
+        (buildExtensionAPIInjectedScript):
+        * inspector/front-end/ExtensionServer.js:
+        (WebInspector.ExtensionServer.prototype._addExtensions):
+        (WebInspector.ExtensionServer.prototype._addExtension):
+        (window.addExtension):
+
 2011-12-12  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -6408 +6408 @@
             'inspector/front-end/EmptyView.js',
             'inspector/front-end/EventListenersSidebarPane.js',
+            'inspector/front-end/ExtensionAPI.js',
             'inspector/front-end/ExtensionAuditCategory.js',
             'inspector/front-end/ExtensionPanel.js',
@@ -6517 +6518 @@
             'inspector/front-end/popover.css',
             '<@(webinspector_standalone_css_files)',
-            '<@(webinspector_extension_api_files)',
         ],
         'webinspector_standalone_css_files': [
@@ -6536 +6536 @@
             'inspector/front-end/textViewer.css',
             'inspector/front-end/timelinePanel.css',
-        ],
-        'webinspector_extension_api_files': [
-            'inspector/front-end/ExtensionAPI.js',
         ],
         'webinspector_uglifyjs_files': [

trunk/Source/WebCore/inspector/front-end/ExtensionAPI.js

@@ -807 +807 @@
 var extensionServer = new ExtensionServerClient();
 
-window.webInspector = new InspectorExtensionAPI();
-window.experimental = window.experimental || {};
-window.experimental.webInspector = window.webInspector;
-
-}
-
-function buildExtensionAPIInjectedScript(platformAPI)
+return new InspectorExtensionAPI();
+}
+
+// Default implementation; platforms will override.
+function buildPlatformExtensionAPI()
+{
+    function platformExtensionAPI(coreAPI)
+    {
+        window.webInspector = coreAPI;
+    }
+    return platformExtensionAPI.toString();
+}
+
+
+function buildExtensionAPIInjectedScript(extensionInfo)
 {
     return "(function(injectedScriptHost, inspectedWindow, injectedScriptId){ " +
         defineCommonExtensionSymbols.toString() + ";" +
         injectedExtensionAPI.toString() + ";" +
-        "injectedExtensionAPI(injectedScriptId);" +
-        (platformAPI || "") + ";" +
+        buildPlatformExtensionAPI(extensionInfo) + ";" +
+        "platformExtensionAPI(injectedExtensionAPI(injectedScriptId));" +
         "return {};" +
         "})";

trunk/Source/WebCore/inspector/front-end/ExtensionServer.js

@@ -605 +605 @@
     {
         for (var i = 0; i < extensions.length; ++i)
-            this._addExtension(extensions[i].startPage, extensions[i].name);
-    },
-
-    _addExtension: function(startPage, name)
+            this._addExtension(extensions[i]);
+    },
+
+    _addExtension: function(extensionInfo)
     {
         const urlOriginRegExp = new RegExp("([^:]+:\/\/[^/]*)\/"); // Can't use regexp literal here, MinJS chokes on it.
+        var startPage = extensionInfo.startPage;
+        var name = extensionInfo.name;
 
         try {
@@ -621 +623 @@
             if (!this._registeredExtensions[extensionOrigin]) {
                 // See ExtensionAPI.js and ExtensionCommon.js for details.
-                InspectorFrontendHost.setInjectedScriptForOrigin(extensionOrigin, this._buildExtensionAPIScript());
+                InspectorFrontendHost.setInjectedScriptForOrigin(extensionOrigin, buildExtensionAPIInjectedScript(extensionInfo));
                 this._registeredExtensions[extensionOrigin] = { name: name };
             }
@@ -633 +635 @@
         }
         return true;
-    },
-
-    _buildExtensionAPIScript: function()
-    {
-        var platformAPI = WebInspector.buildPlatformExtensionAPI ? WebInspector.buildPlatformExtensionAPI() : "";
-        return buildExtensionAPIInjectedScript(platformAPI);
     },
 
@@ -753 +749 @@
 WebInspector.extensionServer = new WebInspector.ExtensionServer();
 
-window.addExtension = WebInspector.extensionServer._addExtension.bind(WebInspector.extensionServer);
+window.addExtension = function(page, name)
+{
+    WebInspector.extensionServer._addExtension({
+        startPage: page,
+        name: name,
+    });
+}

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-12-20  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: [Extension API] refactor extension API build code, expose experimental APIs conditionally in chromium
+        https://bugs.webkit.org/show_bug.cgi?id=74941
+
+        Reviewed by Pavel Feldman.
+
+        * WebKit.gyp:
+        * WebKit.gypi:
+        * scripts/concatenate_js_files.py:
+        (main):
+        * scripts/generate_devtools_extension_api.py:
+        (write_devtools_extension_api):
+        * src/js/DevTools.js:
+        ():
+
 2011-12-20  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -918 +918 @@
                 'inputs': [
                     '<@(_script_name)',
-                    '<@(webinspector_extension_api_files)',
+                    '<@(devtools_extension_api_files)',
                 ],
                 'outputs': ['<(PRODUCT_DIR)/resources/inspector/devtools_extension_api.js'],
-                'action': ['python', '<@(_script_name)', '<@(_outputs)', '<@(webinspector_extension_api_files)'],
+                'action': ['python', '<@(_script_name)', '<@(_outputs)', '<@(devtools_extension_api_files)'],
             }],
         },
@@ -1000 +1000 @@
                     '<@(webinspector_image_files)',
                     '<@(devtools_image_files)',
-                    '<@(webinspector_extension_api_files)',
+                    '<@(devtools_extension_api_files)',
                 ],
                 'search_path': [
@@ -1013 +1013 @@
                                      '--devtools-files', '<@(devtools_files)',
                                      '--workers-files', '<@(_workers_files)',
-                                     '--extension-api-files', '<@(webinspector_extension_api_files)',
+                                     '--extension-api-files', '<@(devtools_extension_api_files)',
                                      '--search-path', '<@(_search_path)',
                                      '--js-search-path', '<@(_js_search_path)',

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -35 +35 @@
         'devtools_js_files': [
             'src/js/DevTools.js',
+            'src/js/DevToolsExtensionAPI.js',
             'src/js/Tests.js',
         ],
         'devtools_css_files': [
             'src/js/devTools.css',
+        ],
+        'devtools_extension_api_files': [
+            '../../WebCore/inspector/front-end/ExtensionAPI.js',
+            'src/js/DevToolsExtensionAPI.js'
         ],
         'devtools_image_files': [

trunk/Source/WebKit/chromium/scripts/concatenate_js_files.py

@@ -88 +88 @@
         extractor = OrderedJSFilesExtractor(order_html.read())
     extractor.ordered_js_files.append('DevTools.js')
+    extractor.ordered_js_files.append('DevToolsExtensionAPI.js')
     extractor.ordered_js_files.append('Tests.js')
 

trunk/Source/WebKit/chromium/scripts/generate_devtools_extension_api.py

@@ -40 +40 @@
         output.write(input.read())
     output.write("""
-        injectedExtensionAPI("remote-" + top.frames.length);
-
-        chrome = window.chrome || {};
-        chrome.experimental = chrome.experimental || {};
-        chrome.experimental.devtools = chrome.experimental.devtools || {};
-
-        var properties = Object.getOwnPropertyNames(webInspector);
-        for (var i = 0; i < properties.length; ++i) {
-            var descriptor = Object.getOwnPropertyDescriptor(webInspector, properties[i]);
-            Object.defineProperty(chrome.experimental.devtools, properties[i], descriptor);
-        }
+        var tabId;
+        var extensionInfo = {};
+        platformExtensionAPI(injectedExtensionAPI("remote-" + top.frames.length));
     })();""")
 

trunk/Source/WebKit/chromium/src/js/DevTools.js

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43 +43 @@
 })();}
 
-WebInspector.platformExtensionAPI = function(tabId)
+function buildPlatformExtensionAPI(extensionInfo)
 {
-    function getTabId()
-    {
-        return tabId;
-    }
-    webInspector.inspectedWindow.__proto__.__defineGetter__("tabId", getTabId);
-    chrome = window.chrome || {};
-    chrome.experimental = chrome.experimental || {};
-    chrome.experimental.devtools = chrome.experimental.devtools || {};
-
-    var properties = Object.getOwnPropertyNames(webInspector);
-    for (var i = 0; i < properties.length; ++i) {
-        var descriptor = Object.getOwnPropertyDescriptor(webInspector, properties[i]);
-        Object.defineProperty(chrome.experimental.devtools, properties[i], descriptor);
-    }
-}
-
-WebInspector.buildPlatformExtensionAPI = function()
-{
-    return "(" + WebInspector.platformExtensionAPI + ")(" + WebInspector._inspectedTabId + ");";
+    return "var extensionInfo = " + JSON.stringify(extensionInfo) + ";" +
+       "var tabId = " + WebInspector._inspectedTabId + ";" +
+       platformExtensionAPI.toString();
 }