Log Message
Merge r187897. rdar://problem/23581597
Modified Paths
- branches/safari-601.1.46-branch/LayoutTests/ChangeLog
- branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object-expected.txt
- branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object.html
- branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog
- branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js
Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193451 => 193452)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-04 20:53:33 UTC (rev 193452)
@@ -1,5 +1,19 @@
2015-12-04 Timothy Hatcher <[email protected]>
+ Merge r187897. rdar://problem/23581597
+
+ 2015-08-04 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Object previews for SVG elements shows SVGAnimatedString instead of text
+ https://bugs.webkit.org/show_bug.cgi?id=147328
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/model/remote-object-expected.txt:
+ * inspector/model/remote-object.html:
+
+2015-12-04 Timothy Hatcher <[email protected]>
+
Merge r192592. rdar://problem/23581597
2015-11-18 Joseph Pecoraro <[email protected]>
Modified: branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object-expected.txt (193451 => 193452)
--- branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object-expected.txt 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object-expected.txt 2015-12-04 20:53:33 UTC (rev 193452)
@@ -1826,20 +1826,64 @@
}
-----------------------------------------------------
-_expression_: [document.body, div, span, input, text, comment]
+_expression_: svgElement = document.createElementNS('http://www.w3.org/2000/svg', 'rect'); svgElement.classList.add('test'); svgElement
{
"_type": "object",
+ "_subtype": "node",
+ "_objectId": "<filtered>",
+ "_description": "rect.test",
+ "_preview": {
+ "_type": "object",
+ "_subtype": "node",
+ "_description": "rect.test",
+ "_lossless": false,
+ "_overflow": true,
+ "_properties": [
+ {
+ "_name": "x",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ },
+ {
+ "_name": "y",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ },
+ {
+ "_name": "width",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ },
+ {
+ "_name": "height",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ },
+ {
+ "_name": "rx",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ }
+ ],
+ "_entries": null
+ }
+}
+
+-----------------------------------------------------
+_expression_: [document.body, div, span, input, text, comment, svgElement]
+{
+ "_type": "object",
"_subtype": "array",
"_objectId": "<filtered>",
"_description": "Array",
- "_size": 6,
+ "_size": 7,
"_preview": {
"_type": "object",
"_subtype": "array",
"_description": "Array",
"_lossless": false,
"_overflow": false,
- "_size": 6,
+ "_size": 7,
"_properties": [
{
"_name": "0",
@@ -1876,6 +1920,12 @@
"_type": "object",
"_subtype": "node",
"_value": "<!--comment content-->"
+ },
+ {
+ "_name": "6",
+ "_type": "object",
+ "_subtype": "node",
+ "_value": "<rect class=\"test\">"
}
],
"_entries": null
Modified: branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object.html (193451 => 193452)
--- branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object.html 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object.html 2015-12-04 20:53:33 UTC (rev 193452)
@@ -113,7 +113,8 @@
{_expression_: "input = document.createElement('input'); input.type = 'password'; input"},
{_expression_: "text = document.createTextNode('text content'); text"},
{_expression_: "comment = document.createComment('comment content'); comment"},
- {_expression_: "[document.body, div, span, input, text, comment]"},
+ {_expression_: "svgElement = document.createElementNS('http://www.w3.org/2000/svg', 'rect'); svgElement.classList.add('test'); svgElement"},
+ {_expression_: "[document.body, div, span, input, text, comment, svgElement]"},
// Node Collections (NodeLists / Collections)
{_expression_: "document.all", browserOnly: true}, // HTMLAllCollection
Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog (193451 => 193452)
--- branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog 2015-12-04 20:53:33 UTC (rev 193452)
@@ -1,3 +1,17 @@
+2015-12-04 Timothy Hatcher <[email protected]>
+
+ Merge r187897. rdar://problem/23581597
+
+ 2015-08-04 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Object previews for SVG elements shows SVGAnimatedString instead of text
+ https://bugs.webkit.org/show_bug.cgi?id=147328
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InjectedScriptSource.js:
+ Use classList and classList.toString instead of className.
+
2015-12-02 Timothy Hatcher <[email protected]>
Merge r191967. rdar://problem/23221163
Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js (193451 => 193452)
--- branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-12-04 20:53:33 UTC (rev 193452)
@@ -810,8 +810,8 @@
case 1: // Node.ELEMENT_NODE
if (node.id)
return "<" + nodeName + " id=\"" + node.id + "\">";
- if (node.className)
- return "<" + nodeName + " class=\"" + node.className + "\">";
+ if (node.classList.length)
+ return "<" + nodeName + " class=\"" + node.classList.toString() + "\">";
if (nodeName === "input" && node.type)
return "<" + nodeName + " type=\"" + node.type + "\">";
return "<" + nodeName + ">";
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
