Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-03 23:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 35296: SetCaretEnabled() takes too long

Browse Source 
Patch by Leon.Zhang@sun.com, r/sr=sfraser
This commit is contained in:
henry.jia%sun.com 2003-02-24 10:26:20 +00:00
parent e67213fff2
commit 1dd5b9dab2
4 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/base/nsCaret.cpp
View File

@ -92,6 +92,7 @@ nsCaret::nsCaret()
, mDrawn(PR_FALSE)
, mReadOnly(PR_FALSE)
, mShowDuringSelection(PR_FALSE)
, mCachedOffsetValid(PR_FALSE)
, mLastCaretFrame(nsnull)
, mLastCaretView(nsnull)
, mLastContentOffset(0)
@ -392,6 +393,7 @@ NS_IMETHODIMP nsCaret::ClearFrameRefs(nsIFrame* aFrame)
mLastCaretFrame = nsnull; // frames are not refcounted.
mLastCaretView = nsnull;
mLastContentOffset = 0;
mCachedOffsetValid = PR_FALSE;
}
mDrawn = PR_FALSE; // assume that the view has been cleared, and ensure
@ -755,6 +757,9 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
frameState |= NS_FRAME_EXTERNAL_REFERENCE;
theFrame->SetFrameState(frameState);
if (theFrame != mLastCaretFrame || theFrameOffset != mLastContentOffset)
mCachedOffsetValid = PR_FALSE;
mLastCaretFrame = theFrame;
mLastContentOffset = theFrameOffset;
return PR_TRUE;
@ -1025,11 +1030,16 @@ void nsCaret::DrawCaret()
if (!mDrawn)
{
nsPoint framePos(0, 0);
nsRect caretRect = frameRect;
mLastCaretFrame->GetPointFromOffset(presContext, mRendContext, mLastContentOffset, &framePos);
caretRect += framePos;
// if mCachedOffsetValid, apply cached FrameOffset, else compute it again
if (!mCachedOffsetValid)
{
mLastCaretFrame->GetPointFromOffset(presContext, mRendContext, mLastContentOffset, &mCachedFrameOffset);
mCachedOffsetValid = PR_TRUE;
}
caretRect += mCachedFrameOffset;
//printf("Content offset %ld, frame offset %ld\n", focusOffset, framePos.x);
if(mCaretTwipsWidth < 0)

13
layout/base/nsCaret.h
View File

@ -60,11 +60,11 @@ class nsCaret : public nsICaret,
NS_IMETHOD GetCaretDOMSelection(nsISelection **outDOMSel);
NS_IMETHOD SetCaretDOMSelection(nsISelection *inDOMSel);
NS_IMETHOD GetCaretVisible(PRBool *outMakeVisible);
NS_IMETHOD SetCaretVisible(PRBool intMakeVisible);
NS_IMETHOD SetCaretReadOnly(PRBool inMakeReadonly);
NS_IMETHOD GetCaretCoordinates(EViewCoordinates aRelativeToType, nsISelection *inDOMSel, nsRect* outCoordinates, PRBool* outIsCollapsed, nsIView **outView);
NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame);
NS_IMETHOD EraseCaret();
NS_IMETHOD SetCaretVisible(PRBool intMakeVisible);
NS_IMETHOD SetCaretReadOnly(PRBool inMakeReadonly);
NS_IMETHOD GetCaretCoordinates(EViewCoordinates aRelativeToType, nsISelection *inDOMSel, nsRect* outCoordinates, PRBool* outIsCollapsed, nsIView **outView);
NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame);
NS_IMETHOD EraseCaret();
NS_IMETHOD SetCaretWidth(nscoord aPixels);
NS_IMETHOD SetVisibilityDuringSelection(PRBool aVisibility);
@ -105,6 +105,9 @@ protected:
PRPackedBool mDrawn; // this should be mutable
PRPackedBool mReadOnly; // it the caret in readonly state (draws differently)
PRPackedBool mShowDuringSelection; // show when text is selected
PRPackedBool mCachedOffsetValid; //whether the cached frame offset is valid
nsPoint mCachedFrameOffset; //cached frame offset
nsRect mCaretRect; // the last caret rect
nsIFrame* mLastCaretFrame; // store the frame the caret was last drawn in.

