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

Backed out changeset 4b6e7f88a2ed (bug 1004522)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-05-12 14:12:56 +02:00
parent 794832a22c
commit a894b15005
2 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
editor/libeditor/html/nsWSRunObject.cpp
View File

@ -420,12 +420,12 @@ nsWSRunObject::InsertText(const nsAString& aStringToInsert,
return NS_OK;
}
nsresult
nsresult
nsWSRunObject::DeleteWSBackward()
{
WSPoint point = GetCharBefore(GetAsDOMNode(mNode), mOffset);
NS_ENSURE_TRUE(point.mTextNode, NS_OK); // nothing to delete
if (mPRE) {
// easy case, preformatted ws
if (nsCRT::IsAsciiSpace(point.mChar) || point.mChar == nbsp) {
@ -433,7 +433,7 @@ nsWSRunObject::DeleteWSBackward()
GetAsDOMNode(point.mTextNode), point.mOffset + 1);
}
}
// Caller's job to ensure that previous char is really ws. If it is normal
// ws, we need to delete the whole run.
if (nsCRT::IsAsciiSpace(point.mChar)) {
@ -442,7 +442,7 @@ nsWSRunObject::DeleteWSBackward()
GetAsciiWSBounds(eBoth, point.mTextNode, point.mOffset + 1,
getter_AddRefs(startNodeText), &startOffset,
getter_AddRefs(endNodeText), &endOffset);
// adjust surrounding ws
nsCOMPtr<nsINode> startNode = startNodeText.get();
nsCOMPtr<nsINode> endNode = endNodeText.get();
@ -451,7 +451,7 @@ nsWSRunObject::DeleteWSBackward()
address_of(startNode), &startOffset,
address_of(endNode), &endOffset);
NS_ENSURE_SUCCESS(res, res);
// finally, delete that ws
return DeleteChars(GetAsDOMNode(startNode), startOffset,
GetAsDOMNode(endNode), endOffset);
@ -465,55 +465,61 @@ nsWSRunObject::DeleteWSBackward()
address_of(node), &startOffset,
address_of(node), &endOffset);
NS_ENSURE_SUCCESS(res, res);
// finally, delete that ws
return DeleteChars(GetAsDOMNode(node), startOffset, GetAsDOMNode(node), endOffset);
}
return NS_OK;
}
nsresult
nsresult
nsWSRunObject::DeleteWSForward()
{
nsresult res = NS_OK;
WSPoint point = GetCharAfter(GetAsDOMNode(mNode), mOffset);
NS_ENSURE_TRUE(point.mTextNode, NS_OK); // nothing to delete
if (mPRE) {
// easy case, preformatted ws
if (nsCRT::IsAsciiSpace(point.mChar) || point.mChar == nbsp) {
return DeleteChars(GetAsDOMNode(point.mTextNode), point.mOffset,
GetAsDOMNode(point.mTextNode), point.mOffset + 1);
NS_ENSURE_TRUE(point.mTextNode, NS_OK); // nothing to delete
if (mPRE) // easy case, preformatted ws
{
if (nsCRT::IsAsciiSpace(point.mChar) || (point.mChar == nbsp))
{
nsCOMPtr<nsIDOMNode> node(do_QueryInterface(point.mTextNode));
int32_t startOffset = point.mOffset;
int32_t endOffset = point.mOffset+1;
return DeleteChars(node, startOffset, node, endOffset);
}
}
// Caller's job to ensure that next char is really ws. If it is normal ws,
// we need to delete the whole run.
if (nsCRT::IsAsciiSpace(point.mChar)) {
nsCOMPtr<Text> startNodeText, endNodeText;
// callers job to insure that next char is really ws.
// If it is normal ws, we need to delete the whole run
if (nsCRT::IsAsciiSpace(point.mChar))
{
nsCOMPtr<nsIDOMNode> startNode, endNode, node(do_QueryInterface(point.mTextNode));
int32_t startOffset, endOffset;
GetAsciiWSBounds(eBoth, point.mTextNode, point.mOffset + 1,
getter_AddRefs(startNodeText), &startOffset,
getter_AddRefs(endNodeText), &endOffset);
// Adjust surrounding ws
nsCOMPtr<nsINode> startNode(startNodeText), endNode(endNodeText);
nsresult res = nsWSRunObject::PrepareToDeleteRange(mHTMLEditor,
address_of(startNode), &startOffset, address_of(endNode), &endOffset);
GetAsciiWSBounds(eBoth, node, point.mOffset+1, address_of(startNode),
&startOffset, address_of(endNode), &endOffset);
// adjust surrounding ws
res = nsWSRunObject::PrepareToDeleteRange(mHTMLEditor, address_of(startNode), &startOffset,
address_of(endNode), &endOffset);
NS_ENSURE_SUCCESS(res, res);
// Finally, delete that ws
return DeleteChars(GetAsDOMNode(startNode), startOffset, GetAsDOMNode(endNode), endOffset);
} else if (point.mChar == nbsp) {
nsCOMPtr<nsINode> node(point.mTextNode);
// Adjust surrounding ws
// finally, delete that ws
return DeleteChars(startNode, startOffset, endNode, endOffset);
}
else if (point.mChar == nbsp)
{
nsCOMPtr<nsIDOMNode> node(do_QueryInterface(point.mTextNode));
// adjust surrounding ws
int32_t startOffset = point.mOffset;
int32_t endOffset = point.mOffset+1;
nsresult res = nsWSRunObject::PrepareToDeleteRange(mHTMLEditor,
address_of(node), &startOffset, address_of(node), &endOffset);
res = nsWSRunObject::PrepareToDeleteRange(mHTMLEditor, address_of(node), &startOffset,
address_of(node), &endOffset);
NS_ENSURE_SUCCESS(res, res);
// Finally, delete that ws
return DeleteChars(GetAsDOMNode(node), startOffset, GetAsDOMNode(node), endOffset);
// finally, delete that ws
return DeleteChars(node, startOffset, node, endOffset);
}
return NS_OK;
}

15
editor/libeditor/html/nsWSRunObject.h
View File

@ -225,15 +225,16 @@ class MOZ_STACK_CLASS nsWSRunObject
int32_t *aInOutOffset,
nsIDOMDocument *aDoc);
// DeleteWSBackward deletes a single visible piece of ws before the ws
// point (the point to create the wsRunObject, passed to its constructor).
// It makes any needed conversion to adjacent ws to retain its
// significance.
// DeleteWSBackward deletes a single visible piece of ws before
// the ws point (the point to create the wsRunObject, passed to
// its constructor). It makes any needed conversion to adjacent
// ws to retain its significance.
nsresult DeleteWSBackward();
// DeleteWSForward deletes a single visible piece of ws after the ws point
// (the point to create the wsRunObject, passed to its constructor). It
// makes any needed conversion to adjacent ws to retain its significance.
// DeleteWSForward deletes a single visible piece of ws after
// the ws point (the point to create the wsRunObject, passed to
// its constructor). It makes any needed conversion to adjacent
// ws to retain its significance.
nsresult DeleteWSForward();
// PriorVisibleNode returns the first piece of visible thing