Unreviewed. Rollout r83849 and r83857.
* inspector/Inspector.json:
* inspector/InspectorDatabaseAgent.cpp:
(WebCore::InspectorDatabaseAgent::didOpenDatabase):
(WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent):
(WebCore::InspectorDatabaseAgent::setFrontend):
(WebCore::InspectorDatabaseAgent::clearFrontend):
(WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
(WebCore::InspectorDatabaseAgent::executeSQL):
* inspector/InspectorDatabaseAgent.h:
* inspector/front-end/inspector.js:
2011-04-14 Ilya Tikhonovsky <loislo@chromium.org>
Unreviewed. Rollout r83849 and r83857.
* http/tests/inspector-enabled/database-open.html:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83861
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2011-04-14 Ilya Tikhonovsky <loislo@chromium.org>
+
+ Unreviewed. Rollout r83849 and r83857.
+
+ * http/tests/inspector-enabled/database-open.html:
+
2011-04-14 Dimitri Glazkov <dglazkov@chromium.org>
Unreviewed, rolling out r83855.
function test()
{
- function run()
- {
- var databases = WebInspector.panels.resources._databases;
- for (var i = 0; i < databases.length; ++i) {
- InspectorTest.addResult("Name: " + databases[i].name);
- InspectorTest.addResult("Version: " + databases[i].version);
- InspectorTest.addResult("Domain: " + databases[i].domain);
- }
- InspectorTest.completeTest();
+ var databases = WebInspector.panels.resources._databases;
+ for (var i = 0; i < databases.length; ++i) {
+ InspectorTest.addResult("Name: " + databases[i].name);
+ InspectorTest.addResult("Version: " + databases[i].version);
+ InspectorTest.addResult("Domain: " + databases[i].domain);
}
- InspectorBackend.runAfterPendingDispatches(run);
+ InspectorTest.completeTest();
}
</script>
+2011-04-14 Ilya Tikhonovsky <loislo@chromium.org>
+
+ Unreviewed. Rollout r83849 and r83857.
+
+ * inspector/Inspector.json:
+ * inspector/InspectorDatabaseAgent.cpp:
+ (WebCore::InspectorDatabaseAgent::didOpenDatabase):
+ (WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent):
+ (WebCore::InspectorDatabaseAgent::setFrontend):
+ (WebCore::InspectorDatabaseAgent::clearFrontend):
+ (WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
+ (WebCore::InspectorDatabaseAgent::executeSQL):
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/front-end/inspector.js:
+
2011-04-14 Dimitri Glazkov <dglazkov@chromium.org>
Unreviewed, rolling out r83847.
"domain": "Database",
"types": [],
"commands": [
- {
- "name": "enable",
- "description": "Enables database tracking, database events will now be delivered to the client."
- },
- {
- "name": "disable",
- "description": "Disables database tracking, prevents database events from being sent to the client."
- },
{
"name": "getDatabaseTableNames",
"parameters": [
RefPtr<InspectorDatabaseResource> resource = InspectorDatabaseResource::create(database, domain, name, version);
m_resources.set(resource->id(), resource);
// Resources are only bound while visible.
- if (m_frontendProvider && m_enabled)
+ if (m_frontendProvider)
resource->bind(m_frontendProvider->frontend());
}
InspectorDatabaseAgent::InspectorDatabaseAgent(InstrumentingAgents* instrumentingAgents)
: m_instrumentingAgents(instrumentingAgents)
- , m_enabled(false)
{
m_instrumentingAgents->setInspectorDatabaseAgent(this);
}
void InspectorDatabaseAgent::setFrontend(InspectorFrontend* frontend)
{
m_frontendProvider = FrontendProvider::create(frontend);
-}
-
-void InspectorDatabaseAgent::clearFrontend()
-{
- m_frontendProvider->clearFrontend();
- m_frontendProvider.clear();
-}
-
-void InspectorDatabaseAgent::enable(ErrorString*)
-{
- if (m_enabled)
- return;
- m_enabled = true;
-
DatabaseResourcesMap::iterator databasesEnd = m_resources.end();
for (DatabaseResourcesMap::iterator it = m_resources.begin(); it != databasesEnd; ++it)
it->second->bind(m_frontendProvider->frontend());
}
-void InspectorDatabaseAgent::disable(ErrorString*)
+void InspectorDatabaseAgent::clearFrontend()
{
- if (!m_enabled)
- return;
- m_enabled = false;
+ m_frontendProvider->clearFrontend();
+ m_frontendProvider.clear();
}
-void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, int databaseId, RefPtr<InspectorArray>* names)
+void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString*, int databaseId, RefPtr<InspectorArray>* names)
{
- if (!m_enabled) {
- *error = "Database agent is not enabled";
- return;
- }
-
Database* database = databaseForId(databaseId);
if (database) {
Vector<String> tableNames = database->tableNames();
}
}
-void InspectorDatabaseAgent::executeSQL(ErrorString* error, int databaseId, const String& query, bool* success, int* transactionId)
+void InspectorDatabaseAgent::executeSQL(ErrorString*, int databaseId, const String& query, bool* success, int* transactionId)
{
- if (!m_enabled) {
- *error = "Database agent is not enabled";
- return;
- }
-
Database* database = databaseForId(databaseId);
if (!database) {
*success = false;
void clearResources();
// Called from the front-end.
- void enable(ErrorString*);
- void disable(ErrorString*);
void getDatabaseTableNames(ErrorString*, int databaseId, RefPtr<InspectorArray>* names);
void executeSQL(ErrorString*, int databaseId, const String& query, bool* success, int* transactionId);
typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
DatabaseResourcesMap m_resources;
RefPtr<FrontendProvider> m_frontendProvider;
- bool m_enabled;
};
} // namespace WebCore
ConsoleAgent.setMonitoringXHREnabled(true);
ConsoleAgent.enable(this.console.setConsoleMessageExpiredCount.bind(this.console));
- DatabaseAgent.enable();
-
WebInspector.showPanel(WebInspector.settings.lastActivePanel);
function propertyNamesCallback(error, names)