зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset a30efac96e5e (bug 1004522)
This commit is contained in:
Carsten "Tomcat" Book
Родитель
5f746a4576
Коммит
e90181e54f
|
|
@ -249,7 +249,7 @@ nsWSRunObject::InsertBreak(nsCOMPtr<nsINode>* aInOutParent,
|
|||
NS_ENSURE_SUCCESS(res, nullptr);
|
||||
} else if (beforeRun->mType == WSType::normalWS) {
|
||||
// Try to change an nbsp to a space, just to prevent nbsp proliferation
|
||||
res = CheckTrailingNBSP(beforeRun, *aInOutParent, *aInOutOffset);
|
||||
res = CheckTrailingNBSP(beforeRun, GetAsDOMNode(*aInOutParent), *aInOutOffset);
|
||||
NS_ENSURE_SUCCESS(res, nullptr);
|
||||
}
|
||||
}
|
||||
|
|
@ -303,7 +303,7 @@ nsWSRunObject::InsertText(const nsAString& aStringToInsert,
|
|||
} else if (afterRun->mType == WSType::normalWS) {
|
||||
// Try to change an nbsp to a space, if possible, just to prevent nbsp
|
||||
// proliferation
|
||||
res = CheckLeadingNBSP(afterRun, *aInOutParent, *aInOutOffset);
|
||||
res = CheckLeadingNBSP(afterRun, GetAsDOMNode(*aInOutParent), *aInOutOffset);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
}
|
||||
|
||||
|
|
@ -319,7 +319,7 @@ nsWSRunObject::InsertText(const nsAString& aStringToInsert,
|
|||
} else if (beforeRun->mType == WSType::normalWS) {
|
||||
// Try to change an nbsp to a space, if possible, just to prevent nbsp
|
||||
// proliferation
|
||||
res = CheckTrailingNBSP(beforeRun, *aInOutParent, *aInOutOffset);
|
||||
res = CheckTrailingNBSP(beforeRun, GetAsDOMNode(*aInOutParent), *aInOutOffset);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
}
|
||||
}
|
||||
|
|
@ -1537,36 +1537,41 @@ nsWSRunObject::ConvertToNBSP(WSPoint aPoint, AreaRestriction aAR)
|
|||
// wsFragment info.
|
||||
NS_ENSURE_TRUE(aPoint.mTextNode, NS_ERROR_NULL_POINTER);
|
||||
|
||||
if (aAR == eOutsideUserSelectAll) {
|
||||
nsCOMPtr<nsIDOMNode> san =
|
||||
mHTMLEditor->FindUserSelectAllNode(GetAsDOMNode(aPoint.mTextNode));
|
||||
if (san) {
|
||||
if (aAR == eOutsideUserSelectAll)
|
||||
{
|
||||
nsCOMPtr<nsIDOMNode> domnode = do_QueryInterface(aPoint.mTextNode);
|
||||
if (domnode)
|
||||
{
|
||||
nsCOMPtr<nsIDOMNode> san = mHTMLEditor->FindUserSelectAllNode(domnode);
|
||||
if (san)
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
|
||||
// First, insert an nbsp
|
||||
nsCOMPtr<nsIDOMCharacterData> textNode(do_QueryInterface(aPoint.mTextNode));
|
||||
NS_ENSURE_TRUE(textNode, NS_ERROR_NULL_POINTER);
|
||||
nsCOMPtr<nsIDOMNode> node(do_QueryInterface(textNode));
|
||||
|
||||
// first, insert an nbsp
|
||||
nsAutoTxnsConserveSelection dontSpazMySelection(mHTMLEditor);
|
||||
nsAutoString nbspStr(nbsp);
|
||||
nsresult res = mHTMLEditor->InsertTextIntoTextNodeImpl(nbspStr,
|
||||
aPoint.mTextNode, aPoint.mOffset, true);
|
||||
nsresult res = mHTMLEditor->InsertTextIntoTextNodeImpl(nbspStr, textNode, aPoint.mOffset, true);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
|
||||
// Next, find range of ws it will replace
|
||||
nsCOMPtr<Text> startNode, endNode;
|
||||
int32_t startOffset = 0, endOffset = 0;
|
||||
// next, find range of ws it will replace
|
||||
nsCOMPtr<nsIDOMNode> startNode, endNode;
|
||||
int32_t startOffset=0, endOffset=0;
|
||||
|
||||
GetAsciiWSBounds(eAfter, aPoint.mTextNode, aPoint.mOffset + 1,
|
||||
getter_AddRefs(startNode), &startOffset,
|
||||
getter_AddRefs(endNode), &endOffset);
|
||||
GetAsciiWSBounds(eAfter, node, aPoint.mOffset+1, address_of(startNode),
|
||||
&startOffset, address_of(endNode), &endOffset);
|
||||
|
||||
// Finally, delete that replaced ws, if any
|
||||
if (startNode) {
|
||||
res = DeleteChars(GetAsDOMNode(startNode), startOffset, GetAsDOMNode(endNode), endOffset);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
// finally, delete that replaced ws, if any
|
||||
if (startNode)
|
||||
{
|
||||
res = DeleteChars(startNode, startOffset, endNode, endOffset);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
return res;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -1938,80 +1943,85 @@ nsWSRunObject::CheckTrailingNBSPOfRun(WSFragment *aRun)
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsWSRunObject::CheckTrailingNBSP(WSFragment* aRun, nsINode* aNode,
|
||||
int32_t aOffset)
|
||||
nsWSRunObject::CheckTrailingNBSP(WSFragment *aRun, nsIDOMNode *aNode, int32_t aOffset)
|
||||
{
|
||||
// Try to change an nbsp to a space, if possible, just to prevent nbsp
|
||||
// proliferation. This routine is called when we are about to make this
|
||||
// point in the ws abut an inserted break or text, so we don't have to worry
|
||||
// about what is after it. What is after it now will end up after the
|
||||
// inserted object.
|
||||
// try to change an nbsp to a space, if possible, just to prevent nbsp proliferation.
|
||||
// this routine is called when we about to make this point in the ws abut an inserted break
|
||||
// or text, so we don't have to worry about what is after it. What is after it now will
|
||||
// end up after the inserted object.
|
||||
NS_ENSURE_TRUE(aRun && aNode, NS_ERROR_NULL_POINTER);
|
||||
bool canConvert = false;
|
||||
WSPoint thePoint = GetCharBefore(aNode, aOffset);
|
||||
nsCOMPtr<nsINode> node(do_QueryInterface(aNode));
|
||||
WSPoint thePoint = GetCharBefore(node, aOffset);
|
||||
if (thePoint.mTextNode && thePoint.mChar == nbsp) {
|
||||
WSPoint prevPoint = GetCharBefore(thePoint);
|
||||
if (prevPoint.mTextNode) {
|
||||
if (!nsCRT::IsAsciiSpace(prevPoint.mChar)) {
|
||||
if (!nsCRT::IsAsciiSpace(prevPoint.mChar)) canConvert = true;
|
||||
} else if (aRun->mLeftType == WSType::text) {
|
||||
canConvert = true;
|
||||
}
|
||||
} else if (aRun->mLeftType == WSType::text ||
|
||||
aRun->mLeftType == WSType::special) {
|
||||
} else if (aRun->mLeftType == WSType::special) {
|
||||
canConvert = true;
|
||||
}
|
||||
}
|
||||
if (canConvert) {
|
||||
// First, insert a space
|
||||
if (canConvert)
|
||||
{
|
||||
// first, insert a space
|
||||
nsCOMPtr<nsIDOMCharacterData> textNode(do_QueryInterface(thePoint.mTextNode));
|
||||
NS_ENSURE_TRUE(textNode, NS_ERROR_NULL_POINTER);
|
||||
nsAutoTxnsConserveSelection dontSpazMySelection(mHTMLEditor);
|
||||
nsAutoString spaceStr(char16_t(32));
|
||||
nsresult res = mHTMLEditor->InsertTextIntoTextNodeImpl(spaceStr,
|
||||
thePoint.mTextNode, thePoint.mOffset, true);
|
||||
nsresult res = mHTMLEditor->InsertTextIntoTextNodeImpl(spaceStr, textNode,
|
||||
thePoint.mOffset,
|
||||
true);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
|
||||
// Finally, delete that nbsp
|
||||
res = DeleteChars(GetAsDOMNode(thePoint.mTextNode), thePoint.mOffset + 1,
|
||||
GetAsDOMNode(thePoint.mTextNode), thePoint.mOffset + 2);
|
||||
// finally, delete that nbsp
|
||||
nsCOMPtr<nsIDOMNode> delNode(do_QueryInterface(thePoint.mTextNode));
|
||||
res = DeleteChars(delNode, thePoint.mOffset+1, delNode, thePoint.mOffset+2);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsWSRunObject::CheckLeadingNBSP(WSFragment* aRun, nsINode* aNode,
|
||||
int32_t aOffset)
|
||||
nsWSRunObject::CheckLeadingNBSP(WSFragment *aRun, nsIDOMNode *aNode, int32_t aOffset)
|
||||
{
|
||||
// Try to change an nbsp to a space, if possible, just to prevent nbsp
|
||||
// proliferation This routine is called when we are about to make this point
|
||||
// in the ws abut an inserted text, so we don't have to worry about what is
|
||||
// before it. What is before it now will end up before the inserted text.
|
||||
// try to change an nbsp to a space, if possible, just to prevent nbsp proliferation
|
||||
// this routine is called when we about to make this point in the ws abut an inserted
|
||||
// text, so we don't have to worry about what is before it. What is before it now will
|
||||
// end up before the inserted text.
|
||||
bool canConvert = false;
|
||||
WSPoint thePoint = GetCharAfter(aNode, aOffset);
|
||||
nsCOMPtr<nsINode> node(do_QueryInterface(aNode));
|
||||
WSPoint thePoint = GetCharAfter(node, aOffset);
|
||||
if (thePoint.mChar == nbsp) {
|
||||
WSPoint tmp = thePoint;
|
||||
// we want to be after thePoint
|
||||
tmp.mOffset++;
|
||||
tmp.mOffset++; // we want to be after thePoint
|
||||
WSPoint nextPoint = GetCharAfter(tmp);
|
||||
if (nextPoint.mTextNode) {
|
||||
if (!nsCRT::IsAsciiSpace(nextPoint.mChar)) {
|
||||
if (!nsCRT::IsAsciiSpace(nextPoint.mChar)) canConvert = true;
|
||||
} else if (aRun->mRightType == WSType::text) {
|
||||
canConvert = true;
|
||||
}
|
||||
} else if (aRun->mRightType == WSType::text ||
|
||||
aRun->mRightType == WSType::special ||
|
||||
aRun->mRightType == WSType::br) {
|
||||
} else if (aRun->mRightType == WSType::special) {
|
||||
canConvert = true;
|
||||
} else if (aRun->mRightType == WSType::br) {
|
||||
canConvert = true;
|
||||
}
|
||||
}
|
||||
if (canConvert) {
|
||||
// First, insert a space
|
||||
if (canConvert)
|
||||
{
|
||||
// first, insert a space
|
||||
nsCOMPtr<nsIDOMCharacterData> textNode(do_QueryInterface(thePoint.mTextNode));
|
||||
NS_ENSURE_TRUE(textNode, NS_ERROR_NULL_POINTER);
|
||||
nsAutoTxnsConserveSelection dontSpazMySelection(mHTMLEditor);
|
||||
nsAutoString spaceStr(char16_t(32));
|
||||
nsresult res = mHTMLEditor->InsertTextIntoTextNodeImpl(spaceStr,
|
||||
thePoint.mTextNode, thePoint.mOffset, true);
|
||||
nsresult res = mHTMLEditor->InsertTextIntoTextNodeImpl(spaceStr, textNode,
|
||||
thePoint.mOffset,
|
||||
true);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
|
||||
// Finally, delete that nbsp
|
||||
res = DeleteChars(GetAsDOMNode(thePoint.mTextNode), thePoint.mOffset + 1,
|
||||
GetAsDOMNode(thePoint.mTextNode), thePoint.mOffset + 2);
|
||||
// finally, delete that nbsp
|
||||
nsCOMPtr<nsIDOMNode> delNode(do_QueryInterface(thePoint.mTextNode));
|
||||
res = DeleteChars(delNode, thePoint.mOffset+1, delNode, thePoint.mOffset+2);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
}
|
||||
return NS_OK;
|
||||
|
|
|
|||
|
|
@ -350,10 +350,8 @@ class MOZ_STACK_CLASS nsWSRunObject
|
|||
WSPoint GetWSPointAfter(nsIDOMNode *aNode, int32_t aOffset);
|
||||
WSPoint GetWSPointBefore(nsIDOMNode *aNode, int32_t aOffset);
|
||||
nsresult CheckTrailingNBSPOfRun(WSFragment *aRun);
|
||||
nsresult CheckTrailingNBSP(WSFragment* aRun, nsINode* aNode,
|
||||
int32_t aOffset);
|
||||
nsresult CheckLeadingNBSP(WSFragment* aRun, nsINode* aNode,
|
||||
int32_t aOffset);
|
||||
nsresult CheckTrailingNBSP(WSFragment *aRun, nsIDOMNode *aNode, int32_t aOffset);
|
||||
nsresult CheckLeadingNBSP(WSFragment *aRun, nsIDOMNode *aNode, int32_t aOffset);
|
||||
|
||||
nsresult Scrub();
|
||||
nsresult GetPreviousWSNodeInner(nsINode* aStartNode, nsINode* aBlockParent,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче