Changeset 190210 in webkit
- Timestamp:
- Sep 24, 2015 11:17:08 AM (9 years ago)
- Location:
- trunk/Source
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r190209 r190210 1 2015-09-24 Chris Dumez <cdumez@apple.com> 2 3 Drop XPATH_NAMESPACE_NODE from Node::NodeType enum 4 https://bugs.webkit.org/show_bug.cgi?id=149532 5 6 Reviewed by Ryosuke Niwa. 7 8 Drop XPATH_NAMESPACE_NODE from Node::NodeType enum as there is currently 9 no way to construct such Node in WebKit. This avoid having to handle this 10 Node type everywhere. 11 12 * bindings/gobject/WebKitDOMPrivate.cpp: 13 (WebKit::wrap): Deleted. 14 * bindings/objc/DOM.mm: 15 (kitClass): Deleted. 16 * dom/Document.cpp: 17 (WebCore::Document::importNode): 18 (WebCore::Document::adoptNode): Deleted. 19 (WebCore::Document::childTypeAllowed): Deleted. 20 (WebCore::Document::canAcceptChild): Deleted. 21 * dom/Node.cpp: 22 (WebCore::Node::dumpStatistics): Deleted. 23 (WebCore::Node::textContent): Deleted. 24 (WebCore::Node::ancestorElement): Deleted. 25 * dom/Node.h: 26 * dom/Range.cpp: 27 (WebCore::Range::checkNodeWOffset): 28 (WebCore::lengthOfContentsInNode): Deleted. 29 (WebCore::Range::processContentsBetweenOffsets): Deleted. 30 (WebCore::Range::surroundContents): Deleted. 31 * editing/MarkupAccumulator.cpp: 32 (WebCore::MarkupAccumulator::appendStartMarkup): Deleted. 33 * xml/XPathFunctions.cpp: 34 (WebCore::XPath::expandedNameLocalPart): Deleted. 35 * xml/XPathStep.cpp: 36 (WebCore::XPath::Step::nodesInAxis): 37 (WebCore::XPath::primaryNodeType): Deleted. 38 * xml/XPathUtil.cpp: 39 (WebCore::XPath::stringValue): Deleted. 40 (WebCore::XPath::isValidContextNode): Deleted. 41 1 42 2015-09-24 David Hyatt <hyatt@apple.com> 2 43 -
trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp
r190120 r190210 105 105 case Node::DOCUMENT_FRAGMENT_NODE: 106 106 return WEBKIT_DOM_NODE(wrapDocumentFragment(static_cast<DocumentFragment*>(node))); 107 case Node::XPATH_NAMESPACE_NODE:108 break;109 107 } 110 108 -
trunk/Source/WebCore/bindings/objc/DOM.mm
r190120 r190210 324 324 case WebCore::Node::DOCUMENT_FRAGMENT_NODE: 325 325 return [DOMDocumentFragment class]; 326 case WebCore::Node::XPATH_NAMESPACE_NODE:327 // FIXME: Create an XPath objective C wrapper328 // See http://bugs.webkit.org/show_bug.cgi?id=8755329 return nil;330 326 } 331 327 ASSERT_NOT_REACHED(); -
trunk/Source/WebCore/dom/Document.cpp
r190169 r190210 953 953 case DOCUMENT_TYPE_NODE: // FIXME: Support cloning a DocumentType node per DOM4. 954 954 break; 955 956 case XPATH_NAMESPACE_NODE: 957 ASSERT_NOT_REACHED(); // These two types of DOM nodes are not implemented. 958 break; 959 } 955 } 956 960 957 ec = NOT_SUPPORTED_ERR; 961 958 return nullptr; … … 974 971 switch (source->nodeType()) { 975 972 case DOCUMENT_NODE: 976 case XPATH_NAMESPACE_NODE:977 973 ec = NOT_SUPPORTED_ERR; 978 974 return nullptr; … … 3345 3341 case DOCUMENT_NODE: 3346 3342 case TEXT_NODE: 3347 case XPATH_NAMESPACE_NODE:3348 3343 return false; 3349 3344 case COMMENT_NODE: … … 3372 3367 case DOCUMENT_NODE: 3373 3368 case TEXT_NODE: 3374 case XPATH_NAMESPACE_NODE:3375 3369 return false; 3376 3370 case COMMENT_NODE: -
trunk/Source/WebCore/dom/Node.cpp
r190120 r190210 109 109 size_t docTypeNodes = 0; 110 110 size_t fragmentNodes = 0; 111 size_t xpathNSNodes = 0;112 111 size_t shadowRootNodes = 0; 113 112 … … 191 190 break; 192 191 } 193 case XPATH_NAMESPACE_NODE: {194 ++xpathNSNodes;195 break;196 }197 192 } 198 193 } … … 212 207 printf(" Number of DocumentType nodes: %zu\n", docTypeNodes); 213 208 printf(" Number of DocumentFragment nodes: %zu\n", fragmentNodes); 214 printf(" Number of XPathNS nodes: %zu\n", xpathNSNodes);215 209 printf(" Number of ShadowRoot nodes: %zu\n", shadowRootNodes); 216 210 … … 1417 1411 case Node::DOCUMENT_NODE: 1418 1412 case Node::DOCUMENT_TYPE_NODE: 1419 case Node::XPATH_NAMESPACE_NODE:1420 1413 break; 1421 1414 } … … 1451 1444 case DOCUMENT_NODE: 1452 1445 case DOCUMENT_TYPE_NODE: 1453 case XPATH_NAMESPACE_NODE:1454 1446 // Do nothing. 1455 1447 return; -
trunk/Source/WebCore/dom/Node.h
r190120 r190210 131 131 DOCUMENT_TYPE_NODE = 10, 132 132 DOCUMENT_FRAGMENT_NODE = 11, 133 XPATH_NAMESPACE_NODE = 13,134 133 }; 135 134 enum DeprecatedNodeType { -
trunk/Source/WebCore/dom/Range.cpp
r190208 r190210 557 557 // This switch statement must be consistent with that of Range::processContentsBetweenOffsets. 558 558 switch (node.nodeType()) { 559 case Node::XPATH_NAMESPACE_NODE: // FIXME: Remove from NodeType as there is no way to construct such Node in WebKit.560 559 case Node::DOCUMENT_TYPE_NODE: 561 560 return 0; … … 728 727 case Node::DOCUMENT_TYPE_NODE: 729 728 case Node::DOCUMENT_FRAGMENT_NODE: 730 case Node::XPATH_NAMESPACE_NODE:731 729 // FIXME: Should we assert that some nodes never appear here? 732 730 if (action == Extract || action == Clone) { … … 1006 1004 case Node::DOCUMENT_FRAGMENT_NODE: 1007 1005 case Node::DOCUMENT_NODE: 1008 case Node::ELEMENT_NODE: 1009 case Node::XPATH_NAMESPACE_NODE: { 1006 case Node::ELEMENT_NODE: { 1010 1007 if (!offset) 1011 1008 return nullptr; … … 1148 1145 case Node::PROCESSING_INSTRUCTION_NODE: 1149 1146 case Node::TEXT_NODE: 1150 case Node::XPATH_NAMESPACE_NODE:1151 1147 break; 1152 1148 } -
trunk/Source/WebCore/editing/MarkupAccumulator.cpp
r190120 r190210 574 574 break; 575 575 case Node::ATTRIBUTE_NODE: 576 case Node::XPATH_NAMESPACE_NODE:577 576 ASSERT_NOT_REACHED(); 578 577 break; -
trunk/Source/WebCore/xml/XPathFunctions.cpp
r184566 r190210 361 361 static inline String expandedNameLocalPart(Node* node) 362 362 { 363 // The local part of an XPath expanded-name matches DOM local name for most node types, except for namespace nodes and processing instruction nodes.364 ASSERT(node->nodeType() != Node::XPATH_NAMESPACE_NODE); // Not supported yet.365 363 if (is<ProcessingInstruction>(*node)) 366 364 return downcast<ProcessingInstruction>(*node).target(); -
trunk/Source/WebCore/xml/XPathStep.cpp
r184566 r190210 154 154 case Step::AttributeAxis: 155 155 return Node::ATTRIBUTE_NODE; 156 case Step::NamespaceAxis:157 return Node::XPATH_NAMESPACE_NODE;158 156 default: 159 157 return Node::ELEMENT_NODE; … … 286 284 } 287 285 case FollowingSiblingAxis: 288 if (context. nodeType() == Node::ATTRIBUTE_NODE || context.nodeType() == Node::XPATH_NAMESPACE_NODE)286 if (context.isAttributeNode()) 289 287 return; 290 288 for (Node* node = context.nextSibling(); node; node = node->nextSibling()) { … … 294 292 return; 295 293 case PrecedingSiblingAxis: 296 if (context. nodeType() == Node::ATTRIBUTE_NODE || context.nodeType() == Node::XPATH_NAMESPACE_NODE)294 if (context.isAttributeNode()) 297 295 return; 298 296 for (Node* node = context.previousSibling(); node; node = node->previousSibling()) { -
trunk/Source/WebCore/xml/XPathUtil.cpp
r190120 r190210 48 48 case Node::TEXT_NODE: 49 49 case Node::CDATA_SECTION_NODE: 50 case Node::XPATH_NAMESPACE_NODE:51 50 return node->nodeValue(); 52 51 default: … … 68 67 case Node::ELEMENT_NODE: 69 68 case Node::PROCESSING_INSTRUCTION_NODE: 70 case Node::XPATH_NAMESPACE_NODE:71 69 return true; 72 70 case Node::DOCUMENT_FRAGMENT_NODE: -
trunk/Source/WebKit2/ChangeLog
r190201 r190210 1 2015-09-24 Chris Dumez <cdumez@apple.com> 2 3 Drop XPATH_NAMESPACE_NODE from Node::NodeType enum 4 https://bugs.webkit.org/show_bug.cgi?id=149532 5 6 Reviewed by Ryosuke Niwa. 7 8 Drop XPATH_NAMESPACE_NODE from Node::NodeType enum as there is currently 9 no way to construct such Node in WebKit. This avoid having to handle this 10 Node type everywhere. 11 12 * WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm: 13 (WebKit::WKDOMNodeClass): Deleted. 14 1 15 2015-09-24 Ryosuke Niwa <rniwa@webkit.org> 2 16 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm
r190120 r190210 81 81 case WebCore::Node::DOCUMENT_TYPE_NODE: 82 82 case WebCore::Node::DOCUMENT_FRAGMENT_NODE: 83 case WebCore::Node::XPATH_NAMESPACE_NODE:84 83 return [WKDOMNode class]; 85 84 }
Note: See TracChangeset
for help on using the changeset viewer.