Title: [115813] trunk/Source/WebCore
- Revision
- 115813
- Author
- [email protected]
- Date
- 2012-05-02 04:56:34 -0700 (Wed, 02 May 2012)
Log Message
Web Inspector: live edit fails to report error
https://bugs.webkit.org/show_bug.cgi?id=85357
Reviewed by Yury Semikhatsky.
ProtocolError is now a string, not an error object.
* inspector/front-end/DatabaseQueryView.js:
(WebInspector.DatabaseQueryView.prototype._queryError):
* inspector/front-end/SourceFrame.js:
(WebInspector.SourceFrame.prototype.didEditContent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115812 => 115813)
--- trunk/Source/WebCore/ChangeLog 2012-05-02 11:51:32 UTC (rev 115812)
+++ trunk/Source/WebCore/ChangeLog 2012-05-02 11:56:34 UTC (rev 115813)
@@ -1,3 +1,17 @@
+2012-05-02 Pavel Feldman <[email protected]>
+
+ Web Inspector: live edit fails to report error
+ https://bugs.webkit.org/show_bug.cgi?id=85357
+
+ Reviewed by Yury Semikhatsky.
+
+ ProtocolError is now a string, not an error object.
+
+ * inspector/front-end/DatabaseQueryView.js:
+ (WebInspector.DatabaseQueryView.prototype._queryError):
+ * inspector/front-end/SourceFrame.js:
+ (WebInspector.SourceFrame.prototype.didEditContent):
+
2012-05-02 Lars Knudsen <[email protected]>
[Qt] Make DeviceMotion and DeviceOrientation work with WebKit2
Modified: trunk/Source/WebCore/inspector/front-end/DatabaseQueryView.js (115812 => 115813)
--- trunk/Source/WebCore/inspector/front-end/DatabaseQueryView.js 2012-05-02 11:51:32 UTC (rev 115812)
+++ trunk/Source/WebCore/inspector/front-end/DatabaseQueryView.js 2012-05-02 11:56:34 UTC (rev 115813)
@@ -150,7 +150,9 @@
_queryError: function(query, error)
{
- if (error.message)
+ if (typeof error === "string")
+ var message = error;
+ else if (error.message)
var message = error.message;
else if (error.code == 2)
var message = WebInspector.UIString("Database no longer has expected version.");
Modified: trunk/Source/WebCore/inspector/front-end/SourceFrame.js (115812 => 115813)
--- trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2012-05-02 11:51:32 UTC (rev 115812)
+++ trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2012-05-02 11:56:34 UTC (rev 115813)
@@ -506,8 +506,7 @@
didEditContent: function(error, content)
{
if (error) {
- if (error.message)
- WebInspector.log(error.message, WebInspector.ConsoleMessage.MessageLevel.Error, true);
+ WebInspector.log(error, WebInspector.ConsoleMessage.MessageLevel.Error, true);
return;
}
},
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
