From dd8bb3de4f353a81954234999f1fea748aee2ea9 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 14:44:44 +0100 Subject: Merge WebKit at r65072 : Initial merge by git. Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585 --- WebCore/inspector/front-end/DatabaseQueryView.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'WebCore/inspector/front-end/DatabaseQueryView.js') diff --git a/WebCore/inspector/front-end/DatabaseQueryView.js b/WebCore/inspector/front-end/DatabaseQueryView.js index 38c8df4..a179eaa 100644 --- a/WebCore/inspector/front-end/DatabaseQueryView.js +++ b/WebCore/inspector/front-end/DatabaseQueryView.js @@ -137,9 +137,9 @@ WebInspector.DatabaseQueryView.prototype = { this.database.executeSql(query, this._queryFinished.bind(this, query), this._queryError.bind(this, query)); }, - _queryFinished: function(query, result) + _queryFinished: function(query, columnNames, values) { - var dataGrid = WebInspector.panels.storage.dataGridForResult(result); + var dataGrid = WebInspector.panels.storage.dataGridForResult(columnNames, values); var trimmedQuery = query.trim(); if (dataGrid) { @@ -154,7 +154,7 @@ WebInspector.DatabaseQueryView.prototype = { _queryError: function(query, error) { - if (error.code == 1) + if (error.message) var message = error.message; else if (error.code == 2) var message = WebInspector.UIString("Database no longer has expected version."); -- cgit v1.1