Backed out changeset 0136d838f655 (bug 860123) for mochitest failures

This commit is contained in:
Ed Morley 2013-08-29 16:41:13 +01:00
parent 3d41d12e5f
commit 33039cd8a5

View File

@ -4382,12 +4382,8 @@ Selection::Collapse(nsINode* aParentNode, int32_t aOffset)
if (!IsValidSelectionPoint(mFrameSelection, aParentNode))
return NS_ERROR_FAILURE;
nsresult result;
nsRefPtr<nsPresContext> presContext = GetPresContext();
if (presContext->Document() != aParentNode->OwnerDoc())
return NS_ERROR_FAILURE;
// Delete all of the current ranges
nsRefPtr<nsPresContext> presContext = GetPresContext();
Clear(presContext);
// Turn off signal for table selection
@ -4624,10 +4620,6 @@ Selection::Extend(nsINode* aParentNode, int32_t aOffset)
if (!IsValidSelectionPoint(mFrameSelection, aParentNode))
return NS_ERROR_FAILURE;
nsRefPtr<nsPresContext> presContext = GetPresContext();
if (presContext->Document() != aParentNode->OwnerDoc())
return NS_ERROR_FAILURE;
//mFrameSelection->InvalidateDesiredX();
nsINode* anchorNode = GetAnchorNode();
@ -4662,6 +4654,7 @@ Selection::Extend(nsINode* aParentNode, int32_t aOffset)
aParentNode, aOffset,
&disconnected);
nsRefPtr<nsPresContext> presContext = GetPresContext();
nsRefPtr<nsRange> difRange = new nsRange(aParentNode);
if ((result1 == 0 && result3 < 0) || (result1 <= 0 && result2 < 0)){//a1,2 a,1,2
//select from 1 to 2 unless they are collapsed