Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 316281. Rework GetContentAndOffsetsFromPoint. r=uriber,sr=roc,patch by Eli Friedman

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@185773 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu
2005-12-07 23:08:39 +00:00
parent 834e997e9f
commit 66e8f6e1aa
10 changed files with 489 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
mozilla/layout/generic/nsSelection.cpp
View File

@@ -340,9 +340,6 @@ public:
NS_IMETHOD GetFrameForNodeOffset(nsIContent *aNode, PRInt32 aOffset, HINT aHint, nsIFrame **aReturnFrame, PRInt32 *aReturnOffset);
NS_IMETHOD CommonPageMove(PRBool aForward, PRBool aExtend, nsIScrollableView *aScrollableView, nsIFrameSelection *aFrameSel);
NS_IMETHOD AdjustOffsetsFromStyle(nsIFrame *aFrame, PRBool *changeSelection,
nsIContent** outContent, PRInt32* outStartOffset, PRInt32* outEndOffset);
NS_IMETHOD SetHint(HINT aHintRight);
NS_IMETHOD GetHint(HINT *aHintRight);
NS_IMETHOD CharacterMove(PRBool aForward, PRBool aExtend);
@@ -462,9 +459,6 @@ private:
nsresult NotifySelectionListeners(SelectionType aType); // add parameters to say collapsed etc?
// utility method to lookup frame style
nsresult FrameOrParentHasSpecialSelectionStyle(nsIFrame* aFrame, PRUint8 aSelectionStyle, nsIFrame* *foundFrame);
nsTypedSelection *mDomSelections[nsISelectionController::NUM_SELECTIONTYPES];
// Table selection support.
@@ -2468,21 +2462,6 @@ nsSelection::HandleDrag(nsPresContext *aPresContext, nsIFrame *aFrame, nsPoint&
AdjustForMaintainedSelection(newContent, startPos))
return NS_OK;
// do we have CSS that changes selection behaviour?
{
//add scope for nsCOMPtr
PRBool changeSelection;
nsCOMPtr<nsIContent> selectContent;
PRInt32 newStart, newEnd;
if (NS_SUCCEEDED(AdjustOffsetsFromStyle(newFrame, &changeSelection, getter_AddRefs(selectContent), &newStart, &newEnd))
&& changeSelection)
{
newContent = selectContent;
startPos = newStart;
contentOffsetEnd = newEnd;
}
}
if (NS_SUCCEEDED(result))
{
#ifdef VISUALSELECTION
@@ -3056,27 +3035,6 @@ nsSelection::NotifySelectionListeners(SelectionType aType)
return NS_ERROR_FAILURE;
}
nsresult
nsSelection::FrameOrParentHasSpecialSelectionStyle(nsIFrame* aFrame, PRUint8 aSelectionStyle, nsIFrame* *foundFrame)
{
nsIFrame* thisFrame = aFrame;
while (thisFrame)
{
if (thisFrame->GetStyleUIReset()->mUserSelect == aSelectionStyle)
{
*foundFrame = thisFrame;
return NS_OK;
}
thisFrame = thisFrame->GetParent();
}
*foundFrame = nsnull;
return NS_OK;
}
// Start of Table Selection methods
static PRBool IsCell(nsIContent *aContent)
@@ -4093,59 +4051,6 @@ nsSelection::CreateAndAddRange(nsIDOMNode *aParentNode, PRInt32 aOffset)
// End of Table Selection
NS_IMETHODIMP
nsSelection::AdjustOffsetsFromStyle(nsIFrame *aFrame, PRBool *changeSelection,
nsIContent** outContent, PRInt32* outStartOffset, PRInt32* outEndOffset)
{
*changeSelection = PR_FALSE;
*outContent = nsnull;
nsresult rv;
nsIFrame* selectAllFrame;
rv = FrameOrParentHasSpecialSelectionStyle(aFrame, NS_STYLE_USER_SELECT_ALL, &selectAllFrame);
if (NS_FAILED(rv)) return rv;
if (!selectAllFrame)
return NS_OK;
nsIContent* selectAllContent = selectAllFrame->GetContent();
if (selectAllContent)
{
nsCOMPtr<nsIContent> parentContent = selectAllContent->GetParent();
if (parentContent)
{
PRInt32 startOffset = parentContent->IndexOf(selectAllContent);
if (startOffset < 0)
{
// hrmm, this is probably anonymous content. Let's go up another level
// do we need to do this if we get the right frameSelection to start with?
nsCOMPtr<nsIContent> superParent = parentContent->GetParent();
if (superParent)
{
PRInt32 superStartOffset = superParent->IndexOf(parentContent);
if (superStartOffset < 0)
return NS_ERROR_FAILURE; // give up
parentContent = superParent;
startOffset = superStartOffset;
}
}
NS_IF_ADDREF(*outContent = parentContent);
*outStartOffset = startOffset;
*outEndOffset = startOffset + 1;
*changeSelection = PR_TRUE;
}
}
return NS_OK;
}
NS_IMETHODIMP
nsSelection::SetHint(HINT aHintRight)
{