wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make sure not to return the old text node in ResetNodeDirection. Bug 845093, r=ehsan

Browse Source
This commit is contained in:
Simon Montagu 2013-03-07 22:53:08 +02:00
parent f91dc1e794
commit 9227c29ea2
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
content/base/src/DirectionalityUtils.cpp
View File

@ -376,10 +376,14 @@ GetDirectionFromText(const nsTextFragment* aFrag,
* Set the directionality of a node with dir=auto as defined in
* http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#the-directionality
*
* @param[in] changedNode If we call this method because the content of a text
* node is about to change, pass in the changed node, so that we
* know not to return it
* @return the text node containing the character that determined the direction
*/
static nsINode*
WalkDescendantsSetDirectionFromText(Element* aElement, bool aNotify = true)
WalkDescendantsSetDirectionFromText(Element* aElement, bool aNotify = true,
nsINode* aChangedNode = nullptr)
{
MOZ_ASSERT(aElement, "aElement is null");
if (DoesNotParticipateInAutoDirection(aElement)) {
@ -394,7 +398,8 @@ WalkDescendantsSetDirectionFromText(Element* aElement, bool aNotify = true)
continue;
}
if (child->NodeType() == nsIDOMNode::TEXT_NODE) {
if (child->NodeType() == nsIDOMNode::TEXT_NODE &&
child != aChangedNode) {
Directionality textNodeDir = GetDirectionFromText(child->GetText());
if (textNodeDir != eDir_NotSet) {
// We found a descendant text node with strong directional characters.
@ -490,10 +495,12 @@ private:
MOZ_ASSERT(aEntry->GetKey()->IsElement(), "Must be an Element");
// run the downward propagation algorithm
// and remove the text node from the map
nsINode* oldTextNode = static_cast<Element*>(aData);
Element* rootNode = aEntry->GetKey();
nsINode* textNode = WalkDescendantsSetDirectionFromText(rootNode, true);
if (textNode) {
nsTextNodeDirectionalityMap::AddEntryToMap(textNode, rootNode);
nsINode* newTextNode = WalkDescendantsSetDirectionFromText(rootNode, true,
oldTextNode);
if (newTextNode) {
nsTextNodeDirectionalityMap::AddEntryToMap(newTextNode, rootNode);
} else {
rootNode->ClearHasDirAutoSet();
rootNode->UnsetProperty(nsGkAtoms::dirAutoSetBy);
@ -507,9 +514,9 @@ public:
mElements.EnumerateEntries(SetNodeDirection, &aDir);
}
void ResetAutoDirection()
void ResetAutoDirection(nsINode* aTextNode)
{
mElements.EnumerateEntries(ResetNodeDirection, nullptr);
mElements.EnumerateEntries(ResetNodeDirection, aTextNode);
}
static void RemoveElementFromMap(nsINode* aTextNode, Element* aElement)
@ -540,7 +547,7 @@ public:
{
MOZ_ASSERT(aTextNode->HasTextNodeDirectionalityMap(),
"Map missing in ResetTextNodeDirection");
GetDirectionalityMap(aTextNode)->ResetAutoDirection();
GetDirectionalityMap(aTextNode)->ResetAutoDirection(aTextNode);
}
};