From 10e8fe7524c7f5a0b20240b6457b7468002f6e73 Mon Sep 17 00:00:00 2001 From: "caseq@chromium.org" Date: Tue, 15 Mar 2011 13:47:37 +0000 Subject: [PATCH] 2011-03-15 Andrey Kosyakov Reviewed by Yury Semikhatsky. Web Inspector: further extension API cleanup (removed inspectedPage, add experimental prefix) https://bugs.webkit.org/show_bug.cgi?id=56327 * inspector/front-end/ExtensionAPI.js: (WebInspector.injectedExtensionAPI): * inspector/front-end/ExtensionAPISchema.json: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@81130 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 11 +++++ Source/WebCore/inspector/front-end/ExtensionAPI.js | 2 + .../inspector/front-end/ExtensionAPISchema.json | 52 ---------------------- 3 files changed, 13 insertions(+), 52 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 63c0b95..718a029 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2011-03-15 Andrey Kosyakov + + Reviewed by Yury Semikhatsky. + + Web Inspector: further extension API cleanup (removed inspectedPage, add experimental prefix) + https://bugs.webkit.org/show_bug.cgi?id=56327 + + * inspector/front-end/ExtensionAPI.js: + (WebInspector.injectedExtensionAPI): + * inspector/front-end/ExtensionAPISchema.json: + 2011-03-15 Yury Semikhatsky Reviewed by Pavel Feldman. diff --git a/Source/WebCore/inspector/front-end/ExtensionAPI.js b/Source/WebCore/inspector/front-end/ExtensionAPI.js index 6a11d62..ea7324c 100644 --- a/Source/WebCore/inspector/front-end/ExtensionAPI.js +++ b/Source/WebCore/inspector/front-end/ExtensionAPI.js @@ -516,5 +516,7 @@ var WatchExpressionSidebarPane = declareInterfaceClass(WatchExpressionSidebarPan var extensionServer = new ExtensionServerClient(); webInspector = new InspectorExtensionAPI(); +experimental = window.experimental || {}; +experimental.webInspector = webInspector; } diff --git a/Source/WebCore/inspector/front-end/ExtensionAPISchema.json b/Source/WebCore/inspector/front-end/ExtensionAPISchema.json index d9e6d18..0aa7aa8 100755 --- a/Source/WebCore/inspector/front-end/ExtensionAPISchema.json +++ b/Source/WebCore/inspector/front-end/ExtensionAPISchema.json @@ -1,57 +1,5 @@ [ { - "namespace": "experimental.webInspector.inspectedWindow", - "description": "Provides access to the window being inspected.", - "functions": [ - { - "name": "eval", - "type": "function", - "description": "Evaluates a JavaScript expression in the context of inspected page (NOTE: the expression must evaluate to a JSON-compliant object, otherwise the exception is thrown)", - "parameters": [ - { - "name": "expression", - "type": "string", - "description": "An expression to evaluate." - }, - { - "name": "callback", - "type": "function", - "description": "A function called when evaluation completes.", - "parameters": [ - { - "name": "result", - "type": "object", - "description": "The result of evaluation" - }, - { - "name": "isException", - "type": "boolean", - "description": "Set if an exception was caught while evaluating the expression" - } - ] - } - ] - } - ], - "events": [ - { - "name": "onDOMContentLoaded", - "type": "function", - "description": "Fired after DOMContentLoaded event on inspected page is fired." - }, - { - "name": "onLoaded", - "type": "function", - "description": "Fired after load event on inspected page is fired." - }, - { - "name": "onNavigated", - "type": "function", - "description": "Fired when navigation occurs in the window being inspected." - } - ] - }, - { "namespace": "experimental.webInspector.panels", "types": [ { -- 1.8.3.1