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

Bug 386254, r+sr=roc, a=dveditz

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@229485 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi
2007-07-07 12:54:50 +00:00
parent c9f6de6a98
commit f4b805ab9f
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/layout/forms/nsTextControlFrame.cpp
View File

@@ -2344,7 +2344,8 @@ NS_IMETHODIMP nsTextControlFrame::SetProperty(nsPresContext* aPresContext, nsIAt
// has changed.
SetValueChanged(PR_TRUE);
}
SetValue(aValue); // set new text value
nsresult rv = SetValue(aValue); // set new text value
NS_ENSURE_SUCCESS(rv, rv);
}
else if (nsHTMLAtoms::select == aName && mSelCon)
{
@@ -3096,13 +3097,15 @@ nsTextControlFrame::GetValue(nsAString& aValue, PRBool aIgnoreWrap)
// END IMPLEMENTING NS_IFORMCONTROLFRAME
void
nsresult
nsTextControlFrame::SetValue(const nsAString& aValue)
{
// XXX this method should actually propagate errors! It'd make debugging it
// so much easier...
if (mEditor && mUseEditor)
{
nsCOMPtr<nsIEditor> editor = mEditor;
nsWeakFrame weakFrame(this);
nsAutoString currentValue;
GetValue(currentValue, PR_FALSE);
if (IsSingleLineTextControl())
@@ -3120,9 +3123,9 @@ nsTextControlFrame::SetValue(const nsAString& aValue)
nsFormControlHelper::PlatformToDOMLineBreaks(currentValue);
nsCOMPtr<nsIDOMDocument>domDoc;
nsresult rv = mEditor->GetDocument(getter_AddRefs(domDoc));
if (NS_FAILED(rv)) return;
if (!domDoc) return;
nsresult rv = editor->GetDocument(getter_AddRefs(domDoc));
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_STATE(domDoc);
// Time to mess with our security context... See comments in GetValue()
// for why this is needed. Note that we have to do this up here, because
@@ -3150,7 +3153,7 @@ nsTextControlFrame::SetValue(const nsAString& aValue)
stack->Pop(&cx);
NS_ASSERTION(!cx, "Unexpected JSContext popped!");
}
return;
return NS_ERROR_FAILURE;
}
// Since this code does not handle user-generated changes to the text,
@@ -3167,21 +3170,19 @@ nsTextControlFrame::SetValue(const nsAString& aValue)
// get the flags, remove readonly and disabled, set the value,
// restore flags
PRUint32 flags, savedFlags;
mEditor->GetFlags(&savedFlags);
editor->GetFlags(&savedFlags);
flags = savedFlags;
flags &= ~(nsIPlaintextEditor::eEditorDisabledMask);
flags &= ~(nsIPlaintextEditor::eEditorReadonlyMask);
mEditor->SetFlags(flags);
editor->SetFlags(flags);
if (currentValue.Length() < 1)
mEditor->DeleteSelection(nsIEditor::eNone);
editor->DeleteSelection(nsIEditor::eNone);
else {
nsCOMPtr<nsIPlaintextEditor> textEditor = do_QueryInterface(mEditor);
nsCOMPtr<nsIPlaintextEditor> textEditor = do_QueryInterface(editor);
if (textEditor)
textEditor->InsertText(currentValue);
}
mEditor->SetFlags(savedFlags);
editor->SetFlags(savedFlags);
if (selPriv)
selPriv->EndBatchChanges();
@@ -3191,6 +3192,7 @@ nsTextControlFrame::SetValue(const nsAString& aValue)
NS_ASSERTION(!cx, "Unexpected JSContext popped!");
}
NS_ENSURE_STATE(weakFrame.IsAlive());
if (outerTransaction)
mNotifyOnInput = PR_TRUE;
@@ -3218,6 +3220,7 @@ nsTextControlFrame::SetValue(const nsAString& aValue)
textControl->TakeTextFrameValue(aValue);
}
}
return NS_OK;
}

6
mozilla/layout/forms/nsTextControlFrame.h
View File

@@ -126,7 +126,11 @@ public:
virtual void PostCreateFrames();
// Utility methods to set current widget state
void SetValue(const nsAString& aValue);
// Be careful when using this method.
// Calling it may cause |this| to be deleted.
// In that case the method returns an error value.
nsresult SetValue(const nsAString& aValue);
NS_IMETHOD SetInitialChildList(nsPresContext* aPresContext,
nsIAtom* aListName,
nsIFrame* aChildList);