Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (101659 => 101660)
--- trunk/Source/WebCore/CMakeLists.txt 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/CMakeLists.txt 2011-12-01 13:30:40 UTC (rev 101660)
@@ -886,7 +886,6 @@
inspector/InspectorFrontendClientLocal.cpp
inspector/InspectorFrontendHost.cpp
inspector/InspectorInstrumentation.cpp
- inspector/InspectorMetaAgent.cpp
inspector/InspectorProfilerAgent.cpp
inspector/InspectorResourceAgent.cpp
inspector/InspectorRuntimeAgent.cpp
Modified: trunk/Source/WebCore/ChangeLog (101659 => 101660)
--- trunk/Source/WebCore/ChangeLog 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/ChangeLog 2011-12-01 13:30:40 UTC (rev 101660)
@@ -1,5 +1,29 @@
2011-12-01 Pavel Feldman <[email protected]>
+ Web Inspector: remove capabilities along with the MetaAgent
+ https://bugs.webkit.org/show_bug.cgi?id=73550
+
+ Reviewed by Yury Semikhatsky.
+
+ We are now using explicit query commands in order to find out about the capabilities.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/CodeGeneratorInspector.py:
+ (Generator.go):
+ * inspector/Inspector.json:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ * inspector/InspectorMetaAgent.cpp: Removed.
+ * inspector/InspectorMetaAgent.h: Removed.
+ * inspector/generate-protocol-externs:
+
+2011-12-01 Pavel Feldman <[email protected]>
+
Web Inspector: front-end should open with elements panel selected upon Inspect Element action.
https://bugs.webkit.org/show_bug.cgi?id=73539
Modified: trunk/Source/WebCore/GNUmakefile.list.am (101659 => 101660)
--- trunk/Source/WebCore/GNUmakefile.list.am 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2011-12-01 13:30:40 UTC (rev 101660)
@@ -2071,8 +2071,6 @@
Source/WebCore/inspector/InspectorFrontendHost.h \
Source/WebCore/inspector/InspectorInstrumentation.cpp \
Source/WebCore/inspector/InspectorInstrumentation.h \
- Source/WebCore/inspector/InspectorMetaAgent.cpp \
- Source/WebCore/inspector/InspectorMetaAgent.h \
Source/WebCore/inspector/InspectorPageAgent.cpp \
Source/WebCore/inspector/InspectorPageAgent.h \
Source/WebCore/inspector/InspectorProfilerAgent.cpp \
Modified: trunk/Source/WebCore/Target.pri (101659 => 101660)
--- trunk/Source/WebCore/Target.pri 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/Target.pri 2011-12-01 13:30:40 UTC (rev 101660)
@@ -866,7 +866,6 @@
inspector/InspectorFrontendClientLocal.cpp \
inspector/InspectorFrontendHost.cpp \
inspector/InspectorInstrumentation.cpp \
- inspector/InspectorMetaAgent.cpp \
inspector/InspectorPageAgent.cpp \
inspector/InspectorProfilerAgent.cpp \
inspector/InspectorResourceAgent.cpp \
@@ -1912,7 +1911,6 @@
inspector/InspectorFrontendClientLocal.h \
inspector/InspectorFrontendHost.h \
inspector/InspectorInstrumentation.h \
- inspector/InspectorMetaAgent.h \
inspector/InspectorPageAgent.h \
inspector/InspectorProfilerAgent.h \
inspector/InspectorResourceAgent.h \
Modified: trunk/Source/WebCore/WebCore.gypi (101659 => 101660)
--- trunk/Source/WebCore/WebCore.gypi 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/WebCore.gypi 2011-12-01 13:30:40 UTC (rev 101660)
@@ -2757,8 +2757,6 @@
'inspector/InspectorFrontendHost.h',
'inspector/InspectorInstrumentation.cpp',
'inspector/InspectorInstrumentation.h',
- 'inspector/InspectorMetaAgent.cpp',
- 'inspector/InspectorMetaAgent.h',
'inspector/InspectorPageAgent.cpp',
'inspector/InspectorPageAgent.h',
'inspector/InspectorProfilerAgent.cpp',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (101659 => 101660)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-12-01 13:30:40 UTC (rev 101660)
@@ -68646,14 +68646,6 @@
>
</File>
<File
- RelativePath="..\inspector\InspectorMetaAgent.cpp"
- >
- </File>
- <File
- RelativePath="..\inspector\InspectorMetaAgent.h"
- >
- </File>
- <File
RelativePath="..\inspector\InspectorPageAgent.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (101659 => 101660)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-12-01 13:30:40 UTC (rev 101660)
@@ -1816,8 +1816,6 @@
7AA365EE12E7265400DCA242 /* InspectorRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AA365ED12E7265400DCA242 /* InspectorRuntimeAgent.cpp */; };
7AA51B6E1483B61600AD2752 /* InspectorBaseAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AA51B6C1483B61600AD2752 /* InspectorBaseAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
7AA51B6F1483B61600AD2752 /* InspectorBaseAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AA51B6D1483B61600AD2752 /* InspectorBaseAgent.cpp */; };
- 7AA51DD5148506A900AD2752 /* InspectorMetaAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AA51DD3148506A900AD2752 /* InspectorMetaAgent.cpp */; };
- 7AA51DD6148506A900AD2752 /* InspectorMetaAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AA51DD4148506A900AD2752 /* InspectorMetaAgent.h */; };
7AB0B1C01211A62200A76940 /* InspectorDatabaseAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */; };
7AB0B1C11211A62200A76940 /* InspectorDatabaseAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AB0B1BF1211A62200A76940 /* InspectorDatabaseAgent.h */; };
7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */; };
@@ -9068,8 +9066,6 @@
7AA365ED12E7265400DCA242 /* InspectorRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorRuntimeAgent.cpp; sourceTree = "<group>"; };
7AA51B6C1483B61600AD2752 /* InspectorBaseAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBaseAgent.h; sourceTree = "<group>"; };
7AA51B6D1483B61600AD2752 /* InspectorBaseAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBaseAgent.cpp; sourceTree = "<group>"; };
- 7AA51DD3148506A900AD2752 /* InspectorMetaAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorMetaAgent.cpp; sourceTree = "<group>"; };
- 7AA51DD4148506A900AD2752 /* InspectorMetaAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorMetaAgent.h; sourceTree = "<group>"; };
7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDatabaseAgent.cpp; sourceTree = "<group>"; };
7AB0B1BF1211A62200A76940 /* InspectorDatabaseAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDatabaseAgent.h; sourceTree = "<group>"; };
7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuProvider.h; sourceTree = "<group>"; };
@@ -14558,8 +14554,6 @@
7A0E770D10C00A8800A0276E /* InspectorFrontendHost.idl */,
20D629241253690B00081543 /* InspectorInstrumentation.cpp */,
20D629251253690B00081543 /* InspectorInstrumentation.h */,
- 7AA51DD3148506A900AD2752 /* InspectorMetaAgent.cpp */,
- 7AA51DD4148506A900AD2752 /* InspectorMetaAgent.h */,
4F6FDD621341DEDD001F8EE3 /* InspectorPageAgent.cpp */,
4F6FDD631341DEDD001F8EE3 /* InspectorPageAgent.h */,
9F0D6B2C121BFEBA006C0288 /* InspectorProfilerAgent.cpp */,
@@ -24760,7 +24754,6 @@
A10DC76B14747BAB005E2471 /* StyleGridData.h in Headers */,
312C0C41146DC6CC0016C911 /* Notification.h in Headers */,
3128CA6B147331630074C72A /* NotificationController.h in Headers */,
- 7AA51DD6148506A900AD2752 /* InspectorMetaAgent.h in Headers */,
5038BF2814750F190095E0D1 /* CustomFilterOperation.h in Headers */,
5038BF2914750F190095E0D1 /* FilterOperation.h in Headers */,
5038BF2B14750F190095E0D1 /* FilterOperations.h in Headers */,
@@ -27639,7 +27632,6 @@
7AA51B6F1483B61600AD2752 /* InspectorBaseAgent.cpp in Sources */,
A10DC76A14747BAB005E2471 /* StyleGridData.cpp in Sources */,
3128CA68147331520074C72A /* NotificationController.cpp in Sources */,
- 7AA51DD5148506A900AD2752 /* InspectorMetaAgent.cpp in Sources */,
5038BF2A14750F190095E0D1 /* FilterOperations.cpp in Sources */,
6E3FAD3814733F4000E42306 /* JSWebGLCompressedTextures.cpp in Sources */,
6E3FAE8E14733FDB00E42306 /* WebGLCompressedTextures.cpp in Sources */,
Modified: trunk/Source/WebCore/inspector/CodeGeneratorInspector.py (101659 => 101660)
--- trunk/Source/WebCore/inspector/CodeGeneratorInspector.py 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/inspector/CodeGeneratorInspector.py 2011-12-01 13:30:40 UTC (rev 101660)
@@ -427,7 +427,7 @@
class Templates:
frontend_domain_class = string.Template(
""" class $domainClassName {
- public:$domainCapabilities
+ public:
$domainClassName(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
${frontendDomainMethodDeclarations} void setInspectorFrontendChannel(InspectorFrontendChannel* inspectorFrontendChannel) { m_inspectorFrontendChannel = inspectorFrontendChannel; }
InspectorFrontendChannel* getInspectorFrontendChannel() { return m_inspectorFrontendChannel; }
@@ -919,8 +919,6 @@
namespace WebCore {
-$capabilities
-
InspectorFrontend::InspectorFrontend(InspectorFrontendChannel* inspectorFrontendChannel)
: m_inspectorFrontendChannel(inspectorFrontendChannel)
$constructorInit{
@@ -946,7 +944,7 @@
this._domainDispatchers = {};
this._eventArgs = {};
this._replyArgs = {};
-$delegates$eventArgs$replyArgs$domainDispatchers$capabilities}
+$delegates$eventArgs$replyArgs$domainDispatchers}
InspectorBackendStub.prototype = {
dumpInspectorTimeStats: 0,
@@ -1202,7 +1200,6 @@
backend_js_event_list = []
backend_js_reply_list = []
backend_js_domain_dispatcher_list = []
- backend_js_capabilities_list = []
backend_setters_list = []
backend_constructor_init_list = []
@@ -1210,7 +1207,6 @@
backend_forward_list = []
backend_include_list = []
frontend_constructor_init_list = []
- frontend_capabilities_constants_list = []
@staticmethod
def go():
@@ -1226,14 +1222,6 @@
agent_field_name = domain_data.agent_field_name
frontend_method_declaration_lines = []
- domain_capabilities = []
- if "capabilities" in json_domain:
- for json_capability in json_domain["capabilities"]:
- name = json_capability["name"]
- capability_variable_name = "capability%s" % dash_to_camelcase(name)
- domain_capabilities.append("\n static const char* %s;" % capability_variable_name)
- Generator.frontend_capabilities_constants_list.append("const char* InspectorFrontend::%s::%s = \"%s\";" % (domain_name, capability_variable_name, name))
- Generator.backend_js_capabilities_list.append(" %sAgent.%s = \"%s\";\n" % (domain_name, capability_variable_name, name))
if "events" in json_domain:
for json_event in json_domain["events"]:
@@ -1244,7 +1232,6 @@
Generator.frontend_domain_class_lines.append(Templates.frontend_domain_class.substitute(None,
domainClassName=domain_name,
domainFieldName=domain_name_lower,
- domainCapabilities=join(domain_capabilities, "\n"),
frontendDomainMethodDeclarations=join(frontend_method_declaration_lines, "")))
if "commands" in json_domain:
@@ -1431,8 +1418,7 @@
frontend_cpp_file.write(Templates.frontend_cpp.substitute(None,
constructorInit=join(Generator.frontend_constructor_init_list, ""),
- methods=join(Generator.frontend_method_list, "\n"),
- capabilities=join(Generator.frontend_capabilities_constants_list, "\n")))
+ methods=join(Generator.frontend_method_list, "\n")))
backend_cpp_file.write(Templates.backend_cpp.substitute(None,
methodNameDeclarations=join(Generator.backend_method_name_declaration_list, "\n"),
@@ -1444,8 +1430,7 @@
delegates=join(Generator.backend_js_initializer_list, ""),
replyArgs=join(Generator.backend_js_reply_list, ""),
eventArgs=join(Generator.backend_js_event_list, ""),
- domainDispatchers=join(Generator.backend_js_domain_dispatcher_list, ""),
- capabilities=join(Generator.backend_js_capabilities_list, "")))
+ domainDispatchers=join(Generator.backend_js_domain_dispatcher_list, "")))
backend_h_file.close()
backend_cpp_file.close()
Modified: trunk/Source/WebCore/inspector/Inspector.json (101659 => 101660)
--- trunk/Source/WebCore/inspector/Inspector.json 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/inspector/Inspector.json 2011-12-01 13:30:40 UTC (rev 101660)
@@ -46,33 +46,6 @@
]
},
{
- "domain": "Meta",
- "hidden": true,
- "types": [
- {
- "id": "DomainCapabilities",
- "type": "object",
- "description": "Domain capabilities descriptor.",
- "properties": [
- { "name": "domainName", "type": "string", "description": "Domain name." },
- { "name": "capabilities", "type": "array", "items": { "type": "string" }, "description": "List of the capabilities." }
- ]
- }
- ],
- "commands": [
- {
- "name": "getCapabilities",
- "parameters": [
- { "name": "domainNames", "type": "array", "items": { "type": "string" }, "description": "List of the domains to return capabilities for." }
- ],
- "returns": [
- { "name": "capabilities", "type": "array", "items": { "$ref": "DomainCapabilities"}, "description": "Array of the domain capabilities." }
- ],
- "description": "Returns capability descriptors for the given domain names."
- }
- ]
- },
- {
"domain": "Page",
"description": "Actions and events related to the inspected page belong to the page domain.",
"types": [
@@ -1780,9 +1753,6 @@
{
"domain": "Debugger",
"description": "Debugger domain exposes _javascript_ debugging capabilities. It allows setting and removing breakpoints, stepping through execution, exploring stack traces, etc.",
- "capabilities": [
- { "name": "set-script-source", "description": "Allows setting script source live" }
- ],
"types": [
{
"id": "BreakpointId",
@@ -1955,7 +1925,6 @@
{ "name": "callFrames", "type": "array", "optional": true, "items": { "$ref": "CallFrame"}, "description": "New stack trace in case editing has happened while VM was stopped." },
{ "name": "result", "type": "object", "optional": true, "description": "VM-specific description of the changes applied.", "hidden": true }
],
- "capability": "set-script-source",
"description": "Edits _javascript_ source live."
},
{
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (101659 => 101660)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2011-12-01 13:30:40 UTC (rev 101660)
@@ -53,7 +53,6 @@
#include "InspectorFrontend.h"
#include "InspectorFrontendClient.h"
#include "InspectorInstrumentation.h"
-#include "InspectorMetaAgent.h"
#include "InspectorPageAgent.h"
#include "InspectorProfilerAgent.h"
#include "InspectorResourceAgent.h"
@@ -136,8 +135,6 @@
m_agents.append(InspectorWorkerAgent::create(m_instrumentingAgents.get(), m_state.get()));
#endif
- m_agents.append(InspectorMetaAgent::create(m_instrumentingAgents.get(), m_state.get(), &m_agents));
-
ASSERT_ARG(inspectorClient, inspectorClient);
m_injectedScriptManager->injectedScriptHost()->init(m_inspectorAgent
, consoleAgent
Deleted: trunk/Source/WebCore/inspector/InspectorMetaAgent.cpp (101659 => 101660)
--- trunk/Source/WebCore/inspector/InspectorMetaAgent.cpp 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/inspector/InspectorMetaAgent.cpp 2011-12-01 13:30:40 UTC (rev 101660)
@@ -1,77 +0,0 @@
-/*
-* Copyright (C) 2009 Google Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are
-* met:
-*
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above
-* copyright notice, this list of conditions and the following disclaimer
-* in the documentation and/or other materials provided with the
-* distribution.
-* * Neither the name of Google Inc. nor the names of its
-* contributors may be used to endorse or promote products derived from
-* this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include "config.h"
-#include "InspectorMetaAgent.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorState.h"
-#include "InspectorValues.h"
-#include "InstrumentingAgents.h"
-#include <wtf/HashSet.h>
-
-namespace WebCore {
-
-InspectorMetaAgent::~InspectorMetaAgent()
-{
-}
-
-void InspectorMetaAgent::getCapabilities(ErrorString*, const RefPtr<InspectorArray>& domainNames, RefPtr<InspectorArray>* capabilities)
-{
- HashSet<String> requestedDomains;
- for (InspectorArray::iterator it = domainNames->begin(); it != domainNames->end(); ++it) {
- String value;
- if (it->get()->asString(&value))
- requestedDomains.add(value);
- }
- for (InspectorAgents::iterator it = m_agents->begin(); it != m_agents->end(); ++it) {
- InspectorBaseAgentInterface* agent = it->get();
- if (!requestedDomains.contains(agent->name()))
- continue;
-
- RefPtr<InspectorObject> domainDescriptor = InspectorObject::create();
- domainDescriptor->setString("domainName", agent->name());
- RefPtr<InspectorArray> agentCapabilities = InspectorArray::create();
- agent->getAgentCapabilities(agentCapabilities.get());
- domainDescriptor->setArray("capabilities", agentCapabilities);
- (*capabilities)->pushObject(domainDescriptor);
- }
-}
-
-InspectorMetaAgent::InspectorMetaAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, InspectorAgents* agents)
- : InspectorBaseAgent<InspectorMetaAgent>("Meta", instrumentingAgents, state)
- , m_agents(agents)
-{
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
Deleted: trunk/Source/WebCore/inspector/InspectorMetaAgent.h (101659 => 101660)
--- trunk/Source/WebCore/inspector/InspectorMetaAgent.h 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/inspector/InspectorMetaAgent.h 2011-12-01 13:30:40 UTC (rev 101660)
@@ -1,70 +0,0 @@
-/*
-* Copyright (C) 2009 Google Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are
-* met:
-*
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above
-* copyright notice, this list of conditions and the following disclaimer
-* in the documentation and/or other materials provided with the
-* distribution.
-* * Neither the name of Google Inc. nor the names of its
-* contributors may be used to endorse or promote products derived from
-* this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef InspectorMetaAgent_h
-#define InspectorMetaAgent_h
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorBaseAgent.h"
-#include <wtf/PassOwnPtr.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-class InspectorFrontend;
-class InspectorState;
-class InspectorArray;
-class InstrumentingAgents;
-
-typedef String ErrorString;
-
-class InspectorMetaAgent : public InspectorBaseAgent<InspectorMetaAgent> {
- WTF_MAKE_NONCOPYABLE(InspectorMetaAgent);
-public:
- typedef Vector<OwnPtr<InspectorBaseAgentInterface> > InspectorAgents;
-
- static PassOwnPtr<InspectorMetaAgent> create(InstrumentingAgents* instrumentingAgents, InspectorState* state, InspectorAgents* agents)
- {
- return adoptPtr(new InspectorMetaAgent(instrumentingAgents, state, agents));
- }
-
- void getCapabilities(ErrorString*, const RefPtr<InspectorArray>& domainNames, RefPtr<InspectorArray>* capabilities);
-
- ~InspectorMetaAgent();
-
-private:
- InspectorMetaAgent(InstrumentingAgents*, InspectorState*, InspectorAgents*);
- InspectorAgents* m_agents;
-};
-
-} // namespace WebCore
-
-#endif // !ENABLE(INSPECTOR)
-#endif // !defined(InspectorMetaAgent_h)
Modified: trunk/Source/WebCore/inspector/generate-protocol-externs (101659 => 101660)
--- trunk/Source/WebCore/inspector/generate-protocol-externs 2011-12-01 13:15:34 UTC (rev 101659)
+++ trunk/Source/WebCore/inspector/generate-protocol-externs 2011-12-01 13:30:40 UTC (rev 101660)
@@ -160,10 +160,6 @@
output_file.write(" * @param {%s} %s\n" % (param_type(domain_name, param), param["name"]))
output_file.write(" */\n")
output_file.write("%sAgent.Dispatcher.prototype.%s = function(%s) {};\n" % (domain_name, event["name"], ", ".join(params)));
- if "capabilities" in domain:
- for capability in domain["capabilities"]:
- output_file.write("/** @type {string} */\n")
- output_file.write("%sAgent.capability%s;\n" % (domain_name, dash_to_camelcase(capability["name"])));
output_file.write("/**\n * @param {%sAgent.Dispatcher} dispatcher\n */\n" % domain_name)
output_file.write("InspectorBackend.register%sDispatcher = function(dispatcher) {}\n" % domain_name);
output_file.close()
