Merge r31320.
git-svn-id: http://svn.webkit.org/repository/webkit/branches/Safari-3-1-branch@31601 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fa3efd0..a0193a2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2008-04-03 Mark Rowe <mrowe@apple.com>
+
+ Merge r31320 to Safari-3-1-branch.
+
+ 2008-03-26 Adam Roben <aroben@apple.com>
+
+ Fix Bug 17768: REGRESSION (r30146): Inspector no longer shows elements
+ properties
+
+ <http://bugs.webkit.org/show_bug.cgi?id=17768>
+
+ We were throwing an exception from Object.describe because of some
+ undefined variables.
+
+ Reviewed by Tim Hatcher.
+
+ * page/inspector/utilities.js:
+ (Object.describe): Reinstate the type1 and type2 variables that were
+ removed in r30146. They're still used when formatting a function.
+
2008-03-31 Mark Rowe <mrowe@apple.com>
Merge r31438 to Safari-3-1-branch.
diff --git a/WebCore/page/inspector/utilities.js b/WebCore/page/inspector/utilities.js
index a92fe4d..4aa801b 100644
--- a/WebCore/page/inspector/utilities.js
+++ b/WebCore/page/inspector/utilities.js
@@ -54,9 +54,12 @@
Object.describe = function(obj, abbreviated)
{
- switch (Object.type(obj)) {
+ var type1 = Object.type(obj);
+ var type2 = Object.prototype.toString.call(obj).replace(/^\[object (.*)\]$/i, "$1");
+
+ switch (type1) {
case "object":
- return Object.prototype.toString.call(obj).replace(/^\[object (.*)\]$/i, "$1");
+ return type2;
case "array":
return "[" + obj.toString() + "]";
case "string":
