Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 75676. Make textfield.textLength work properly. r=mjudge sr=kin

Browse Source
This commit is contained in:
sfraser%netscape.com 2001-04-13 00:25:36 +00:00
parent 07cc44a593
commit 8dd627dfa0
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
layout/html/forms/src/nsGfxTextControlFrame2.cpp
View File

@ -1211,11 +1211,7 @@ nsGfxTextControlFrame2::Destroy(nsIPresContext* aPresContext)
mSelCon = 0;
mEditor = 0;
if (mCachedState)
{
delete mCachedState;
mCachedState = nsnull;
}
InvalidateCachedState();
//unregister self from content
mTextListener->SetFrame(nsnull);
@ -1716,13 +1712,8 @@ nsGfxTextControlFrame2::SetInitialValue()
}
// Free mCachedState since we don't need it anymore!
InvalidateCachedState();
if (mCachedState)
{
delete mCachedState;
mCachedState = nsnull;
}
return NS_OK;
}
@ -2454,13 +2445,22 @@ NS_IMETHODIMP
nsGfxTextControlFrame2::GetTextLength(PRInt32* aTextLength)
{
NS_ENSURE_ARG_POINTER(aTextLength);
// We should probably invalidate the cached string on more
// than just selection changes; maybe we should listen
// for editor transactions etc.
nsString *str = GetCachedString();
if (str)
{
*aTextLength = str->Length();
return NS_OK;
}
return NS_ERROR_FAILURE;
// otherwise, do it the long way
nsAutoString textContents;
GetTextControlFrameState(textContents); // this is expensive!
*aTextLength = textContents.Length();
return NS_OK;
}
@ -3002,6 +3002,8 @@ nsGfxTextControlFrame2::InternalContentChanged()
if (!mContent) { return NS_ERROR_NULL_POINTER; }
InvalidateCachedState();
if (PR_FALSE==mNotifyOnInput) {
return NS_OK; // if notification is turned off, just return ok
}
@ -3073,6 +3075,16 @@ nsGfxTextControlFrame2::GetCachedString()
return mCachedState;
}
void
nsGfxTextControlFrame2::InvalidateCachedState()
{
if (mCachedState)
{
delete mCachedState;
mCachedState = nsnull;
}
}
void nsGfxTextControlFrame2::GetTextControlFrameState(nsAWritableString& aValue)
{
aValue.SetLength(0); // initialize out param

5
layout/html/forms/src/nsGfxTextControlFrame2.h
View File

@ -151,14 +151,19 @@ public:
NS_IMETHOD GetText(nsString* aText, PRBool aInitialValue);
NS_DECL_ISUPPORTS_INHERITED
public: //for methods who access nsGfxTextControlFrame2 directly
void SubmitAttempt();
NS_IMETHOD InternalContentChanged();//notify that we have some kind of change.
NS_IMETHOD CallOnChange();
protected:
PRBool IsScrollable() const;
nsresult SetInitialValue();
nsString *GetCachedString();
void InvalidateCachedState();
virtual PRIntn GetSkipSides() const;
void RemoveNewlines(nsString &aString);
NS_IMETHOD GetMaxLength(PRInt32* aSize);