Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1613830 - Add nsINode::GetAsElementOrParentElement() r=smaug

Browse Source 
This patch assumes that only element node can have content node.  I.e., we
won't hit the following `MOZ_ASSERT`:

```
Element* element = nullptr;
nsIContent* content = aContent;
while (content) {
  if (content->IsElement()) {
    element = content->AsElement();
    break;
  }
  content = content->GetParent();
}
MOZ_ASSERT(!content || content == element || content->GetParent() == element);
```

Differential Revision: https://phabricator.services.mozilla.com/D63308

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Masayuki Nakano 2020-02-21 02:47:05 +00:00
parent 1abd55a851
commit 1110bedb45
10 changed files with 84 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/base/Element.h
View File

@ -1996,6 +1996,11 @@ inline mozilla::dom::Element* nsINode::GetPreviousElementSibling() const {
return nullptr;
}
inline mozilla::dom::Element* nsINode::GetAsElementOrParentElement() const {
return IsElement() ? const_cast<mozilla::dom::Element*>(AsElement())
: GetParentElement();
}
inline mozilla::dom::Element* nsINode::GetNextElementSibling() const {
nsIContent* nextSibling = GetNextSibling();
while (nextSibling) {

18
dom/base/FragmentOrElement.cpp
View File

@ -276,22 +276,18 @@ nsresult nsIContent::LookupNamespaceURIInternal(
}
// Trace up the content parent chain looking for the namespace
// declaration that declares aNamespacePrefix.
const nsIContent* content = this;
do {
if (content->IsElement() &&
content->AsElement()->GetAttr(kNameSpaceID_XMLNS, name, aNamespaceURI))
for (Element* element = GetAsElementOrParentElement(); element;
element = element->GetParentElement()) {
if (element->GetAttr(kNameSpaceID_XMLNS, name, aNamespaceURI)) {
return NS_OK;
} while ((content = content->GetParent()));
}
}
return NS_ERROR_FAILURE;
}
nsAtom* nsIContent::GetLang() const {
for (const auto* content = this; content; content = content->GetParent()) {
if (!content->IsElement()) {
continue;
}
auto* element = content->AsElement();
for (const Element* element = GetAsElementOrParentElement(); element;
element = element->GetParentElement()) {
if (!element->GetAttrCount()) {
continue;
}

32
dom/base/nsContentUtils.cpp
View File

@ -4667,19 +4667,11 @@ already_AddRefed<DocumentFragment> nsContentUtils::CreateContextualFragment(
RefPtr<DocumentFragment> frag =
new DocumentFragment(document->NodeInfoManager());
nsCOMPtr<nsIContent> contextAsContent = do_QueryInterface(aContextNode);
if (contextAsContent && !contextAsContent->IsElement()) {
contextAsContent = contextAsContent->GetParent();
if (contextAsContent && !contextAsContent->IsElement()) {
// can this even happen?
contextAsContent = nullptr;
}
}
if (contextAsContent && !contextAsContent->IsHTMLElement(nsGkAtoms::html)) {
Element* element = aContextNode->GetAsElementOrParentElement();
if (element && !element->IsHTMLElement(nsGkAtoms::html)) {
aRv = ParseFragmentHTML(
aFragment, frag, contextAsContent->NodeInfo()->NameAtom(),
contextAsContent->GetNameSpaceID(),
aFragment, frag, element->NodeInfo()->NameAtom(),
element->GetNameSpaceID(),
(document->GetCompatibilityMode() == eCompatibility_NavQuirks),
aPreventScriptExecution);
} else {
@ -4694,11 +4686,8 @@ already_AddRefed<DocumentFragment> nsContentUtils::CreateContextualFragment(
AutoTArray<nsString, 32> tagStack;
nsAutoString uriStr, nameStr;
nsCOMPtr<nsIContent> content = do_QueryInterface(aContextNode);
// just in case we have a text node
if (content && !content->IsElement()) content = content->GetParent();
while (content && content->IsElement()) {
for (Element* element = aContextNode->GetAsElementOrParentElement(); element;
element = element->GetParentElement()) {
nsString& tagName = *tagStack.AppendElement();
// It mostly doesn't actually matter what tag name we use here: XML doesn't
// have parsing that depends on the open tag stack, apart from namespace
@ -4718,14 +4707,13 @@ already_AddRefed<DocumentFragment> nsContentUtils::CreateContextualFragment(
tagName.AssignLiteral("notacustomelement");
// see if we need to add xmlns declarations
uint32_t count = content->AsElement()->GetAttrCount();
uint32_t count = element->GetAttrCount();
bool setDefaultNamespace = false;
if (count > 0) {
uint32_t index;
for (index = 0; index < count; index++) {
const BorrowedAttrInfo info =
content->AsElement()->GetAttrInfoAt(index);
const BorrowedAttrInfo info = element->GetAttrInfoAt(index);
const nsAttrName* name = info.mName;
if (name->NamespaceEquals(kNameSpaceID_XMLNS)) {
info.mValue->ToString(uriStr);
@ -4747,7 +4735,7 @@ already_AddRefed<DocumentFragment> nsContentUtils::CreateContextualFragment(
}
if (!setDefaultNamespace) {
mozilla::dom::NodeInfo* info = content->NodeInfo();
mozilla::dom::NodeInfo* info = element->NodeInfo();
if (!info->GetPrefixAtom() && info->NamespaceID() != kNameSpaceID_None) {
// We have no namespace prefix, but have a namespace ID. Push
// default namespace attr in, so that our kids will be in our
@ -4758,8 +4746,6 @@ already_AddRefed<DocumentFragment> nsContentUtils::CreateContextualFragment(
tagName.Append('"');
}
}
content = content->GetParent();
}
RefPtr<DocumentFragment> frag;

6
dom/base/nsINode.h
View File

@ -979,6 +979,12 @@ class nsINode : public mozilla::dom::EventTarget {
*/
mozilla::dom::Element* GetParentElementCrossingShadowRoot() const;
/**
* Get closest element node for the node. Meaning that if the node is an
* element node, returns itself. Otherwise, returns parent element or null.
*/
inline mozilla::dom::Element* GetAsElementOrParentElement() const;
/**
* Get the root of the subtree this node belongs to. This never returns
* null. It may return 'this' (e.g. for document nodes, and nodes that

34
editor/libeditor/HTMLEditor.cpp
View File

@ -2367,8 +2367,7 @@ Element* HTMLEditor::GetElementOrParentByTagNameInternal(const nsAtom& aTagName,
nsINode& aNode) const {
MOZ_ASSERT(&aTagName != nsGkAtoms::_empty);
Element* currentElement =
aNode.IsElement() ? aNode.AsElement() : aNode.GetParentElement();
Element* currentElement = aNode.GetAsElementOrParentElement();
if (NS_WARN_IF(!currentElement)) {
// Neither aNode nor its parent is an element, so no ancestor is
MOZ_ASSERT(!aNode.GetParentNode() ||
@ -3556,10 +3555,11 @@ bool HTMLEditor::IsTextPropertySetByContent(nsINode* aNode, nsAtom* aProperty,
nsAString* outValue) {
MOZ_ASSERT(aNode && aProperty);
while (aNode) {
if (aNode->IsElement()) {
Element* element = aNode->AsElement();
if (aProperty == element->NodeInfo()->NameAtom()) {
for (Element* element = aNode->GetAsElementOrParentElement(); element;
element = element->GetParentElement()) {
if (aProperty != element->NodeInfo()->NameAtom()) {
continue;
}
if (!aAttribute) {
return true;
}
@ -3575,14 +3575,10 @@ bool HTMLEditor::IsTextPropertySetByContent(nsINode* aNode, nsAtom* aProperty,
if (aValue->Equals(value, nsCaseInsensitiveStringComparator())) {
return true;
}
// We found the prop with the attribute, but the value doesn't
// match.
break;
// We found the prop with the attribute, but the value doesn't match.
return false;
}
}
}
aNode = aNode->GetParentNode();
}
return false;
}
@ -4448,12 +4444,14 @@ nsresult HTMLEditor::CopyLastEditableChildStylesWithTransaction(
deepestEditableContent =
GetPreviousEditableHTMLNode(*deepestEditableContent);
}
Element* deepestVisibleEditableElement = nullptr;
if (deepestEditableContent) {
deepestVisibleEditableElement =
deepestEditableContent->IsElement()
? deepestEditableContent->AsElement()
: deepestEditableContent->GetParentElement();
if (!deepestEditableContent) {
return NS_OK;
}
Element* deepestVisibleEditableElement =
deepestEditableContent->GetAsElementOrParentElement();
if (!deepestVisibleEditableElement) {
return NS_OK;
}
// Clone inline elements to keep current style in the new block.

19
editor/libeditor/HTMLEditorDataTransfer.cpp
View File

@ -593,9 +593,7 @@ nsresult HTMLEditor::DoInsertHTMLWithContext(
if (containerContent) {
Element* mostAncestorTableRelatedElement = nullptr;
for (Element* maybeTableRelatedElement =
containerContent->IsElement()
? containerContent->AsElement()
: containerContent->GetParentElement();
containerContent->GetAsElementOrParentElement();
maybeTableRelatedElement &&
maybeTableRelatedElement != lastInsertedContent;
maybeTableRelatedElement =
@ -2739,9 +2737,8 @@ void HTMLEditor::AutoHTMLFragmentBoundariesFixer::
nsIContent& aContent,
nsTArray<OwningNonNull<Element>>& aOutArrayOfListAndTableElements)
const {
for (Element* element = aContent.IsElement() ? aContent.AsElement()
: aContent.GetParentElement();
element; element = element->GetParentElement()) {
for (Element* element = aContent.GetAsElementOrParentElement(); element;
element = element->GetParentElement()) {
if (HTMLEditUtils::IsList(element) || HTMLEditUtils::IsTable(element)) {
aOutArrayOfListAndTableElements.AppendElement(*element);
}
@ -2839,9 +2836,8 @@ HTMLEditor::AutoHTMLFragmentBoundariesFixer::FindReplaceableTableElement(
// But this looks really buggy because this loop may skip aTableElement
// as the following NS_ASSERTION. We should write automated tests and
// check right behavior.
for (Element* element = aContentMaybeInTableElement.IsElement()
? aContentMaybeInTableElement.AsElement()
: aContentMaybeInTableElement.GetParentElement();
for (Element* element =
aContentMaybeInTableElement.GetAsElementOrParentElement();
element; element = element->GetParentElement()) {
if (!HTMLEditUtils::IsTableElement(element) ||
element->IsHTMLElement(nsGkAtoms::table)) {
@ -2879,9 +2875,8 @@ bool HTMLEditor::AutoHTMLFragmentBoundariesFixer::IsReplaceableListElement(
// But this looks really buggy because this loop may skip aListElement
// as the following NS_ASSERTION. We should write automated tests and
// check right behavior.
for (Element* element = aContentMaybeInListElement.IsElement()
? aContentMaybeInListElement.AsElement()
: aContentMaybeInListElement.GetParentElement();
for (Element* element =
aContentMaybeInListElement.GetAsElementOrParentElement();
element; element = element->GetParentElement()) {
if (!HTMLEditUtils::IsListItem(element)) {
// XXX Perhaps, the original developer of this method assumed that

9
gfx/layers/apz/util/DoubleTapToZoom.cpp
View File

@ -54,12 +54,11 @@ static already_AddRefed<dom::Element> ElementFromPoint(
// FIXME(emilio): This should probably use the flattened tree, GetParent() is
// not guaranteed to be an element in presence of shadow DOM.
nsIContent* content = frame->GetContent();
if (content && !content->IsElement()) {
content = content->GetParent();
if (!content) {
return nullptr;
}
if (content && content->IsElement()) {
nsCOMPtr<dom::Element> result = content->AsElement();
return result.forget();
if (dom::Element* element = content->GetAsElementOrParentElement()) {
return do_AddRef(element);
}
return nullptr;
}

14
layout/base/TouchManager.cpp
View File

@ -132,10 +132,9 @@ nsIFrame* TouchManager::SetupTarget(WidgetTouchEvent* aEvent,
if (target) {
nsCOMPtr<nsIContent> targetContent;
target->GetContentForEvent(aEvent, getter_AddRefs(targetContent));
while (targetContent && !targetContent->IsElement()) {
targetContent = targetContent->GetParent();
}
touch->SetTouchTarget(targetContent);
touch->SetTouchTarget(targetContent
? targetContent->GetAsElementOrParentElement()
: nullptr);
} else {
aEvent->mTouches.RemoveElementAt(i);
}
@ -206,10 +205,9 @@ nsIFrame* TouchManager::SuppressInvalidPointsAndGetTargetedFrame(
} else {
targetFrame = newTargetFrame;
targetFrame->GetContentForEvent(aEvent, getter_AddRefs(targetContent));
while (targetContent && !targetContent->IsElement()) {
targetContent = targetContent->GetParent();
}
touch->SetTouchTarget(targetContent);
touch->SetTouchTarget(targetContent
? targetContent->GetAsElementOrParentElement()
: nullptr);
}
}
if (targetFrame) {

5
layout/generic/nsFrame.cpp
View File

@ -2409,10 +2409,7 @@ static Element* FindElementAncestorForMozSelection(nsIContent* aContent) {
aContent = aContent->GetClosestNativeAnonymousSubtreeRootParent();
}
NS_ASSERTION(aContent, "aContent isn't in non-anonymous tree?");
while (aContent && !aContent->IsElement()) {
aContent = aContent->GetParent();
}
return aContent ? aContent->AsElement() : nullptr;
return aContent ? aContent->GetAsElementOrParentElement() : nullptr;
}
already_AddRefed<ComputedStyle> nsIFrame::ComputeSelectionStyle(

15
widget/windows/nsWindow.cpp
View File

@ -4163,22 +4163,19 @@ bool nsWindow::TouchEventShouldStartDrag(EventMessage aEventMessage,
hittest.mInputSource = MouseEvent_Binding::MOZ_SOURCE_TOUCH;
DispatchInputEvent(&hittest);
EventTarget* target = hittest.GetDOMEventTarget();
if (target) {
nsCOMPtr<nsIContent> node = do_QueryInterface(target);
if (EventTarget* target = hittest.GetDOMEventTarget()) {
if (nsCOMPtr<nsIContent> content = do_QueryInterface(target)) {
// Check if the element or any parent element has the
// attribute we're looking for.
while (node) {
if (node->IsElement()) {
for (Element* element = content->GetAsElementOrParentElement(); element;
element = element->GetParentElement()) {
nsAutoString startDrag;
node->AsElement()->GetAttribute(
NS_LITERAL_STRING("touchdownstartsdrag"), startDrag);
element->GetAttribute(NS_LITERAL_STRING("touchdownstartsdrag"),
startDrag);
if (!startDrag.IsEmpty()) {
return true;
}
}
node = node->GetParent();
}
}
}