Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (204113 => 204114)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-04 05:11:26 UTC (rev 204114)
@@ -1,5 +1,16 @@
2016-08-03 Chris Dumez <[email protected]>
+ Drop DocumentType.internalSubset attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160530
+
+ Reviewed by Alex Christensen.
+
+ Rebaseline W3C test now that one more check is passing.
+
+ * web-platform-tests/dom/historical-expected.txt:
+
+2016-08-03 Chris Dumez <[email protected]>
+
Drop legacy Document.defaultCharset attribute
https://bugs.webkit.org/show_bug.cgi?id=160536
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt (204113 => 204114)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt 2016-08-04 05:11:26 UTC (rev 204114)
@@ -42,7 +42,7 @@
PASS Historical DOM features must be removed: setIdAttributeNode
PASS DocumentType member must be nuked: entities
PASS DocumentType member must be nuked: notations
-FAIL DocumentType member must be nuked: internalSubset assert_equals: expected (undefined) undefined but got (object) null
+PASS DocumentType member must be nuked: internalSubset
PASS Text member must be nuked: isElementContentWhitespace
FAIL Text member must be nuked: replaceWholeText assert_equals: expected (undefined) undefined but got (function) function "function replaceWholeText() {
[native code]
Modified: trunk/Source/_javascript_Core/ChangeLog (204113 => 204114)
--- trunk/Source/_javascript_Core/ChangeLog 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-08-04 05:11:26 UTC (rev 204114)
@@ -1,3 +1,14 @@
+2016-08-03 Chris Dumez <[email protected]>
+
+ Drop DocumentType.internalSubset attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160530
+
+ Reviewed by Alex Christensen.
+
+ Drop DocumentType.internalSubset attribute.
+
+ * inspector/protocol/DOM.json:
+
2016-08-03 Benjamin Poulain <[email protected]>
[JSC] Improve the memory locality of DFG Node's AbstractValues
Modified: trunk/Source/_javascript_Core/inspector/protocol/DOM.json (204113 => 204114)
--- trunk/Source/_javascript_Core/inspector/protocol/DOM.json 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/_javascript_Core/inspector/protocol/DOM.json 2016-08-04 05:11:26 UTC (rev 204114)
@@ -47,7 +47,6 @@
{ "name": "baseURL", "type": "string", "optional": true, "description": "Base URL that <code>Document</code> or <code>FrameOwner</code> node uses for URL completion." },
{ "name": "publicId", "type": "string", "optional": true, "description": "<code>DocumentType</code>'s publicId." },
{ "name": "systemId", "type": "string", "optional": true, "description": "<code>DocumentType</code>'s systemId." },
- { "name": "internalSubset", "type": "string", "optional": true, "description": "<code>DocumentType</code>'s internalSubset." },
{ "name": "xmlVersion", "type": "string", "optional": true, "description": "<code>Document</code>'s XML version in case of XML documents." },
{ "name": "name", "type": "string", "optional": true, "description": "<code>Attr</code>'s name." },
{ "name": "value", "type": "string", "optional": true, "description": "<code>Attr</code>'s value." },
Modified: trunk/Source/WebCore/ChangeLog (204113 => 204114)
--- trunk/Source/WebCore/ChangeLog 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebCore/ChangeLog 2016-08-04 05:11:26 UTC (rev 204114)
@@ -1,5 +1,34 @@
2016-08-03 Chris Dumez <[email protected]>
+ Drop DocumentType.internalSubset attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160530
+
+ Reviewed by Alex Christensen.
+
+ Drop DocumentType.internalSubset attribute.
+
+ It is no longer in the DOM specification:
+ - https://dom.spec.whatwg.org/#documenttype
+ - https://w3c.github.io/DOM-Parsing/#xml-serializing-a-documenttype-node
+
+ Other browsers have already dropped it. In WebKit, it was always null
+ anyway.
+
+ No new tests, rebaselined existing test.
+
+ * bindings/objc/DOMDocumentType.mm:
+ (-[DOMDocumentType internalSubset]):
+ * dom/DocumentType.h:
+ * dom/DocumentType.idl:
+ * dom/Node.cpp:
+ (WebCore::Node::isEqualNode): Deleted.
+ * editing/MarkupAccumulator.cpp:
+ (WebCore::MarkupAccumulator::appendDocumentType): Deleted.
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForNode): Deleted.
+
+2016-08-03 Chris Dumez <[email protected]>
+
Drop legacy Document.defaultCharset attribute
https://bugs.webkit.org/show_bug.cgi?id=160536
Modified: trunk/Source/WebCore/bindings/objc/DOMDocumentType.mm (204113 => 204114)
--- trunk/Source/WebCore/bindings/objc/DOMDocumentType.mm 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebCore/bindings/objc/DOMDocumentType.mm 2016-08-04 05:11:26 UTC (rev 204114)
@@ -74,7 +74,7 @@
- (NSString *)internalSubset
{
WebCore::JSMainThreadNullState state;
- return IMPL->internalSubset();
+ return IMPL->internalSubsetForBindings();
}
- (void)remove
Modified: trunk/Source/WebCore/dom/DocumentType.h (204113 => 204114)
--- trunk/Source/WebCore/dom/DocumentType.h 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebCore/dom/DocumentType.h 2016-08-04 05:11:26 UTC (rev 204114)
@@ -40,11 +40,11 @@
// These are needed by ObjC / GObject bindings for backward compatibility.
NamedNodeMap* entitiesForBindings() const { return nullptr; }
NamedNodeMap* notationsForBindings() const { return nullptr; }
+ String internalSubsetForBindings() const { return String(); }
const String& name() const { return m_name; }
const String& publicId() const { return m_publicId; }
const String& systemId() const { return m_systemId; }
- const String& internalSubset() const { return m_subset; }
private:
DocumentType(Document&, const String& name, const String& publicId, const String& systemId);
@@ -56,7 +56,6 @@
String m_name;
String m_publicId;
String m_systemId;
- String m_subset;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/dom/DocumentType.idl (204113 => 204114)
--- trunk/Source/WebCore/dom/DocumentType.idl 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebCore/dom/DocumentType.idl 2016-08-04 05:11:26 UTC (rev 204114)
@@ -29,6 +29,7 @@
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
[ImplementedAs=entitiesForBindings] readonly attribute NamedNodeMap entities;
[ImplementedAs=notationsForBindings] readonly attribute NamedNodeMap notations;
+ [ImplementedAs=internalSubsetForBindings] readonly attribute DOMString? internalSubset;
#endif
// DOM Level 2
@@ -35,7 +36,6 @@
readonly attribute DOMString publicId;
readonly attribute DOMString systemId;
- readonly attribute DOMString? internalSubset;
};
DocumentType implements ChildNode;
Modified: trunk/Source/WebCore/dom/Node.cpp (204113 => 204114)
--- trunk/Source/WebCore/dom/Node.cpp 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-08-04 05:11:26 UTC (rev 204114)
@@ -1226,8 +1226,6 @@
return false;
if (thisDocType.systemId() != otherDocType.systemId())
return false;
- if (thisDocType.internalSubset() != otherDocType.internalSubset())
- return false;
break;
}
case Node::ELEMENT_NODE: {
Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (204113 => 204114)
--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2016-08-04 05:11:26 UTC (rev 204114)
@@ -404,12 +404,6 @@
result.append(documentType.systemId());
result.append('"');
}
- if (!documentType.internalSubset().isNull()) {
- result.append(' ');
- result.append('[');
- result.append(documentType.internalSubset());
- result.append(']');
- }
result.append('>');
}
Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (204113 => 204114)
--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-08-04 05:11:26 UTC (rev 204114)
@@ -1401,7 +1401,6 @@
DocumentType& docType = downcast<DocumentType>(*node);
value->setPublicId(docType.publicId());
value->setSystemId(docType.systemId());
- value->setInternalSubset(docType.internalSubset());
} else if (is<Attr>(*node)) {
Attr& attribute = downcast<Attr>(*node);
value->setName(attribute.name());
Modified: trunk/Source/WebInspectorUI/ChangeLog (204113 => 204114)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-08-04 05:11:26 UTC (rev 204114)
@@ -1,3 +1,19 @@
+2016-08-03 Chris Dumez <[email protected]>
+
+ Drop DocumentType.internalSubset attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160530
+
+ Reviewed by Alex Christensen.
+
+ Drop DocumentType.internalSubset attribute.
+
+ * UserInterface/Models/DOMNode.js:
+ (WebInspector.DOMNode): Deleted.
+ * UserInterface/Models/DOMSearchMatchObject.js:
+ (WebInspector.DOMSearchMatchObject.titleForDOMNode): Deleted.
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype._nodeTitleInfo): Deleted.
+
2016-08-03 Matt Baker <[email protected]>
Web Inspector: Cmd-L shortcut for Jump to Line conflicts with selecting URL of inspected page
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (204113 => 204114)
--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2016-08-04 05:11:26 UTC (rev 204114)
@@ -122,7 +122,6 @@
} else if (this._nodeType === Node.DOCUMENT_TYPE_NODE) {
this.publicId = payload.publicId;
this.systemId = payload.systemId;
- this.internalSubset = payload.internalSubset;
} else if (this._nodeType === Node.DOCUMENT_NODE) {
this.documentURL = payload.documentURL;
this.xmlVersion = payload.xmlVersion;
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js (204113 => 204114)
--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js 2016-08-04 05:11:26 UTC (rev 204114)
@@ -68,9 +68,6 @@
} else if (domNode.systemId)
title += " SYSTEM \"" + domNode.systemId + "\"";
- if (domNode.internalSubset)
- title += " [" + domNode.internalSubset + "]";
-
return title + ">";
case Node.CDATA_SECTION_NODE:
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (204113 => 204114)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2016-08-04 05:09:18 UTC (rev 204113)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2016-08-04 05:11:26 UTC (rev 204114)
@@ -1306,9 +1306,6 @@
} else if (node.systemId)
docTypeElement.append(" SYSTEM \"" + node.systemId + "\"");
- if (node.internalSubset)
- docTypeElement.append(" [" + node.internalSubset + "]");
-
docTypeElement.append(">");
break;
