Title: [142128] trunk
- Revision
- 142128
- Author
- [email protected]
- Date
- 2013-02-07 08:30:20 -0800 (Thu, 07 Feb 2013)
Log Message
Web Inspector: [Regression] Map.size() returns negative values.
https://bugs.webkit.org/show_bug.cgi?id=109174
Reviewed by Yury Semikhatsky.
Source/WebCore:
* inspector/front-end/utilities.js:
LayoutTests:
* inspector/map-expected.txt:
* inspector/map.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (142127 => 142128)
--- trunk/LayoutTests/ChangeLog 2013-02-07 16:25:43 UTC (rev 142127)
+++ trunk/LayoutTests/ChangeLog 2013-02-07 16:30:20 UTC (rev 142128)
@@ -1,3 +1,13 @@
+2013-02-07 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: [Regression] Map.size() returns negative values.
+ https://bugs.webkit.org/show_bug.cgi?id=109174
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/map-expected.txt:
+ * inspector/map.html:
+
2013-02-07 Kent Tamura <[email protected]>
Conversion from localized numbers to HTML numbers should accept not only localized numbers but also HTML numbers
Modified: trunk/LayoutTests/inspector/map-expected.txt (142127 => 142128)
--- trunk/LayoutTests/inspector/map-expected.txt 2013-02-07 16:25:43 UTC (rev 142127)
+++ trunk/LayoutTests/inspector/map-expected.txt 2013-02-07 16:30:20 UTC (rev 142128)
@@ -5,96 +5,120 @@
First map:
key1 : undefined
key2 : undefined
+ size : 0
Second map:
key1 : undefined
key2 : undefined
+ size : 0
Dumping maps:
First map:
key1 : 2
key2 : undefined
+ size : 1
Second map:
key1 : undefined
key2 : undefined
+ size : 0
Dumping maps:
First map:
key1 : 1
key2 : undefined
+ size : 1
Second map:
key1 : undefined
key2 : undefined
+ size : 0
Dumping maps:
First map:
key1 : 1
key2 : undefined
+ size : 1
Second map:
key1 : 1
key2 : undefined
+ size : 1
Dumping maps:
First map:
key1 : 1
key2 : undefined
+ size : 1
Second map:
key1 : 2
key2 : undefined
+ size : 1
Dumping maps:
First map:
key1 : 1
key2 : 2
+ size : 2
Second map:
key1 : 2
key2 : undefined
+ size : 1
Dumping maps:
First map:
key1 : 1
key2 : 2
+ size : 2
Second map:
key1 : 2
key2 : 1
+ size : 2
Dumping maps:
First map:
key1 : 1
key2 : undefined
+ size : 1
Second map:
key1 : 2
key2 : 1
+ size : 2
Dumping maps:
First map:
key1 : 1
key2 : undefined
+ size : 1
Second map:
key1 : 2
key2 : undefined
+ size : 1
Dumping maps:
First map:
key1 : 1
key2 : undefined
+ size : 1
Second map:
key1 : 2
key2 : undefined
+ size : 1
Dumping maps:
First map:
key1 : undefined
key2 : undefined
+ size : 0
Second map:
key1 : 2
key2 : undefined
+ size : 1
Dumping maps:
First map:
key1 : undefined
key2 : undefined
+ size : 0
Second map:
key1 : undefined
key2 : undefined
+ size : 0
Modified: trunk/LayoutTests/inspector/map.html (142127 => 142128)
--- trunk/LayoutTests/inspector/map.html 2013-02-07 16:25:43 UTC (rev 142127)
+++ trunk/LayoutTests/inspector/map.html 2013-02-07 16:30:20 UTC (rev 142128)
@@ -11,9 +11,11 @@
InspectorTest.addResult(" First map:");
InspectorTest.addResult(" key1 : " + map1.get(key1));
InspectorTest.addResult(" key2 : " + map1.get(key2));
+ InspectorTest.addResult(" size : " + map1.size());
InspectorTest.addResult(" Second map:");
InspectorTest.addResult(" key1 : " + map2.get(key1));
InspectorTest.addResult(" key2 : " + map2.get(key2));
+ InspectorTest.addResult(" size : " + map2.size());
InspectorTest.addResult("");
}
Modified: trunk/Source/WebCore/ChangeLog (142127 => 142128)
--- trunk/Source/WebCore/ChangeLog 2013-02-07 16:25:43 UTC (rev 142127)
+++ trunk/Source/WebCore/ChangeLog 2013-02-07 16:30:20 UTC (rev 142128)
@@ -1,3 +1,12 @@
+2013-02-07 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: [Regression] Map.size() returns negative values.
+ https://bugs.webkit.org/show_bug.cgi?id=109174
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/utilities.js:
+
2013-02-07 Pavel Feldman <[email protected]>
Web Inspector: break details are only rendered upon first debugger pause.
Modified: trunk/Source/WebCore/inspector/front-end/utilities.js (142127 => 142128)
--- trunk/Source/WebCore/inspector/front-end/utilities.js 2013-02-07 16:25:43 UTC (rev 142127)
+++ trunk/Source/WebCore/inspector/front-end/utilities.js 2013-02-07 16:30:20 UTC (rev 142128)
@@ -724,9 +724,11 @@
remove: function(key)
{
var result = this._map[key.__identifier];
+ if (!result)
+ return undefined;
+ --this._size;
delete this._map[key.__identifier];
- --this._size;
- return result ? result[1] : undefined;
+ return result[1];
},
/**
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
