Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 18:50:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 860123 - Part 1: Disallow extending or collapsing selections across documents; r=ehsan

Browse Source 
--HG--
extra : rebase_source : 2dbd8192486c8ff26d4b231d87283d61b6ff1e24
This commit is contained in:
Blake Kaplan 2013-08-29 10:14:15 -04:00
parent c8b76353f6
commit 7fe31daecb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/generic/nsSelection.cpp
View File

@ -4382,8 +4382,12 @@ 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
@ -4620,6 +4624,10 @@ 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();
@ -4654,7 +4662,6 @@ 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