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

Bug 321393 Clicking on page in print preview causes crash [@ GetOffsetsOfFrame]

Browse Source 
patch by sharparrow1@yahoo.com r=roc sr=roc


git-svn-id: svn://10.0.0.236/trunk@186576 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org 2005-12-25 19:01:45 +00:00
parent 0d12c6eeee
commit 43df8a0b68
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/layout/generic/nsFrame.cpp
View File

@ -1762,8 +1762,11 @@ struct ContentOffsets {
// Retrieve the content offsets of a frame
static ContentOffsets GetOffsetsOfFrame(nsIFrame* aFrame) {
nsCOMPtr<nsIContent> content, parent;
NS_ASSERTION(aFrame->GetContent(), "No content?!");
content = aFrame->GetContent();
if (!content) {
NS_WARNING("Frame has no content");
return ContentOffsets(nsnull, -1, -1);
}
nsIAtom* type = aFrame->GetType();
if (type == nsLayoutAtoms::textFrame) {
PRInt32 offset, offsetEnd;
@ -2110,8 +2113,10 @@ nsresult nsFrame::GetContentAndOffsetsFromPoint(nsPresContext* aCX,
if (adjustedFrame->GetStyleUIReset()->mUserSelect ==
NS_STYLE_USER_SELECT_ALL) {
ContentOffsets selectOffset = GetOffsetsOfFrame(adjustedFrame);
if (!selectOffset.content)
return NS_ERROR_NULL_POINTER;
NS_IF_ADDREF(*aNewContent = selectOffset.content);
NS_ADDREF(*aNewContent = selectOffset.content);
aContentOffset = selectOffset.start;
aContentOffsetEnd = selectOffset.end;
aKeepWithAbove = PR_FALSE;
@ -2126,6 +2131,8 @@ nsresult nsFrame::GetContentAndOffsetsFromPoint(nsPresContext* aCX,
FrameTarget closest = GetSelectionClosestFrame(adjustedFrame, adjustedPoint);
ContentOffsets offset = GetOffsetsOfFrame(closest.frame);
if (!offset.content)
return NS_ERROR_NULL_POINTER;
// If the correct offset is at one end of a frame, use offset-based
// calculation method
if (closest.frameEdge) {