Title: [136431] trunk/Source
Revision
136431
Author
[email protected]
Date
2012-12-03 13:05:27 -0800 (Mon, 03 Dec 2012)

Log Message

Web Inspector: make ASSERTION FAILED: foundPropertiesCount == object->size() more useful
https://bugs.webkit.org/show_bug.cgi?id=103254

Patch by Peter Rybin <[email protected]> on 2012-12-03
Reviewed by Pavel Feldman.

Source/_javascript_Core:

Missing symbol WTFReportFatalError is added to the linker list.

* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:

Source/WebCore:

Assert code generation is slightly changed so that it dumped JSON object text before crashing.

* inspector/CodeGeneratorInspector.py:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (136430 => 136431)


--- trunk/Source/_javascript_Core/ChangeLog	2012-12-03 20:56:05 UTC (rev 136430)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-12-03 21:05:27 UTC (rev 136431)
@@ -1,3 +1,14 @@
+2012-12-03  Peter Rybin  <[email protected]>
+
+        Web Inspector: make ASSERTION FAILED: foundPropertiesCount == object->size() more useful
+        https://bugs.webkit.org/show_bug.cgi?id=103254
+
+        Reviewed by Pavel Feldman.
+
+        Missing symbol WTFReportFatalError is added to the linker list.
+
+        * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+
 2012-12-03  Alexis Menard  <[email protected]>
 
         [Mac] Enable CSS3 background-position offset by default.

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (136430 => 136431)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-12-03 20:56:05 UTC (rev 136430)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-12-03 21:05:27 UTC (rev 136431)
@@ -436,4 +436,5 @@
     WTFReportAssertionFailureWithMessage
     WTFReportBacktrace
     WTFReportError
+    WTFReportFatalError
     WTFSetCrashHook

Modified: trunk/Source/WebCore/ChangeLog (136430 => 136431)


--- trunk/Source/WebCore/ChangeLog	2012-12-03 20:56:05 UTC (rev 136430)
+++ trunk/Source/WebCore/ChangeLog	2012-12-03 21:05:27 UTC (rev 136431)
@@ -1,3 +1,14 @@
+2012-12-03  Peter Rybin  <[email protected]>
+
+        Web Inspector: make ASSERTION FAILED: foundPropertiesCount == object->size() more useful
+        https://bugs.webkit.org/show_bug.cgi?id=103254
+
+        Reviewed by Pavel Feldman.
+
+        Assert code generation is slightly changed so that it dumped JSON object text before crashing.
+
+        * inspector/CodeGeneratorInspector.py:
+
 2012-12-03  Max Vujovic  <[email protected]>
 
         [CSS Shaders] Do not clamp indirect array indices during CSS Shaders ANGLE validation pass

Modified: trunk/Source/WebCore/inspector/CodeGeneratorInspector.py (136430 => 136431)


--- trunk/Source/WebCore/inspector/CodeGeneratorInspector.py	2012-12-03 20:56:05 UTC (rev 136430)
+++ trunk/Source/WebCore/inspector/CodeGeneratorInspector.py	2012-12-03 21:05:27 UTC (rev 136431)
@@ -1338,7 +1338,9 @@
                                         validator_writer.newline("    }\n")
 
                                     if closed_field_set:
-                                        validator_writer.newline("    ASSERT(foundPropertiesCount == object->size());\n")
+                                        validator_writer.newline("    if (foundPropertiesCount != object->size()) {\n")
+                                        validator_writer.newline("      FATAL(\"Unexpected properties in object: %s\\n\", object->toJSONString().ascii().data());\n")
+                                        validator_writer.newline("    }\n")
                                     validator_writer.newline("}\n")
 
                                     if domain_guard:
@@ -2564,6 +2566,7 @@
 #if ENABLE(INSPECTOR)
 
 #include "InspectorTypeBuilder.h"
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to