18
layout/base/src/nsCaret.cpp
View File

@ -92,6 +92,7 @@ nsCaret::nsCaret()
, mDrawn(PR_FALSE)
, mReadOnly(PR_FALSE)
, mShowDuringSelection(PR_FALSE)
, mCachedOffsetValid(PR_FALSE)
, mLastCaretFrame(nsnull)
, mLastCaretView(nsnull)
, mLastContentOffset(0)
@ -392,6 +393,7 @@ NS_IMETHODIMP nsCaret::ClearFrameRefs(nsIFrame* aFrame)
mLastCaretFrame = nsnull; // frames are not refcounted.
mLastCaretView = nsnull;
mLastContentOffset = 0;
mCachedOffsetValid = PR_FALSE;
}
mDrawn = PR_FALSE; // assume that the view has been cleared, and ensure
@ -755,6 +757,9 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
frameState |= NS_FRAME_EXTERNAL_REFERENCE;
theFrame->SetFrameState(frameState);
if (theFrame != mLastCaretFrame || theFrameOffset != mLastContentOffset)
mCachedOffsetValid = PR_FALSE;
mLastCaretFrame = theFrame;
mLastContentOffset = theFrameOffset;
return PR_TRUE;
@ -1025,11 +1030,16 @@ void nsCaret::DrawCaret()
if (!mDrawn)
{
nsPoint framePos(0, 0);
nsRect caretRect = frameRect;
mLastCaretFrame->GetPointFromOffset(presContext, mRendContext, mLastContentOffset, &framePos);
caretRect += framePos;
// if mCachedOffsetValid, apply cached FrameOffset, else compute it again
if (!mCachedOffsetValid)
{
mLastCaretFrame->GetPointFromOffset(presContext, mRendContext, mLastContentOffset, &mCachedFrameOffset);
mCachedOffsetValid = PR_TRUE;
}
caretRect += mCachedFrameOffset;
//printf("Content offset %ld, frame offset %ld\n", focusOffset, framePos.x);
if(mCaretTwipsWidth < 0)

13
layout/base/src/nsCaret.h
View File

@ -60,11 +60,11 @@ class nsCaret : public nsICaret,
NS_IMETHOD GetCaretDOMSelection(nsISelection **outDOMSel);
NS_IMETHOD SetCaretDOMSelection(nsISelection *inDOMSel);
NS_IMETHOD GetCaretVisible(PRBool *outMakeVisible);
NS_IMETHOD SetCaretVisible(PRBool intMakeVisible);
NS_IMETHOD SetCaretReadOnly(PRBool inMakeReadonly);
NS_IMETHOD GetCaretCoordinates(EViewCoordinates aRelativeToType, nsISelection *inDOMSel, nsRect* outCoordinates, PRBool* outIsCollapsed, nsIView **outView);
NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame);
NS_IMETHOD EraseCaret();
NS_IMETHOD SetCaretVisible(PRBool intMakeVisible);
NS_IMETHOD SetCaretReadOnly(PRBool inMakeReadonly);
NS_IMETHOD GetCaretCoordinates(EViewCoordinates aRelativeToType, nsISelection *inDOMSel, nsRect* outCoordinates, PRBool* outIsCollapsed, nsIView **outView);
NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame);
NS_IMETHOD EraseCaret();
NS_IMETHOD SetCaretWidth(nscoord aPixels);
NS_IMETHOD SetVisibilityDuringSelection(PRBool aVisibility);
@ -105,6 +105,9 @@ protected:
PRPackedBool mDrawn; // this should be mutable
PRPackedBool mReadOnly; // it the caret in readonly state (draws differently)
PRPackedBool mShowDuringSelection; // show when text is selected
PRPackedBool mCachedOffsetValid; //whether the cached frame offset is valid
nsPoint mCachedFrameOffset; //cached frame offset
nsRect mCaretRect; // the last caret rect
nsIFrame* mLastCaretFrame; // store the frame the caret was last drawn in.