Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 03:49:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1432186 part 4. Remove nsIDOMNode's nodeValue attribute. r=mccr8

Browse Source 
MozReview-Commit-ID: Aqt4NDjcdKW
This commit is contained in:
Boris Zbarsky 2018-01-29 23:10:50 -05:00
parent c646473558
commit 3b6d43f65c
6 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/windows/sdn/sdnAccessible.cpp
View File

@ -101,7 +101,7 @@ sdnAccessible::get_nodeInfo(BSTR __RPC_FAR* aNodeName,
}
nsAutoString nodeValue;
DOMNode->GetNodeValue(nodeValue);
mNode->GetNodeValue(nodeValue);
*aNodeValue = ::SysAllocString(nodeValue.get());
*aNameSpaceID = mNode->IsContent()

3
accessible/windows/sdn/sdnTextAccessible.cpp
View File

@ -42,8 +42,7 @@ sdnTextAccessible::get_domText(BSTR __RPC_FAR* aText)
nsAutoString nodeValue;
nsCOMPtr<nsIDOMNode> DOMNode(do_QueryInterface(mAccessible->GetContent()));
DOMNode->GetNodeValue(nodeValue);
mAccessible->GetContent()->GetNodeValue(nodeValue);
if (nodeValue.IsEmpty())
return S_FALSE;

11
dom/base/nsINode.h
View File

@ -2270,17 +2270,6 @@ ToCanonicalSupports(nsINode* aPointer)
}
#define NS_FORWARD_NSIDOMNODE_TO_NSINODE_HELPER(...) \
NS_IMETHOD GetNodeValue(nsAString& aNodeValue) __VA_ARGS__ override \
{ \
nsINode::GetNodeValue(aNodeValue); \
return NS_OK; \
} \
NS_IMETHOD SetNodeValue(const nsAString& aNodeValue) __VA_ARGS__ override \
{ \
mozilla::ErrorResult rv; \
nsINode::SetNodeValue(aNodeValue, rv); \
return rv.StealNSResult(); \
} \
NS_IMETHOD GetNodeType(uint16_t* aNodeType) __VA_ARGS__ override \
{ \
*aNodeType = nsINode::NodeType(); \

45
dom/base/nsRange.cpp
View File

@ -2316,11 +2316,16 @@ nsRange::CutContents(DocumentFragment** aFragment)
rv = charData->SubstringData(startOffset, endOffset - startOffset,
cutValue);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDOMNode> clone;
rv = charData->CloneNode(false, 1, getter_AddRefs(clone));
NS_ENSURE_SUCCESS(rv, rv);
clone->SetNodeValue(cutValue);
nodeToResult = do_QueryInterface(clone);
ErrorResult err;
nsCOMPtr<nsINode> clone = node->CloneNode(false, err);
if (NS_WARN_IF(err.Failed())) {
return err.StealNSResult();
}
clone->SetNodeValue(cutValue, err);
if (NS_WARN_IF(err.Failed())) {
return err.StealNSResult();
}
nodeToResult = clone;
}
nsMutationGuard guard;
@ -2344,11 +2349,16 @@ nsRange::CutContents(DocumentFragment** aFragment)
nsAutoString cutValue;
rv = charData->SubstringData(startOffset, dataLength, cutValue);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDOMNode> clone;
rv = charData->CloneNode(false, 1, getter_AddRefs(clone));
NS_ENSURE_SUCCESS(rv, rv);
clone->SetNodeValue(cutValue);
nodeToResult = do_QueryInterface(clone);
ErrorResult err;
nsCOMPtr<nsINode> clone = node->CloneNode(false, err);
if (NS_WARN_IF(err.Failed())) {
return err.StealNSResult();
}
clone->SetNodeValue(cutValue, err);
if (NS_WARN_IF(err.Failed())) {
return err.StealNSResult();
}
nodeToResult = clone;
}
nsMutationGuard guard;
@ -2368,11 +2378,16 @@ nsRange::CutContents(DocumentFragment** aFragment)
nsAutoString cutValue;
rv = charData->SubstringData(0, endOffset, cutValue);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDOMNode> clone;
rv = charData->CloneNode(false, 1, getter_AddRefs(clone));
NS_ENSURE_SUCCESS(rv, rv);
clone->SetNodeValue(cutValue);
nodeToResult = do_QueryInterface(clone);
ErrorResult err;
nsCOMPtr<nsINode> clone = node->CloneNode(false, err);
if (NS_WARN_IF(err.Failed())) {
return err.StealNSResult();
}
clone->SetNodeValue(cutValue, err);
if (NS_WARN_IF(err.Failed())) {
return err.StealNSResult();
}
nodeToResult = clone;
}
nsMutationGuard guard;

3
dom/interfaces/core/nsIDOMNode.idl
View File

@ -32,9 +32,6 @@ interface nsIDOMNode : nsISupports
const unsigned short DOCUMENT_FRAGMENT_NODE = 11;
const unsigned short NOTATION_NODE = 12;
attribute DOMString nodeValue;
// raises(DOMException) on setting
// raises(DOMException) on retrieval
readonly attribute unsigned short nodeType;
readonly attribute nsIDOMNode parentNode;
readonly attribute nsIDOMNodeList childNodes;

4
editor/txtsvc/TextServicesDocument.cpp
View File

@ -2896,9 +2896,7 @@ TextServicesDocument::CreateOffsetTable(nsTArray<OffsetEntry*>* aOffsetTable,
}
nsString str;
rv = content->AsDOMNode()->GetNodeValue(str);
NS_ENSURE_SUCCESS(rv, rv);
content->GetNodeValue(str);
// Add an entry for this text node into the offset table: