diff --git a/mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp b/mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp index ef3b40b2250..6ca2422f528 100644 --- a/mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp +++ b/mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp @@ -56,7 +56,7 @@ #include "nsIEditor.h" #include "nsIEventStateManager.h" #include "nsIFrame.h" -#include "nsIGfxTextControlFrame.h" +#include "nsITextControlFrame.h" #include "nsINameSpaceManager.h" #include "nsIPlaintextEditor.h" #include "nsISelectionController.h" @@ -323,7 +323,7 @@ nsFormControlAccessible(aNode, aShell) nsCOMPtr content(do_QueryInterface(mDOMNode)); nsIFrame *frame = nsnull; shell->GetPrimaryFrameFor(content, &frame); - nsCOMPtr tframe(do_QueryInterface(frame)); + nsCOMPtr tframe(do_QueryInterface(frame)); if (!tframe) return; @@ -463,7 +463,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::MakeSelection(PRInt32 aStartPos, PRInt3 nsCOMPtr content(do_QueryInterface(mDOMNode)); nsIFrame *frame = nsnull; shell->GetPrimaryFrameFor(content, &frame); - nsCOMPtr tframe(do_QueryInterface(frame)); + nsCOMPtr tframe(do_QueryInterface(frame)); if (!tframe) return NS_ERROR_FAILURE; diff --git a/mozilla/content/html/content/public/nsITextControlElement.h b/mozilla/content/html/content/public/nsITextControlElement.h index e9cdf233e44..e3ae43aee7d 100644 --- a/mozilla/content/html/content/public/nsITextControlElement.h +++ b/mozilla/content/html/content/public/nsITextControlElement.h @@ -41,7 +41,7 @@ #include "nsISupports.h" class nsAString; -class nsIGfxTextControlFrame2; +class nsITextControlFrame; // IID for the nsITextControl interface #define NS_ITEXTCONTROLELEMENT_IID \ @@ -60,7 +60,7 @@ public: /** * Set the control's value without security checks */ - NS_IMETHOD SetValueGuaranteed(const nsAString& aValue, nsIGfxTextControlFrame2* aFrame) = 0; + NS_IMETHOD SetValueGuaranteed(const nsAString& aValue, nsITextControlFrame* aFrame) = 0; /** * Tell the control that value has been deliberately changed (or not). diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index f15e0896b94..70e9d477153 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -61,7 +61,8 @@ #include "nsIFormControl.h" #include "nsIForm.h" #include "nsIFormSubmission.h" -#include "nsIGfxTextControlFrame.h" +#include "nsITextControlFrame.h" +#include "nsIRadioControlFrame.h" #include "nsIDocument.h" #include "nsIPresShell.h" #include "nsIFormControlFrame.h" @@ -108,7 +109,7 @@ static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); -typedef nsIGfxTextControlFrame2 textControlPlace; +typedef nsITextControlFrame textControlPlace; // // Accessors for mBitField @@ -221,7 +222,7 @@ public: NS_IMETHOD DoneCreatingElement(); // nsITextControlElement - NS_IMETHOD SetValueGuaranteed(const nsAString& aValue, nsIGfxTextControlFrame2* aFrame); + NS_IMETHOD SetValueGuaranteed(const nsAString& aValue, nsITextControlFrame* aFrame); NS_IMETHOD SetValueChanged(PRBool aValueChanged); // nsIRadioControlElement @@ -235,7 +236,7 @@ public: protected: // Helper method NS_IMETHOD SetValueSecure(const nsAString& aValue, - nsIGfxTextControlFrame2* aFrame, + nsITextControlFrame* aFrame, PRBool aCheckSecurity); nsresult GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd); @@ -600,7 +601,7 @@ nsHTMLInputElement::GetValue(nsAString& aValue) PRBool frameOwnsValue = PR_FALSE; if (formControlFrame) { - nsIGfxTextControlFrame2* textControlFrame = nsnull; + nsITextControlFrame* textControlFrame = nsnull; CallQueryInterface(formControlFrame, &textControlFrame); if (textControlFrame) { @@ -646,14 +647,14 @@ nsHTMLInputElement::SetValue(const nsAString& aValue) NS_IMETHODIMP nsHTMLInputElement::SetValueGuaranteed(const nsAString& aValue, - nsIGfxTextControlFrame2* aFrame) + nsITextControlFrame* aFrame) { return SetValueSecure(aValue, aFrame, PR_FALSE); } NS_IMETHODIMP nsHTMLInputElement::SetValueSecure(const nsAString& aValue, - nsIGfxTextControlFrame2* aFrame, + nsITextControlFrame* aFrame, PRBool aCheckSecurity) { PRInt32 type; @@ -682,7 +683,7 @@ nsHTMLInputElement::SetValueSecure(const nsAString& aValue, } } - nsIGfxTextControlFrame2* textControlFrame = aFrame; + nsITextControlFrame* textControlFrame = aFrame; nsIFormControlFrame* formControlFrame = textControlFrame; if (!textControlFrame) { // No need to flush here, if there's no frame at this point we @@ -1596,7 +1597,7 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext* aPresContext, if (mForm) { nsIFrame* primaryFrame = GetPrimaryFrame(PR_FALSE); if (primaryFrame) { - nsIGfxTextControlFrame2* textFrame = nsnull; + nsITextControlFrame* textFrame = nsnull; CallQueryInterface(primaryFrame, &textFrame); // Fire onChange (if necessary) diff --git a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp index 4b745a11864..9d69d3b04fc 100644 --- a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp @@ -57,7 +57,7 @@ #include "nsIPresContext.h" #include "nsHTMLAttributes.h" #include "nsIFormControlFrame.h" -#include "nsIGfxTextControlFrame.h" +#include "nsITextControlFrame.h" #include "nsIEventStateManager.h" #include "nsISizeOfHandler.h" #include "nsLinebreakConverter.h" @@ -117,7 +117,7 @@ public: NS_IMETHOD RestoreState(nsIPresState* aState); // nsITextControlElement - NS_IMETHOD SetValueGuaranteed(const nsAString& aValue, nsIGfxTextControlFrame2* aFrame); + NS_IMETHOD SetValueGuaranteed(const nsAString& aValue, nsITextControlFrame* aFrame); NS_IMETHOD SetValueChanged(PRBool aValueChanged); // nsIContent @@ -434,7 +434,7 @@ nsHTMLTextAreaElement::GetValueInternal(nsAString& aValue, PRBool aIgnoreWrap) // there won't be a value in it we don't already have even if we // force the frame to be created. nsIFrame* primaryFrame = GetPrimaryFrame(PR_FALSE); - nsIGfxTextControlFrame2* textControlFrame = nsnull; + nsITextControlFrame* textControlFrame = nsnull; if (primaryFrame) { CallQueryInterface(primaryFrame, &textControlFrame); } @@ -459,9 +459,9 @@ nsHTMLTextAreaElement::GetValueInternal(nsAString& aValue, PRBool aIgnoreWrap) NS_IMETHODIMP nsHTMLTextAreaElement::SetValueGuaranteed(const nsAString& aValue, - nsIGfxTextControlFrame2* aFrame) + nsITextControlFrame* aFrame) { - nsIGfxTextControlFrame2* textControlFrame = aFrame; + nsITextControlFrame* textControlFrame = aFrame; nsIFormControlFrame* formControlFrame = textControlFrame; if (!textControlFrame) { // No need to flush here, if there is no frame for this yet forcing @@ -625,7 +625,7 @@ nsHTMLTextAreaElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt { // XXX Bug 50280 - It is unclear why we need to do this here for // rows and cols and why the AttributeChanged method in - // nsGfxTextControlFrame2 does take care of the entire problem, but + // nsTextControlFrame does take care of the entire problem, but // it doesn't and this makes things better if (aAttribute == nsHTMLAtoms::align || aAttribute == nsHTMLAtoms::rows || @@ -857,7 +857,7 @@ nsHTMLTextAreaElement::GetSelectionStart(PRInt32 *aSelectionStart) NS_ENSURE_ARG_POINTER(aSelectionStart); nsCOMPtr formControlFrame = getter_AddRefs(GetFormControlFrame(PR_TRUE)); - nsCOMPtr + nsCOMPtr textControlFrame(do_QueryInterface(formControlFrame)); if (textControlFrame) { @@ -873,7 +873,7 @@ nsHTMLTextAreaElement::SetSelectionStart(PRInt32 aSelectionStart) { nsCOMPtr formControlFrame = getter_AddRefs(GetFormControlFrame(PR_TRUE)); - nsCOMPtr + nsCOMPtr textControlFrame(do_QueryInterface(formControlFrame)); if (textControlFrame) @@ -888,7 +888,7 @@ nsHTMLTextAreaElement::GetSelectionEnd(PRInt32 *aSelectionEnd) NS_ENSURE_ARG_POINTER(aSelectionEnd); nsCOMPtr formControlFrame = getter_AddRefs(GetFormControlFrame(PR_TRUE)); - nsCOMPtr + nsCOMPtr textControlFrame(do_QueryInterface(formControlFrame)); if (textControlFrame) { @@ -904,7 +904,7 @@ nsHTMLTextAreaElement::SetSelectionEnd(PRInt32 aSelectionEnd) { nsCOMPtr formControlFrame = getter_AddRefs(GetFormControlFrame(PR_TRUE)); - nsCOMPtr + nsCOMPtr textControlFrame(do_QueryInterface(formControlFrame)); if (textControlFrame) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 335bd1d4df2..a260bdc9e6b 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -4139,7 +4139,7 @@ nsCSSFrameConstructor::ConstructTextControlFrame(nsIPresShell* aPresShell, aPresContext->GetWidgetRenderingMode(&mode); if (eWidgetRendering_Gfx == mode) { - rv = NS_NewGfxTextControlFrame(aPresShell, &aNewFrame); + rv = NS_NewTextControlFrame(aPresShell, &aNewFrame); if (NS_FAILED(rv)) { aNewFrame = nsnull; } diff --git a/mozilla/layout/forms/nsFileControlFrame.h b/mozilla/layout/forms/nsFileControlFrame.h index 09164385eb4..007ef943473 100644 --- a/mozilla/layout/forms/nsFileControlFrame.h +++ b/mozilla/layout/forms/nsFileControlFrame.h @@ -45,9 +45,9 @@ #include "nsCOMPtr.h" #include "nsIHTMLContent.h" -#include "nsGfxTextControlFrame2.h" +#include "nsTextControlFrame.h" #include "nsFormControlHelper.h" -typedef nsGfxTextControlFrame2 nsNewFrame; +typedef nsTextControlFrame nsNewFrame; class nsIPresState; class nsISupportsArray; diff --git a/mozilla/layout/forms/nsFormControlHelper.cpp b/mozilla/layout/forms/nsFormControlHelper.cpp index 6dfb2a107b1..f27bb1c6887 100644 --- a/mozilla/layout/forms/nsFormControlHelper.cpp +++ b/mozilla/layout/forms/nsFormControlHelper.cpp @@ -450,7 +450,7 @@ nsFormControlHelper::CalculateSize (nsIPresContext* aPresContext, // need to set charWidth and aDesiredSize.height charWidth = GetTextSize(aPresContext, aFrame, 1, aDesiredSize, aRendContext); col = (col <= 0) ? 15 : col; // XXX why a default of 15 pixels, why hide it - // XXX this conflicts with a default of 20 found in nsGfxTextControlFrame. + // XXX this conflicts with a default of 20 found in nsTextControlFrame. aDesiredSize.width = NSIntPixelsToTwips(col, p2t); } else { col = (col <= 0) ? 1 : col; // XXX why a default of 1 char, why hide it diff --git a/mozilla/layout/forms/nsITextControlFrame.h b/mozilla/layout/forms/nsITextControlFrame.h index 1abb35cb422..06c84f3b4a2 100644 --- a/mozilla/layout/forms/nsITextControlFrame.h +++ b/mozilla/layout/forms/nsITextControlFrame.h @@ -46,7 +46,7 @@ class nsISelectionController; 0xa744cfc9, 0x2da8, 0x416d, \ { 0xa0, 0x58, 0xad, 0xb1, 0xd4, 0xb3, 0xb5, 0x34 } } -class nsIGfxTextControlFrame2 : public nsIFormControlFrame +class nsITextControlFrame : public nsIFormControlFrame { public: NS_DEFINE_STATIC_IID_ACCESSOR(NS_IGFXTEXTCONTROLFRAME2_IID) diff --git a/mozilla/layout/forms/nsIsIndexFrame.h b/mozilla/layout/forms/nsIsIndexFrame.h index 4be761d4afc..4f615654b51 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.h +++ b/mozilla/layout/forms/nsIsIndexFrame.h @@ -45,9 +45,9 @@ #include "nsIUnicodeEncoder.h" #include "nsIDOMKeyListener.h" -#include "nsGfxTextControlFrame2.h" +#include "nsTextControlFrame.h" #include "nsFormControlHelper.h" -typedef nsGfxTextControlFrame2 nsNewFrame; +typedef nsTextControlFrame nsNewFrame; class nsIPresState; class nsISupportsArray; diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index 0eed3a33031..b09cc5fcf18 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -38,7 +38,7 @@ #include "nsCOMPtr.h" -#include "nsGfxTextControlFrame2.h" +#include "nsTextControlFrame.h" #include "nsIDocument.h" #include "nsIDOMNSHTMLTextAreaElement.h" #include "nsIDOMNSHTMLInputElement.h" @@ -170,7 +170,7 @@ public: /** SetEditor gives an address to the editor that will be accessed * @param aEditor the editor this listener calls for editing operations */ - void SetFrame(nsGfxTextControlFrame2 *aFrame){mFrame = aFrame;} + void SetFrame(nsTextControlFrame *aFrame){mFrame = aFrame;} /*interfaces for addref and release and queryinterface*/ NS_DECL_ISUPPORTS @@ -226,7 +226,7 @@ protected: protected: - nsGfxTextControlFrame2* mFrame; // weak reference + nsTextControlFrame* mFrame; // weak reference PRPackedBool mSelectionWasCollapsed; PRPackedBool mKnowSelectionCollapsed; @@ -1102,7 +1102,7 @@ NS_IMETHODIMP nsTextInputSelectionImpl::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent) { // We should never have a table inside a text control frame! - NS_ASSERTION(PR_TRUE, "Calling HandleTableSelection inside nsGfxTextControlFrame2!"); + NS_ASSERTION(PR_TRUE, "Calling HandleTableSelection inside nsTextControlFrame!"); return NS_OK; } @@ -1254,13 +1254,13 @@ NS_IMETHODIMP nsTextInputSelectionImpl::GetFrameFromLevel(nsIPresContext *aPresC nsresult -NS_NewGfxTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) +NS_NewTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { NS_PRECONDITION(aNewFrame, "null OUT ptr"); if (nsnull == aNewFrame) { return NS_ERROR_NULL_POINTER; } - nsGfxTextControlFrame2* it = new (aPresShell) nsGfxTextControlFrame2(aPresShell); + nsTextControlFrame* it = new (aPresShell) nsTextControlFrame(aPresShell); if (!it) { return NS_ERROR_OUT_OF_MEMORY; } @@ -1268,12 +1268,12 @@ NS_NewGfxTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) return NS_OK; } -NS_IMPL_ADDREF_INHERITED(nsGfxTextControlFrame2, nsBoxFrame); -NS_IMPL_RELEASE_INHERITED(nsGfxTextControlFrame2, nsBoxFrame); +NS_IMPL_ADDREF_INHERITED(nsTextControlFrame, nsBoxFrame); +NS_IMPL_RELEASE_INHERITED(nsTextControlFrame, nsBoxFrame); NS_IMETHODIMP -nsGfxTextControlFrame2::QueryInterface(const nsIID& aIID, void** aInstancePtr) +nsTextControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) { if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; @@ -1286,8 +1286,8 @@ nsGfxTextControlFrame2::QueryInterface(const nsIID& aIID, void** aInstancePtr) *aInstancePtr = (void*)(nsIAnonymousContentCreator*) this; return NS_OK; } - if (aIID.Equals(NS_GET_IID(nsIGfxTextControlFrame2))) { - *aInstancePtr = (void*)(nsIGfxTextControlFrame2*) this; + if (aIID.Equals(NS_GET_IID(nsITextControlFrame))) { + *aInstancePtr = (void*)(nsITextControlFrame*) this; return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider))) { @@ -1299,7 +1299,7 @@ nsGfxTextControlFrame2::QueryInterface(const nsIID& aIID, void** aInstancePtr) } #ifdef ACCESSIBILITY -NS_IMETHODIMP nsGfxTextControlFrame2::GetAccessible(nsIAccessible** aAccessible) +NS_IMETHODIMP nsTextControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -1311,7 +1311,7 @@ NS_IMETHODIMP nsGfxTextControlFrame2::GetAccessible(nsIAccessible** aAccessible) } #endif -nsGfxTextControlFrame2::nsGfxTextControlFrame2(nsIPresShell* aShell):nsStackFrame(aShell) +nsTextControlFrame::nsTextControlFrame(nsIPresShell* aShell):nsStackFrame(aShell) { mUseEditor = PR_FALSE; mIsProcessing = PR_FALSE; @@ -1322,7 +1322,7 @@ nsGfxTextControlFrame2::nsGfxTextControlFrame2(nsIPresShell* aShell):nsStackFram mDidPreDestroy = PR_FALSE; } -nsGfxTextControlFrame2::~nsGfxTextControlFrame2() +nsTextControlFrame::~nsTextControlFrame() { //delete mTextListener; //delete mTextSelImpl; dont delete this since mSelCon will release it. @@ -1369,7 +1369,7 @@ SuppressEventHandlers(nsIPresContext* aPresContext) } void -nsGfxTextControlFrame2::PreDestroy(nsIPresContext* aPresContext) +nsTextControlFrame::PreDestroy(nsIPresContext* aPresContext) { // notify the editor that we are going away if (mEditor) @@ -1447,7 +1447,7 @@ nsGfxTextControlFrame2::PreDestroy(nsIPresContext* aPresContext) } NS_IMETHODIMP -nsGfxTextControlFrame2::Destroy(nsIPresContext* aPresContext) +nsTextControlFrame::Destroy(nsIPresContext* aPresContext) { if (!mDidPreDestroy) { PreDestroy(aPresContext); @@ -1456,7 +1456,7 @@ nsGfxTextControlFrame2::Destroy(nsIPresContext* aPresContext) } void -nsGfxTextControlFrame2::RemovedAsPrimaryFrame(nsIPresContext* aPresContext) +nsTextControlFrame::RemovedAsPrimaryFrame(nsIPresContext* aPresContext) { if (!mDidPreDestroy) { PreDestroy(aPresContext); @@ -1465,7 +1465,7 @@ nsGfxTextControlFrame2::RemovedAsPrimaryFrame(nsIPresContext* aPresContext) } NS_IMETHODIMP -nsGfxTextControlFrame2::GetFrameType(nsIAtom** aType) const +nsTextControlFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); *aType = nsLayoutAtoms::textInputFrame; @@ -1474,7 +1474,7 @@ nsGfxTextControlFrame2::GetFrameType(nsIAtom** aType) const } // XXX: wouldn't it be nice to get this from the style context! -PRBool nsGfxTextControlFrame2::IsSingleLineTextControl() const +PRBool nsTextControlFrame::IsSingleLineTextControl() const { PRInt32 type; GetType(&type); @@ -1484,7 +1484,7 @@ PRBool nsGfxTextControlFrame2::IsSingleLineTextControl() const return PR_FALSE; } -PRBool nsGfxTextControlFrame2::IsTextArea() const +PRBool nsTextControlFrame::IsTextArea() const { if (!mContent) return PR_FALSE; @@ -1499,13 +1499,13 @@ PRBool nsGfxTextControlFrame2::IsTextArea() const } // XXX: wouldn't it be nice to get this from the style context! -PRBool nsGfxTextControlFrame2::IsPlainTextControl() const +PRBool nsTextControlFrame::IsPlainTextControl() const { // need to check HTML attribute of mContent and/or CSS. return PR_TRUE; } -PRBool nsGfxTextControlFrame2::IsPasswordTextControl() const +PRBool nsTextControlFrame::IsPasswordTextControl() const { PRInt32 type; GetType(&type); @@ -1517,7 +1517,7 @@ PRBool nsGfxTextControlFrame2::IsPasswordTextControl() const nsresult -nsGfxTextControlFrame2::GetColRowSizeAttr(nsIFormControlFrame* aFrame, +nsTextControlFrame::GetColRowSizeAttr(nsIFormControlFrame* aFrame, nsIAtom * aColSizeAttr, nsHTMLValue & aColSize, nsresult & aColStatus, @@ -1550,7 +1550,7 @@ nsGfxTextControlFrame2::GetColRowSizeAttr(nsIFormControlFrame* aFrame, NS_IMETHODIMP -nsGfxTextControlFrame2::ReflowStandard(nsIPresContext* aPresContext, +nsTextControlFrame::ReflowStandard(nsIPresContext* aPresContext, nsSize& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus, @@ -1624,7 +1624,7 @@ nsGfxTextControlFrame2::ReflowStandard(nsIPresContext* aPresContext, PRInt32 -nsGfxTextControlFrame2::CalculateSizeStandard (nsIPresContext* aPresContext, +nsTextControlFrame::CalculateSizeStandard (nsIPresContext* aPresContext, nsIRenderingContext* aRendContext, nsIFormControlFrame* aFrame, nsInputDimensionSpec& aSpec, @@ -1761,7 +1761,7 @@ nsGfxTextControlFrame2::CalculateSizeStandard (nsIPresContext* aPresContex //------------------------------------------------------------------ NS_IMETHODIMP -nsGfxTextControlFrame2::CreateFrameFor(nsIPresContext* aPresContext, +nsTextControlFrame::CreateFrameFor(nsIPresContext* aPresContext, nsIContent * aContent, nsIFrame** aFrame) { @@ -1770,7 +1770,7 @@ nsGfxTextControlFrame2::CreateFrameFor(nsIPresContext* aPresContext, } nsresult -nsGfxTextControlFrame2::InitEditor() +nsTextControlFrame::InitEditor() { // This method must be called during/after the text // control frame's initial reflow to avoid any unintened @@ -1867,7 +1867,7 @@ nsGfxTextControlFrame2::InitEditor() "" NS_IMETHODIMP -nsGfxTextControlFrame2::CreateAnonymousContent(nsIPresContext* aPresContext, +nsTextControlFrame::CreateAnonymousContent(nsIPresContext* aPresContext, nsISupportsArray& aChildList) { // Get the PresShell @@ -2196,12 +2196,12 @@ nsGfxTextControlFrame2::CreateAnonymousContent(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsGfxTextControlFrame2::Reflow(nsIPresContext* aPresContext, +nsTextControlFrame::Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) { - DO_GLOBAL_REFLOW_COUNT("nsGfxTextControlFrame2", aReflowState.reason); + DO_GLOBAL_REFLOW_COUNT("nsTextControlFrame", aReflowState.reason); DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus); InitEditor(); @@ -2229,7 +2229,7 @@ nsGfxTextControlFrame2::Reflow(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsGfxTextControlFrame2::Paint(nsIPresContext* aPresContext, +nsTextControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer, @@ -2247,12 +2247,12 @@ nsGfxTextControlFrame2::Paint(nsIPresContext* aPresContext, if (NS_FAILED(rv)) return rv; rv = nsStackFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, NS_FRAME_PAINT_LAYER_FOREGROUND); } - DO_GLOBAL_REFLOW_COUNT_DSP("nsGfxTextControlFrame2", &aRenderingContext); + DO_GLOBAL_REFLOW_COUNT_DSP("nsTextControlFrame", &aRenderingContext); return rv; } NS_IMETHODIMP -nsGfxTextControlFrame2::GetFrameForPoint(nsIPresContext* aPresContext, +nsTextControlFrame::GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, nsFramePaintLayer aWhichLayer, nsIFrame** aFrame) @@ -2274,7 +2274,7 @@ nsGfxTextControlFrame2::GetFrameForPoint(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsGfxTextControlFrame2::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize) +nsTextControlFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize) { if (!DoesNeedRecalc(mPrefSize)) { aSize = mPrefSize; @@ -2342,7 +2342,7 @@ nsGfxTextControlFrame2::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize) NS_IMETHODIMP -nsGfxTextControlFrame2::GetMinSize(nsBoxLayoutState& aState, nsSize& aSize) +nsTextControlFrame::GetMinSize(nsBoxLayoutState& aState, nsSize& aSize) { #define FIX_FOR_BUG_40596 #ifdef FIX_FOR_BUG_40596 @@ -2354,13 +2354,13 @@ nsGfxTextControlFrame2::GetMinSize(nsBoxLayoutState& aState, nsSize& aSize) } NS_IMETHODIMP -nsGfxTextControlFrame2::GetMaxSize(nsBoxLayoutState& aState, nsSize& aSize) +nsTextControlFrame::GetMaxSize(nsBoxLayoutState& aState, nsSize& aSize) { return nsBox::GetMaxSize(aState, aSize); } NS_IMETHODIMP -nsGfxTextControlFrame2::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent) +nsTextControlFrame::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent) { nsSize size; nsresult rv = GetPrefSize(aState, size); @@ -2370,7 +2370,7 @@ nsGfxTextControlFrame2::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent) //IMPLEMENTING NS_IFORMCONTROLFRAME NS_IMETHODIMP -nsGfxTextControlFrame2::GetName(nsAString* aResult) +nsTextControlFrame::GetName(nsAString* aResult) { nsresult rv = NS_FORM_NOTOK; if (mContent) { @@ -2391,7 +2391,7 @@ nsGfxTextControlFrame2::GetName(nsAString* aResult) } NS_IMETHODIMP -nsGfxTextControlFrame2::GetType(PRInt32* aType) const +nsTextControlFrame::GetType(PRInt32* aType) const { nsresult rv = NS_FORM_NOTOK; if (mContent) { @@ -2406,7 +2406,7 @@ nsGfxTextControlFrame2::GetType(PRInt32* aType) const } nsresult -nsGfxTextControlFrame2::GetSizeFromContent(PRInt32* aSize) const +nsTextControlFrame::GetSizeFromContent(PRInt32* aSize) const { *aSize = -1; nsresult result = NS_CONTENT_ATTR_NOT_THERE; @@ -2438,9 +2438,9 @@ nsGfxTextControlFrame2::GetSizeFromContent(PRInt32* aSize) const return result; } -void nsGfxTextControlFrame2::SetFocus(PRBool aOn , PRBool aRepaint){} +void nsTextControlFrame::SetFocus(PRBool aOn , PRBool aRepaint){} -void nsGfxTextControlFrame2::ScrollIntoView(nsIPresContext* aPresContext) +void nsTextControlFrame::ScrollIntoView(nsIPresContext* aPresContext) { if (aPresContext) { nsCOMPtr presShell; @@ -2452,10 +2452,10 @@ void nsGfxTextControlFrame2::ScrollIntoView(nsIPresContext* aPresContext) } } -void nsGfxTextControlFrame2::MouseClicked(nsIPresContext* aPresContext){} +void nsTextControlFrame::MouseClicked(nsIPresContext* aPresContext){} nscoord -nsGfxTextControlFrame2::GetVerticalInsidePadding(nsIPresContext* aPresContext, +nsTextControlFrame::GetVerticalInsidePadding(nsIPresContext* aPresContext, float aPixToTwip, nscoord aInnerHeight) const { @@ -2465,7 +2465,7 @@ nsGfxTextControlFrame2::GetVerticalInsidePadding(nsIPresContext* aPresContext, //--------------------------------------------------------- nscoord -nsGfxTextControlFrame2::GetHorizontalInsidePadding(nsIPresContext* aPresContext, +nsTextControlFrame::GetHorizontalInsidePadding(nsIPresContext* aPresContext, float aPixToTwip, nscoord aInnerWidth, nscoord aCharWidth) const @@ -2475,7 +2475,7 @@ nsGfxTextControlFrame2::GetHorizontalInsidePadding(nsIPresContext* aPresContext, NS_IMETHODIMP -nsGfxTextControlFrame2::SetSuggestedSize(nscoord aWidth, nscoord aHeight) +nsTextControlFrame::SetSuggestedSize(nscoord aWidth, nscoord aHeight) { mSuggestedWidth = aWidth; mSuggestedHeight = aHeight; @@ -2483,21 +2483,21 @@ nsGfxTextControlFrame2::SetSuggestedSize(nscoord aWidth, nscoord aHeight) } nsresult -nsGfxTextControlFrame2::RequiresWidget(PRBool& aRequiresWidget) +nsTextControlFrame::RequiresWidget(PRBool& aRequiresWidget) { aRequiresWidget = PR_FALSE; return NS_OK; } NS_IMETHODIMP -nsGfxTextControlFrame2::GetFont(nsIPresContext* aPresContext, +nsTextControlFrame::GetFont(nsIPresContext* aPresContext, const nsFont*& aFont) { return nsFormControlHelper::GetFont(this, aPresContext, mStyleContext, aFont); } NS_IMETHODIMP -nsGfxTextControlFrame2::GetFormContent(nsIContent*& aContent) const +nsTextControlFrame::GetFormContent(nsIContent*& aContent) const { nsIContent* content; nsresult rv; @@ -2507,7 +2507,7 @@ nsGfxTextControlFrame2::GetFormContent(nsIContent*& aContent) const return rv; } -NS_IMETHODIMP nsGfxTextControlFrame2::SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAString& aValue) +NS_IMETHODIMP nsTextControlFrame::SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAString& aValue) { if (!mIsProcessing)//some kind of lock. { @@ -2539,7 +2539,7 @@ NS_IMETHODIMP nsGfxTextControlFrame2::SetProperty(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsGfxTextControlFrame2::GetProperty(nsIAtom* aName, nsAString& aValue) +nsTextControlFrame::GetProperty(nsIAtom* aName, nsAString& aValue) { // Return the value of the property from the widget it is not null. // If widget is null, assume the widget is GFX-rendered and return a member variable instead. @@ -2553,7 +2553,7 @@ nsGfxTextControlFrame2::GetProperty(nsIAtom* aName, nsAString& aValue) NS_IMETHODIMP -nsGfxTextControlFrame2::GetEditor(nsIEditor **aEditor) +nsTextControlFrame::GetEditor(nsIEditor **aEditor) { NS_ENSURE_ARG_POINTER(aEditor); *aEditor = mEditor; @@ -2562,7 +2562,7 @@ nsGfxTextControlFrame2::GetEditor(nsIEditor **aEditor) } NS_IMETHODIMP -nsGfxTextControlFrame2::OwnsValue(PRBool* aOwnsValue) +nsTextControlFrame::OwnsValue(PRBool* aOwnsValue) { NS_PRECONDITION(aOwnsValue, "aOwnsValue must be non-null"); *aOwnsValue = mUseEditor; @@ -2570,7 +2570,7 @@ nsGfxTextControlFrame2::OwnsValue(PRBool* aOwnsValue) } NS_IMETHODIMP -nsGfxTextControlFrame2::GetTextLength(PRInt32* aTextLength) +nsTextControlFrame::GetTextLength(PRInt32* aTextLength) { NS_ENSURE_ARG_POINTER(aTextLength); @@ -2583,7 +2583,7 @@ nsGfxTextControlFrame2::GetTextLength(PRInt32* aTextLength) NS_IMETHODIMP -nsGfxTextControlFrame2::GetFirstTextNode(nsIDOMCharacterData* *aFirstTextNode) +nsTextControlFrame::GetFirstTextNode(nsIDOMCharacterData* *aFirstTextNode) { if (!mEditor) return NS_ERROR_NOT_INITIALIZED; @@ -2621,7 +2621,7 @@ nsGfxTextControlFrame2::GetFirstTextNode(nsIDOMCharacterData* *aFirstTextNode) nsresult -nsGfxTextControlFrame2::SelectAllContents() +nsTextControlFrame::SelectAllContents() { nsresult rv; @@ -2643,7 +2643,7 @@ nsGfxTextControlFrame2::SelectAllContents() nsresult -nsGfxTextControlFrame2::SetSelectionEndPoints(PRInt32 aSelStart, PRInt32 aSelEnd) +nsTextControlFrame::SetSelectionEndPoints(PRInt32 aSelStart, PRInt32 aSelEnd) { NS_ASSERTION(IsSingleLineTextControl() || IsTextArea(), "Should only call this on a single line input"); NS_ASSERTION(mEditor, "Should have an editor here"); @@ -2744,7 +2744,7 @@ nsGfxTextControlFrame2::SetSelectionEndPoints(PRInt32 aSelStart, PRInt32 aSelEnd } NS_IMETHODIMP -nsGfxTextControlFrame2::SetSelectionRange(PRInt32 aSelStart, PRInt32 aSelEnd) +nsTextControlFrame::SetSelectionRange(PRInt32 aSelStart, PRInt32 aSelEnd) { if (!IsSingleLineTextControl()) return NS_ERROR_NOT_IMPLEMENTED; @@ -2757,7 +2757,7 @@ nsGfxTextControlFrame2::SetSelectionRange(PRInt32 aSelStart, PRInt32 aSelEnd) NS_IMETHODIMP -nsGfxTextControlFrame2::SetSelectionStart(PRInt32 aSelectionStart) +nsTextControlFrame::SetSelectionStart(PRInt32 aSelectionStart) { if (!IsSingleLineTextControl() && !IsTextArea()) return NS_ERROR_NOT_IMPLEMENTED; @@ -2769,7 +2769,7 @@ nsGfxTextControlFrame2::SetSelectionStart(PRInt32 aSelectionStart) } NS_IMETHODIMP -nsGfxTextControlFrame2::SetSelectionEnd(PRInt32 aSelectionEnd) +nsTextControlFrame::SetSelectionEnd(PRInt32 aSelectionEnd) { if (!IsSingleLineTextControl() && !IsTextArea()) return NS_ERROR_NOT_IMPLEMENTED; @@ -2782,7 +2782,7 @@ nsGfxTextControlFrame2::SetSelectionEnd(PRInt32 aSelectionEnd) NS_IMETHODIMP -nsGfxTextControlFrame2::GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd) +nsTextControlFrame::GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd) { NS_ENSURE_ARG_POINTER((aSelectionStart && aSelectionEnd)); @@ -2879,7 +2879,7 @@ nsGfxTextControlFrame2::GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSe NS_IMETHODIMP -nsGfxTextControlFrame2::GetSelectionContr(nsISelectionController **aSelCon) +nsTextControlFrame::GetSelectionContr(nsISelectionController **aSelCon) { NS_ENSURE_ARG_POINTER(aSelCon); NS_IF_ADDREF(*aSelCon = mSelCon); @@ -2891,7 +2891,7 @@ nsGfxTextControlFrame2::GetSelectionContr(nsISelectionController **aSelCon) ////NSIFRAME NS_IMETHODIMP -nsGfxTextControlFrame2::AttributeChanged(nsIPresContext* aPresContext, +nsTextControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, @@ -2999,7 +2999,7 @@ nsGfxTextControlFrame2::AttributeChanged(nsIPresContext* aPresContext, NS_IMETHODIMP -nsGfxTextControlFrame2::GetText(nsString* aText) +nsTextControlFrame::GetText(nsString* aText) { nsresult rv = NS_CONTENT_ATTR_NOT_THERE; PRInt32 type; @@ -3027,7 +3027,7 @@ nsGfxTextControlFrame2::GetText(nsString* aText) ///END NSIFRAME OVERLOADS /////BEGIN PROTECTED METHODS -void nsGfxTextControlFrame2::RemoveNewlines(nsString &aString) +void nsTextControlFrame::RemoveNewlines(nsString &aString) { // strip CR/LF and null static const char badChars[] = {10, 13, 0}; @@ -3036,7 +3036,7 @@ void nsGfxTextControlFrame2::RemoveNewlines(nsString &aString) nsresult -nsGfxTextControlFrame2::GetMaxLength(PRInt32* aSize) +nsTextControlFrame::GetMaxLength(PRInt32* aSize) { *aSize = -1; nsresult rv = NS_CONTENT_ATTR_NOT_THERE; @@ -3054,7 +3054,7 @@ nsGfxTextControlFrame2::GetMaxLength(PRInt32* aSize) } nsresult -nsGfxTextControlFrame2::DoesAttributeExist(nsIAtom *aAtt) +nsTextControlFrame::DoesAttributeExist(nsIAtom *aAtt) { nsresult rv = NS_CONTENT_ATTR_NOT_THERE; @@ -3069,7 +3069,7 @@ nsGfxTextControlFrame2::DoesAttributeExist(nsIAtom *aAtt) // this is where we propagate a content changed event NS_IMETHODIMP -nsGfxTextControlFrame2::InternalContentChanged() +nsTextControlFrame::InternalContentChanged() { NS_PRECONDITION(mContent, "illegal to call unless we map to a content node"); @@ -3099,13 +3099,13 @@ nsGfxTextControlFrame2::InternalContentChanged() } nsresult -nsGfxTextControlFrame2::InitFocusedValue() +nsTextControlFrame::InitFocusedValue() { return GetText(&mFocusedValue); } NS_IMETHODIMP -nsGfxTextControlFrame2::CheckFireOnChange() +nsTextControlFrame::CheckFireOnChange() { nsString value; GetText(&value); @@ -3118,7 +3118,7 @@ nsGfxTextControlFrame2::CheckFireOnChange() } nsresult -nsGfxTextControlFrame2::FireOnChange() +nsTextControlFrame::FireOnChange() { // Dispatch th1e change event nsCOMPtr content; @@ -3151,7 +3151,7 @@ nsGfxTextControlFrame2::FireOnChange() //privates NS_IMETHODIMP -nsGfxTextControlFrame2::GetValue(nsAString& aValue, PRBool aIgnoreWrap) +nsTextControlFrame::GetValue(nsAString& aValue, PRBool aIgnoreWrap) { aValue.Truncate(); // initialize out param @@ -3205,7 +3205,7 @@ nsGfxTextControlFrame2::GetValue(nsAString& aValue, PRBool aIgnoreWrap) // END IMPLEMENTING NS_IFORMCONTROLFRAME void -nsGfxTextControlFrame2::SetValue(const nsAString& aValue) +nsTextControlFrame::SetValue(const nsAString& aValue) { if (mEditor && mUseEditor) { @@ -3283,7 +3283,7 @@ nsGfxTextControlFrame2::SetValue(const nsAString& aValue) NS_IMETHODIMP -nsGfxTextControlFrame2::SetInitialChildList(nsIPresContext* aPresContext, +nsTextControlFrame::SetInitialChildList(nsIPresContext* aPresContext, nsIAtom* aListName, nsIFrame* aChildList) { @@ -3364,7 +3364,7 @@ nsGfxTextControlFrame2::SetInitialChildList(nsIPresContext* aPresContext, PRInt32 -nsGfxTextControlFrame2::GetWidthInCharacters() const +nsTextControlFrame::GetWidthInCharacters() const { // see if there's a COL attribute, if so it wins nsCOMPtr content; @@ -3391,7 +3391,7 @@ nsGfxTextControlFrame2::GetWidthInCharacters() const } NS_IMETHODIMP -nsGfxTextControlFrame2::GetScrollableView(nsIScrollableView** aView) +nsTextControlFrame::GetScrollableView(nsIScrollableView** aView) { nsresult rv = NS_OK; *aView = mScrollableView; @@ -3410,19 +3410,19 @@ nsGfxTextControlFrame2::GetScrollableView(nsIScrollableView** aView) } PRBool -nsGfxTextControlFrame2::IsScrollable() const +nsTextControlFrame::IsScrollable() const { return !IsSingleLineTextControl(); } NS_IMETHODIMP -nsGfxTextControlFrame2::OnContentReset() +nsTextControlFrame::OnContentReset() { return NS_OK; } void -nsGfxTextControlFrame2::SetValueChanged(PRBool aValueChanged) +nsTextControlFrame::SetValueChanged(PRBool aValueChanged) { nsCOMPtr elem = do_QueryInterface(mContent); if (elem) { @@ -3431,7 +3431,7 @@ nsGfxTextControlFrame2::SetValueChanged(PRBool aValueChanged) } NS_IMETHODIMP -nsGfxTextControlFrame2::HandleEvent(nsIPresContext* aPresContext, +nsTextControlFrame::HandleEvent(nsIPresContext* aPresContext, nsGUIEvent* aEvent, nsEventStatus* aEventStatus) { diff --git a/mozilla/layout/forms/nsTextControlFrame.h b/mozilla/layout/forms/nsTextControlFrame.h index 12dbf8ed1a3..eaa334791b6 100644 --- a/mozilla/layout/forms/nsTextControlFrame.h +++ b/mozilla/layout/forms/nsTextControlFrame.h @@ -35,8 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -#ifndef nsGfxTextControlFrame2_h___ -#define nsGfxTextControlFrame2_h___ +#ifndef nsTextControlFrame_h___ +#define nsTextControlFrame_h___ #include "nsStackFrame.h" #include "nsAreaFrame.h" @@ -44,7 +44,7 @@ #include "nsIDOMMouseListener.h" #include "nsIAnonymousContentCreator.h" #include "nsIEditor.h" -#include "nsIGfxTextControlFrame.h" +#include "nsITextControlFrame.h" #include "nsFormControlHelper.h"//for the inputdimensions #include "nsHTMLValue.h" //for nsHTMLValue #include "nsIFontMetrics.h" @@ -65,15 +65,15 @@ class nsIAccessible; #endif -class nsGfxTextControlFrame2 : public nsStackFrame, +class nsTextControlFrame : public nsStackFrame, public nsIAnonymousContentCreator, - public nsIGfxTextControlFrame2, + public nsITextControlFrame, public nsIScrollableViewProvider { public: - nsGfxTextControlFrame2(nsIPresShell* aShell); - virtual ~nsGfxTextControlFrame2(); + nsTextControlFrame(nsIPresShell* aShell); + virtual ~nsTextControlFrame(); virtual void RemovedAsPrimaryFrame(nsIPresContext* aPresContext); @@ -179,7 +179,7 @@ public: NS_DECL_ISUPPORTS_INHERITED -public: //for methods who access nsGfxTextControlFrame2 directly +public: //for methods who access nsTextControlFrame directly NS_IMETHOD InternalContentChanged();//notify that we have some kind of change. /** diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 2f1e6b6c365..257eaf86fec 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -83,7 +83,7 @@ #include "nsIDOMRange.h" #include "nsITableLayout.h" //selection neccesity #include "nsITableCellLayout.h"// " -#include "nsIGfxTextControlFrame.h" +#include "nsITextControlFrame.h" #include "nsINameSpaceManager.h" #include "nsIPercentHeightObserver.h" @@ -2650,8 +2650,8 @@ nsFrame::GetSelectionController(nsIPresContext *aPresContext, nsISelectionContro nsIFrame *tmp = this; while (tmp) { - nsIGfxTextControlFrame2 *tcf; - if (NS_SUCCEEDED(tmp->QueryInterface(NS_GET_IID(nsIGfxTextControlFrame2),(void**)&tcf))) + nsITextControlFrame *tcf; + if (NS_SUCCEEDED(tmp->QueryInterface(NS_GET_IID(nsITextControlFrame),(void**)&tcf))) { return tcf->GetSelectionContr(aSelCon); } diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 27f973b6d43..f945ea78bca 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -66,7 +66,7 @@ #include "nsINodeInfo.h" #include "nsIScrollbarFrame.h" #include "nsIScrollbarMediator.h" -#include "nsIGfxTextControlFrame.h" +#include "nsITextControlFrame.h" #include "nsIDOMHTMLTextAreaElement.h" #include "nsIPrintPreviewContext.h" @@ -400,7 +400,7 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext, nsISupportsArray& aAnonymousChildren) { // The anonymous
used by never gets scrollbars. - nsCOMPtr textFrame(do_QueryInterface(mParent)); + nsCOMPtr textFrame(do_QueryInterface(mParent)); if (textFrame) { // Make sure we are not a text area. nsCOMPtr content; @@ -1312,7 +1312,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState) frame->GetStyleData(eStyleStruct_Visibility, (const nsStyleStruct*&)ourVis); if (NS_STYLE_DIRECTION_RTL == ourVis->mDirection) { - nsCOMPtr textControl( + nsCOMPtr textControl( do_QueryInterface(mOuter->mParent) ); if (textControl) { needsLayout = PR_TRUE; diff --git a/mozilla/layout/generic/nsHTMLParts.h b/mozilla/layout/generic/nsHTMLParts.h index 82d1daa11f2..0b6681544ba 100644 --- a/mozilla/layout/generic/nsHTMLParts.h +++ b/mozilla/layout/generic/nsHTMLParts.h @@ -185,7 +185,7 @@ extern nsresult NS_NewFieldSetFrame(nsIPresShell* aPresShell, nsIFrame** aResult extern nsresult NS_NewFileControlFrame(nsIPresShell* aPresShell, nsIFrame** aResult); extern nsresult NS_NewLegendFrame(nsIPresShell* aPresShell, nsIFrame** aResult); extern nsresult NS_NewNativeTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); -extern nsresult NS_NewGfxTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); +extern nsresult NS_NewTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); extern nsresult NS_NewGfxAutoTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); extern nsresult NS_NewGfxRadioControlFrame(nsIPresShell* aPresShell, nsIFrame** aResult); extern nsresult NS_NewNativeRadioControlFrame(nsIPresShell* aPresShell, nsIFrame** aResult); diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 2f1e6b6c365..257eaf86fec 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -83,7 +83,7 @@ #include "nsIDOMRange.h" #include "nsITableLayout.h" //selection neccesity #include "nsITableCellLayout.h"// " -#include "nsIGfxTextControlFrame.h" +#include "nsITextControlFrame.h" #include "nsINameSpaceManager.h" #include "nsIPercentHeightObserver.h" @@ -2650,8 +2650,8 @@ nsFrame::GetSelectionController(nsIPresContext *aPresContext, nsISelectionContro nsIFrame *tmp = this; while (tmp) { - nsIGfxTextControlFrame2 *tcf; - if (NS_SUCCEEDED(tmp->QueryInterface(NS_GET_IID(nsIGfxTextControlFrame2),(void**)&tcf))) + nsITextControlFrame *tcf; + if (NS_SUCCEEDED(tmp->QueryInterface(NS_GET_IID(nsITextControlFrame),(void**)&tcf))) { return tcf->GetSelectionContr(aSelCon); } diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp index 27f973b6d43..f945ea78bca 100644 --- a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp @@ -66,7 +66,7 @@ #include "nsINodeInfo.h" #include "nsIScrollbarFrame.h" #include "nsIScrollbarMediator.h" -#include "nsIGfxTextControlFrame.h" +#include "nsITextControlFrame.h" #include "nsIDOMHTMLTextAreaElement.h" #include "nsIPrintPreviewContext.h" @@ -400,7 +400,7 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext, nsISupportsArray& aAnonymousChildren) { // The anonymous
used by never gets scrollbars. - nsCOMPtr textFrame(do_QueryInterface(mParent)); + nsCOMPtr textFrame(do_QueryInterface(mParent)); if (textFrame) { // Make sure we are not a text area. nsCOMPtr content; @@ -1312,7 +1312,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState) frame->GetStyleData(eStyleStruct_Visibility, (const nsStyleStruct*&)ourVis); if (NS_STYLE_DIRECTION_RTL == ourVis->mDirection) { - nsCOMPtr textControl( + nsCOMPtr textControl( do_QueryInterface(mOuter->mParent) ); if (textControl) { needsLayout = PR_TRUE; diff --git a/mozilla/layout/html/base/src/nsHTMLParts.h b/mozilla/layout/html/base/src/nsHTMLParts.h index 82d1daa11f2..0b6681544ba 100644 --- a/mozilla/layout/html/base/src/nsHTMLParts.h +++ b/mozilla/layout/html/base/src/nsHTMLParts.h @@ -185,7 +185,7 @@ extern nsresult NS_NewFieldSetFrame(nsIPresShell* aPresShell, nsIFrame** aResult extern nsresult NS_NewFileControlFrame(nsIPresShell* aPresShell, nsIFrame** aResult); extern nsresult NS_NewLegendFrame(nsIPresShell* aPresShell, nsIFrame** aResult); extern nsresult NS_NewNativeTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); -extern nsresult NS_NewGfxTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); +extern nsresult NS_NewTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); extern nsresult NS_NewGfxAutoTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); extern nsresult NS_NewGfxRadioControlFrame(nsIPresShell* aPresShell, nsIFrame** aResult); extern nsresult NS_NewNativeRadioControlFrame(nsIPresShell* aPresShell, nsIFrame** aResult); diff --git a/mozilla/layout/html/forms/public/MANIFEST b/mozilla/layout/html/forms/public/MANIFEST index 5cc4fb8039c..d8e1e4f7a9d 100644 --- a/mozilla/layout/html/forms/public/MANIFEST +++ b/mozilla/layout/html/forms/public/MANIFEST @@ -10,5 +10,5 @@ nsICheckboxControlFrame.h nsIFormSubmitObserver.h nsIFormProcessor.h nsISelectControlFrame.h -nsIGfxTextControlFrame.h +nsITextControlFrame.h nsIImageControlFrame.h diff --git a/mozilla/layout/html/forms/public/Makefile.in b/mozilla/layout/html/forms/public/Makefile.in index 80a30bc81b3..0ec4a6a0975 100644 --- a/mozilla/layout/html/forms/public/Makefile.in +++ b/mozilla/layout/html/forms/public/Makefile.in @@ -38,7 +38,7 @@ EXPORTS = \ nsIFormSubmitObserver.h \ nsIFormProcessor.h \ nsISelectControlFrame.h \ - nsIGfxTextControlFrame.h \ + nsITextControlFrame.h \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/html/forms/public/makefile.win b/mozilla/layout/html/forms/public/makefile.win index 77c26be04d1..4342821387c 100644 --- a/mozilla/layout/html/forms/public/makefile.win +++ b/mozilla/layout/html/forms/public/makefile.win @@ -30,7 +30,7 @@ EXPORTS=nsIListControlFrame.h \ nsIFormSubmitObserver.h \ nsIFormProcessor.h \ nsISelectControlFrame.h \ - nsIGfxTextControlFrame.h + nsITextControlFrame.h MODULE=layout diff --git a/mozilla/layout/html/forms/public/nsIGfxTextControlFrame.h b/mozilla/layout/html/forms/public/nsIGfxTextControlFrame.h deleted file mode 100644 index 1abb35cb422..00000000000 --- a/mozilla/layout/html/forms/public/nsIGfxTextControlFrame.h +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsIFormControlFrame.h" - -class nsIEditor; -class nsIDocShell; -class nsISelectionController; - -#define NS_IGFXTEXTCONTROLFRAME2_IID \ -{/* A744CFC9-2DA8-416d-A058-ADB1D4B3B534*/ \ -0xa744cfc9, 0x2da8, 0x416d, \ -{ 0xa0, 0x58, 0xad, 0xb1, 0xd4, 0xb3, 0xb5, 0x34 } } - -class nsIGfxTextControlFrame2 : public nsIFormControlFrame -{ -public: - NS_DEFINE_STATIC_IID_ACCESSOR(NS_IGFXTEXTCONTROLFRAME2_IID) - - NS_IMETHOD GetEditor(nsIEditor **aEditor) = 0; - - /** - * Tell whether the frame currently owns the value or the content does (for - * edge cases where the frame has just been created or is just going away). - * - * @param aOwnsValue whether the frame owns the value [out] - */ - NS_IMETHOD OwnsValue(PRBool* aOwnsValue) = 0; - - /** - * Get the current value, either from the editor or from the textarea. - * - * @param aValue the value [out] - * @param aIgnoreWrap whether to ignore the wrap attribute when getting the - * value. If this is true, linebreaks will not be inserted even if - * wrap=hard. - */ - NS_IMETHOD GetValue(nsAString& aValue, PRBool aIgnoreWrap) = 0; - - NS_IMETHOD GetTextLength(PRInt32* aTextLength) = 0; - - /** - * Fire onChange if the value has changed since it was focused or since it - * was last fired. - */ - NS_IMETHOD CheckFireOnChange() = 0; - NS_IMETHOD SetSelectionStart(PRInt32 aSelectionStart) = 0; - NS_IMETHOD SetSelectionEnd(PRInt32 aSelectionEnd) = 0; - - NS_IMETHOD SetSelectionRange(PRInt32 aSelectionStart, PRInt32 aSelectionEnd) = 0; - NS_IMETHOD GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd) = 0; - - NS_IMETHOD GetSelectionContr(nsISelectionController **aSelCon) = 0; -}; diff --git a/mozilla/layout/html/forms/public/nsITextControlFrame.h b/mozilla/layout/html/forms/public/nsITextControlFrame.h index 1abb35cb422..06c84f3b4a2 100644 --- a/mozilla/layout/html/forms/public/nsITextControlFrame.h +++ b/mozilla/layout/html/forms/public/nsITextControlFrame.h @@ -46,7 +46,7 @@ class nsISelectionController; 0xa744cfc9, 0x2da8, 0x416d, \ { 0xa0, 0x58, 0xad, 0xb1, 0xd4, 0xb3, 0xb5, 0x34 } } -class nsIGfxTextControlFrame2 : public nsIFormControlFrame +class nsITextControlFrame : public nsIFormControlFrame { public: NS_DEFINE_STATIC_IID_ACCESSOR(NS_IGFXTEXTCONTROLFRAME2_IID) diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in index 8272ff2ef25..f6f4d9e31f5 100644 --- a/mozilla/layout/html/forms/src/Makefile.in +++ b/mozilla/layout/html/forms/src/Makefile.in @@ -63,7 +63,7 @@ CPPSRCS = \ nsGfxButtonControlFrame.cpp \ nsGfxCheckboxControlFrame.cpp \ nsGfxRadioControlFrame.cpp \ - nsGfxTextControlFrame2.cpp \ + nsTextControlFrame.cpp \ nsHTMLButtonControlFrame.cpp \ nsImageControlFrame.cpp \ nsLegendFrame.cpp \ diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win index 19eeb11bbd7..d2701543993 100644 --- a/mozilla/layout/html/forms/src/makefile.win +++ b/mozilla/layout/html/forms/src/makefile.win @@ -57,7 +57,7 @@ CPP_OBJS= \ .\$(OBJDIR)\nsListControlFrame.obj \ .\$(OBJDIR)\nsFormControlFrame.obj \ .\$(OBJDIR)\nsFileControlFrame.obj \ - .\$(OBJDIR)\nsGfxTextControlFrame2.obj \ + .\$(OBJDIR)\nsTextControlFrame.obj \ .\$(OBJDIR)\nsFieldSetFrame.obj \ .\$(OBJDIR)\nsLegendFrame.obj \ .\$(OBJDIR)\nsHTMLButtonControlFrame.obj \ diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.h b/mozilla/layout/html/forms/src/nsFileControlFrame.h index 09164385eb4..007ef943473 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.h +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.h @@ -45,9 +45,9 @@ #include "nsCOMPtr.h" #include "nsIHTMLContent.h" -#include "nsGfxTextControlFrame2.h" +#include "nsTextControlFrame.h" #include "nsFormControlHelper.h" -typedef nsGfxTextControlFrame2 nsNewFrame; +typedef nsTextControlFrame nsNewFrame; class nsIPresState; class nsISupportsArray; diff --git a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp index 6dfb2a107b1..f27bb1c6887 100644 --- a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp @@ -450,7 +450,7 @@ nsFormControlHelper::CalculateSize (nsIPresContext* aPresContext, // need to set charWidth and aDesiredSize.height charWidth = GetTextSize(aPresContext, aFrame, 1, aDesiredSize, aRendContext); col = (col <= 0) ? 15 : col; // XXX why a default of 15 pixels, why hide it - // XXX this conflicts with a default of 20 found in nsGfxTextControlFrame. + // XXX this conflicts with a default of 20 found in nsTextControlFrame. aDesiredSize.width = NSIntPixelsToTwips(col, p2t); } else { col = (col <= 0) ? 1 : col; // XXX why a default of 1 char, why hide it diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp deleted file mode 100644 index 0eed3a33031..00000000000 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp +++ /dev/null @@ -1,3451 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Blake Ross - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -#include "nsCOMPtr.h" -#include "nsGfxTextControlFrame2.h" -#include "nsIDocument.h" -#include "nsIDOMNSHTMLTextAreaElement.h" -#include "nsIDOMNSHTMLInputElement.h" -#include "nsIFormControl.h" -#include "nsIServiceManager.h" -#include "nsIFrameSelection.h" -#include "nsIPlaintextEditor.h" -#include "nsEditorCID.h" -#include "nsLayoutCID.h" -#include "nsFormControlHelper.h" -#include "nsIDocumentEncoder.h" -#include "nsICaret.h" -#include "nsISelectionListener.h" -#include "nsISelectionPrivate.h" -#include "nsIController.h" -#include "nsIControllers.h" -#include "nsIEditorController.h" -#include "nsIElementFactory.h" -#include "nsIHTMLContent.h" -#include "nsIEditorIMESupport.h" -#include "nsIEditorObserver.h" -#include "nsIDOMHTMLTextAreaElement.h" -#include "nsINameSpaceManager.h" -#include "nsINodeInfo.h" -#include "nsIScrollableView.h" -#include "nsIScrollableFrame.h" //to turn off scroll bars -#include "nsFormControlFrame.h" //for registering accesskeys -#include "nsIDeviceContext.h" // to measure fonts -#include "nsIPresState.h" //for saving state - -#include "nsIContent.h" -#include "nsIAtom.h" -#include "nsIPresContext.h" -#ifdef USE_QI_IN_SUPPRESS_EVENT_HANDLERS -#include "nsIPrintContext.h" -#include "nsIPrintPreviewContext.h" -#endif // USE_QI_IN_SUPPRESS_EVENT_HANDLERS -#include "nsHTMLAtoms.h" -#include "nsIComponentManager.h" -#include "nsIView.h" -#include "nsIDOMHTMLInputElement.h" -#include "nsISupportsArray.h" -#include "nsIDOMElement.h" -#include "nsIDOMDocument.h" -#include "nsIPresShell.h" -#include "nsIComponentManager.h" - -#include "nsBoxLayoutState.h" -#include "nsINameSpaceManager.h" -#include "nsLayoutAtoms.h" //getframetype -//for keylistener for "return" check -#include "nsIDOMKeyListener.h" -#include "nsIDOMKeyEvent.h" -#include "nsIPrivateDOMEvent.h" -#include "nsIDOMEventReceiver.h" -#include "nsIDocument.h" //observe documents to send onchangenotifications -#include "nsIStyleSheet.h"//observe documents to send onchangenotifications -#include "nsIStyleRule.h"//observe documents to send onchangenotifications -#include "nsIDOMEventListener.h"//observe documents to send onchangenotifications -#include "nsGUIEvent.h" - -#include "nsIDOMFocusListener.h" //onchange events -#include "nsIDOMCharacterData.h" //for selection setting helper func -#include "nsIDOMNodeList.h" //for selection setting helper func -#include "nsIDOMRange.h" //for selection setting helper func -#include "nsIScriptGlobalObject.h" //needed for notify selection changed to update the menus ect. -#include "nsIDOMWindowInternal.h" //needed for notify selection changed to update the menus ect. -#include "nsITextContent.h" //needed to create initial text control content -#ifdef ACCESSIBILITY -#include "nsIAccessibilityService.h" -#endif -#include "nsIServiceManager.h" -#include "nsIDOMNode.h" -#include "nsITextControlElement.h" - -#include "nsITransactionManager.h" -#include "nsITransactionListener.h" -#include "nsIDOMText.h" //for multiline getselection - - -#ifdef IBMBIDI -#include "nsIBidiKeyboard.h" -#include "nsWidgetsCID.h" -#endif // IBMBIDI - -#define DEFAULT_COLUMN_WIDTH 20 -#define GUESS_INPUT_SIZE 150 // 10 pixels wide - -#include "nsContentCID.h" -static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID); - -static NS_DEFINE_CID(kTextEditorCID, NS_TEXTEDITOR_CID); -static NS_DEFINE_CID(kFrameSelectionCID, NS_FRAMESELECTION_CID); - -static nsresult GetElementFactoryService(nsIElementFactory **aFactory) -{ - nsresult rv(NS_OK); - static nsWeakPtr sElementFactory = getter_AddRefs( NS_GetWeakReference(nsCOMPtr(do_GetService( - NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml", &rv) ))); - if (sElementFactory) - { - nsCOMPtr fac(do_QueryReferent(sElementFactory)); - *aFactory = fac.get(); - if (!*aFactory) - rv = NS_ERROR_FAILURE; - NS_IF_ADDREF(*aFactory); - } - else - return NS_ERROR_FAILURE; - return rv; -} - - -class nsTextInputListener : public nsIDOMKeyListener, - public nsISelectionListener, - public nsIDOMFocusListener, - public nsIEditorObserver, - public nsITransactionListener, - public nsSupportsWeakReference -{ -public: - /** the default constructor - */ - nsTextInputListener(); - /** the default destructor. virtual due to the possibility of derivation. - */ - virtual ~nsTextInputListener(); - - /** SetEditor gives an address to the editor that will be accessed - * @param aEditor the editor this listener calls for editing operations - */ - void SetFrame(nsGfxTextControlFrame2 *aFrame){mFrame = aFrame;} - -/*interfaces for addref and release and queryinterface*/ - NS_DECL_ISUPPORTS - -/*BEGIN interfaces in to the keylister base interface. must be supplied to handle pure virtual interfaces - see the nsIDOMKeyListener interface implementation for details - */ - NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent); - NS_IMETHOD KeyDown(nsIDOMEvent* aKeyEvent); - NS_IMETHOD KeyUp(nsIDOMEvent* aKeyEvent); - NS_IMETHOD KeyPress(nsIDOMEvent* aKeyEvent); -/*END interfaces from nsIDOMKeyListener*/ -/*BEGIN nsISelectionListener Interface*/ - NS_IMETHOD NotifySelectionChanged(nsIDOMDocument* aDoc, nsISelection* aSel, PRInt16 aReason); -/*END nsISelectionListener*/ - -/* BEGIN EditorObserver*/ - NS_IMETHOD EditAction(); -/*END EditorObserver*/ - - /** nsIDOMFocusListener interfaces - * used to propagate focus, blur, and change notifications - * @see nsIDOMFocusListener - */ - NS_IMETHOD Focus(nsIDOMEvent* aEvent); - NS_IMETHOD Blur (nsIDOMEvent* aEvent); - /* END interfaces from nsIDOMFocusListener*/ - - - /** nsITransactionListener interfaces - */ - - NS_IMETHOD WillDo(nsITransactionManager *aManager, nsITransaction *aTransaction, PRBool *aInterrupt); - NS_IMETHOD DidDo(nsITransactionManager *aManager, nsITransaction *aTransaction, nsresult aDoResult); - NS_IMETHOD WillUndo(nsITransactionManager *aManager, nsITransaction *aTransaction, PRBool *aInterrupt); - NS_IMETHOD DidUndo(nsITransactionManager *aManager, nsITransaction *aTransaction, nsresult aUndoResult); - NS_IMETHOD WillRedo(nsITransactionManager *aManager, nsITransaction *aTransaction, PRBool *aInterrupt); - NS_IMETHOD DidRedo(nsITransactionManager *aManager, nsITransaction *aTransaction, nsresult aRedoResult); - NS_IMETHOD WillBeginBatch(nsITransactionManager *aManager, PRBool *aInterrupt); - NS_IMETHOD DidBeginBatch(nsITransactionManager *aManager, nsresult aResult); - NS_IMETHOD WillEndBatch(nsITransactionManager *aManager, PRBool *aInterrupt); - NS_IMETHOD DidEndBatch(nsITransactionManager *aManager, nsresult aResult); - NS_IMETHOD WillMerge(nsITransactionManager *aManager, nsITransaction *aTopTransaction, - nsITransaction *aTransactionToMerge, PRBool *aInterrupt); - NS_IMETHOD DidMerge(nsITransactionManager *aManager, nsITransaction *aTopTransaction, - nsITransaction *aTransactionToMerge, - PRBool aDidMerge, nsresult aMergeResult); - - -protected: - - nsresult UpdateTextInputCommands(const nsAString& commandsToUpdate); - -protected: - - nsGfxTextControlFrame2* mFrame; // weak reference - - PRPackedBool mSelectionWasCollapsed; - PRPackedBool mKnowSelectionCollapsed; - - PRPackedBool mFirstDoOfFirstUndo; -}; - - -/* - * nsTextEditorListener implementation - */ - -NS_IMPL_ADDREF(nsTextInputListener) - -NS_IMPL_RELEASE(nsTextInputListener) - - -nsTextInputListener::nsTextInputListener() -: mFrame(nsnull) -, mSelectionWasCollapsed(PR_TRUE) -, mKnowSelectionCollapsed(PR_FALSE) -, mFirstDoOfFirstUndo(PR_TRUE) -{ - NS_INIT_REFCNT(); -} - - - -nsTextInputListener::~nsTextInputListener() -{ -} - - -NS_IMPL_QUERY_INTERFACE6(nsTextInputListener, - nsIDOMKeyListener, - nsISelectionListener, - nsIDOMFocusListener, - nsIEditorObserver, - nsITransactionListener, - nsISupportsWeakReference) - -nsresult -nsTextInputListener::HandleEvent(nsIDOMEvent* aEvent) -{ - return NS_OK; -} - -// individual key handlers return NS_OK to indicate NOT consumed -// by default, an error is returned indicating event is consumed -// joki is fixing this interface. -nsresult -nsTextInputListener::KeyDown(nsIDOMEvent* aKeyEvent) -{ - return NS_OK; -} - - -nsresult -nsTextInputListener::KeyUp(nsIDOMEvent* aKeyEvent) -{ - return NS_OK; -} - - -nsresult -nsTextInputListener::KeyPress(nsIDOMEvent* aKeyEvent) -{ - if (!mFrame) - return NS_OK; - nsCOMPtrkeyEvent; - keyEvent = do_QueryInterface(aKeyEvent); - if (!keyEvent) - { - //non-key event passed to keydown. bad things. - return NS_OK; - } - - nsCOMPtr privateEvent = do_QueryInterface(aKeyEvent); - if(privateEvent) - { - PRBool dispatchStopped; - privateEvent->IsDispatchStopped(&dispatchStopped); - if(dispatchStopped) - return NS_OK; - } - - mFrame->SetValueChanged(PR_TRUE); - - return NS_OK; -} - -//END KeyListener - -//BEGIN NS_IDOMSELECTIONLISTENER - -NS_IMETHODIMP -nsTextInputListener::NotifySelectionChanged(nsIDOMDocument* aDoc, nsISelection* aSel, PRInt16 aReason) -{ - PRBool collapsed; - if (!mFrame || !aDoc || !aSel || NS_FAILED(aSel->GetIsCollapsed(&collapsed))) - return NS_OK; - - // Fire the select event - // The specs don't exactly say when we should fire the select event. - // IE: Whenever you add/remove a character to/from the selection. Also - // each time for select all. Also if you get to the end of the text - // field you will get new event for each keypress or a continuous - // stream of events if you use the mouse. IE will fire select event - // when the selection collapses to nothing if you are holding down - // the shift or mouse button. - // Mozilla: If we have non-empty selection we will fire a new event for each - // keypress (or mouseup) if the selection changed. Mozilla will also - // create the event each time select all is called, even if everything - // was previously selected, becase technically select all will first collapse - // and then extend. Mozilla will never create an event if the selection - // collapses to nothing. - if (!collapsed && (aReason & (nsISelectionListener::MOUSEUP_REASON | - nsISelectionListener::KEYPRESS_REASON | - nsISelectionListener::SELECTALL_REASON))) - { - nsCOMPtr content; - mFrame->GetFormContent(*getter_AddRefs(content)); - if (content) - { - nsCOMPtr doc; - if (NS_SUCCEEDED(content->GetDocument(*getter_AddRefs(doc)))) - { - if (doc) - { - nsCOMPtr presShell; - doc->GetShellAt(0, getter_AddRefs(presShell)); - if (presShell) - { - nsEventStatus status = nsEventStatus_eIgnore; - nsEvent event; - event.eventStructType = NS_EVENT; - event.message = NS_FORM_SELECTED; - - presShell->HandleEventWithTarget(&event,mFrame,content,NS_EVENT_FLAG_INIT,&status); - } - } - } - } - } - - // if the collapsed state did not change, don't fire notifications - if (mKnowSelectionCollapsed && collapsed == mSelectionWasCollapsed) - return NS_OK; - - mSelectionWasCollapsed = collapsed; - mKnowSelectionCollapsed = PR_TRUE; - - return UpdateTextInputCommands(NS_LITERAL_STRING("select")); -} - -//EDITOR INTERFACE - -NS_IMETHODIMP nsTextInputListener::EditAction() -{ - return mFrame?mFrame->InternalContentChanged():NS_ERROR_NULL_POINTER; -} - -//END NS_IDOMSELECTIONLISTENER -//focuslistener - -nsresult -nsTextInputListener::Focus(nsIDOMEvent* aEvent) -{ - if (!mFrame) return NS_OK; - nsCOMPtr editor; - mFrame->GetEditor(getter_AddRefs(editor)); - if (editor) { - editor->AddEditorObserver(this); - } - - return mFrame->InitFocusedValue(); -} - -nsresult -nsTextInputListener::Blur(nsIDOMEvent* aEvent) -{ - if (!mFrame) - return NS_OK; - - nsCOMPtr editor; - mFrame->GetEditor(getter_AddRefs(editor)); - if (editor) { - editor->RemoveEditorObserver(this); - } - - return mFrame->CheckFireOnChange(); -} -//END focuslistener - - -NS_IMETHODIMP nsTextInputListener::WillDo(nsITransactionManager *aManager, - nsITransaction *aTransaction, PRBool *aInterrupt) -{ - *aInterrupt = PR_FALSE; - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::DidDo(nsITransactionManager *aManager, - nsITransaction *aTransaction, nsresult aDoResult) -{ - // we only need to update if the undo count is now 1 - PRInt32 undoCount; - aManager->GetNumberOfUndoItems(&undoCount); - if (undoCount == 1) - { - if (mFirstDoOfFirstUndo) - UpdateTextInputCommands(NS_LITERAL_STRING("undo")); - - mFirstDoOfFirstUndo = PR_FALSE; - } - - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::WillUndo(nsITransactionManager *aManager, - nsITransaction *aTransaction, PRBool *aInterrupt) -{ - *aInterrupt = PR_FALSE; - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::DidUndo(nsITransactionManager *aManager, - nsITransaction *aTransaction, nsresult aUndoResult) -{ - PRInt32 undoCount; - aManager->GetNumberOfUndoItems(&undoCount); - if (undoCount == 0) - mFirstDoOfFirstUndo = PR_TRUE; // reset the state for the next do - - UpdateTextInputCommands(NS_LITERAL_STRING("undo")); - - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::WillRedo(nsITransactionManager *aManager, - nsITransaction *aTransaction, PRBool *aInterrupt) -{ - *aInterrupt = PR_FALSE; - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::DidRedo(nsITransactionManager *aManager, - nsITransaction *aTransaction, nsresult aRedoResult) -{ - UpdateTextInputCommands(NS_LITERAL_STRING("undo")); - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::WillBeginBatch(nsITransactionManager *aManager, PRBool *aInterrupt) -{ - *aInterrupt = PR_FALSE; - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::DidBeginBatch(nsITransactionManager *aManager, nsresult aResult) -{ - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::WillEndBatch(nsITransactionManager *aManager, PRBool *aInterrupt) -{ - *aInterrupt = PR_FALSE; - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::DidEndBatch(nsITransactionManager *aManager, nsresult aResult) -{ - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::WillMerge(nsITransactionManager *aManager, - nsITransaction *aTopTransaction, nsITransaction *aTransactionToMerge, PRBool *aInterrupt) -{ - *aInterrupt = PR_FALSE; - return NS_OK; -} - -NS_IMETHODIMP nsTextInputListener::DidMerge(nsITransactionManager *aManager, - nsITransaction *aTopTransaction, nsITransaction *aTransactionToMerge, - PRBool aDidMerge, nsresult aMergeResult) -{ - return NS_OK; -} - - - -nsresult nsTextInputListener::UpdateTextInputCommands(const nsAString& commandsToUpdate) -{ - if (!mFrame) return NS_ERROR_NOT_INITIALIZED; - - nsCOMPtr content; - nsresult rv = mFrame->GetContent(getter_AddRefs(content)); - if (NS_FAILED(rv)) - return rv; - if (!content) - return NS_ERROR_FAILURE; - - nsCOMPtr doc; - rv = content->GetDocument(*getter_AddRefs(doc)); - if (NS_FAILED(rv)) - return rv; - if (!doc) - return NS_ERROR_FAILURE; - - nsCOMPtr scriptGlobalObject; - rv = doc->GetScriptGlobalObject(getter_AddRefs(scriptGlobalObject)); - if (NS_FAILED(rv)) - return rv; - if (!scriptGlobalObject) - return NS_ERROR_FAILURE; - - nsCOMPtr domWindow = do_QueryInterface(scriptGlobalObject, &rv); - if (NS_FAILED(rv)) - return rv; - if (!domWindow) - return NS_ERROR_FAILURE; - - return domWindow->UpdateCommands(commandsToUpdate); -} - - -//END NSTEXTINPUTLISTENER - -#ifdef XP_MAC -#pragma mark - -#endif - -class nsTextInputSelectionImpl : public nsSupportsWeakReference, public nsISelectionController, public nsIFrameSelection -{ -public: - NS_DECL_ISUPPORTS - - nsTextInputSelectionImpl(nsIFrameSelection *aSel, nsIPresShell *aShell, nsIContent *aLimiter); - ~nsTextInputSelectionImpl(){} - - - //NSISELECTIONCONTROLLER INTERFACES - NS_IMETHOD SetDisplaySelection(PRInt16 toggle); - NS_IMETHOD GetDisplaySelection(PRInt16 *_retval); - NS_IMETHOD SetSelectionFlags(PRInt16 aInEnable); - NS_IMETHOD GetSelectionFlags(PRInt16 *aOutEnable); - NS_IMETHOD GetSelection(PRInt16 type, nsISelection **_retval); - NS_IMETHOD ScrollSelectionIntoView(PRInt16 aType, PRInt16 aRegion, PRBool aIsSynchronous); - NS_IMETHOD RepaintSelection(PRInt16 type); - NS_IMETHOD RepaintSelection(nsIPresContext* aPresContext, SelectionType aSelectionType); - NS_IMETHOD SetCaretEnabled(PRBool enabled); - NS_IMETHOD SetCaretWidth(PRInt16 twips); - NS_IMETHOD SetCaretReadOnly(PRBool aReadOnly); - NS_IMETHOD GetCaretEnabled(PRBool *_retval); - NS_IMETHOD CharacterMove(PRBool aForward, PRBool aExtend); - NS_IMETHOD WordMove(PRBool aForward, PRBool aExtend); - NS_IMETHOD LineMove(PRBool aForward, PRBool aExtend); - NS_IMETHOD IntraLineMove(PRBool aForward, PRBool aExtend); - NS_IMETHOD PageMove(PRBool aForward, PRBool aExtend); - NS_IMETHOD CompleteScroll(PRBool aForward); - NS_IMETHOD CompleteMove(PRBool aForward, PRBool aExtend); - NS_IMETHOD ScrollPage(PRBool aForward); - NS_IMETHOD ScrollLine(PRBool aForward); - NS_IMETHOD ScrollHorizontal(PRBool aLeft); - NS_IMETHOD SelectAll(void); - NS_IMETHOD CheckVisibility(nsIDOMNode *node, PRInt16 startOffset, PRInt16 EndOffset, PRBool *_retval); - - // NSIFRAMESELECTION INTERFACES - NS_IMETHOD Init(nsIFocusTracker *aTracker, nsIContent *aLimiter) ; - NS_IMETHOD ShutDown() ; - NS_IMETHOD HandleTextEvent(nsGUIEvent *aGuiEvent) ; - NS_IMETHOD HandleKeyEvent(nsIPresContext* aPresContext, nsGUIEvent *aGuiEvent); - NS_IMETHOD HandleClick(nsIContent *aNewFocus, PRUint32 aContentOffset, PRUint32 aContentEndOffset , - PRBool aContinueSelection, PRBool aMultipleSelection, PRBool aHint); - NS_IMETHOD HandleDrag(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint); - NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent); - NS_IMETHOD StartAutoScrollTimer(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint, PRUint32 aDelay); - NS_IMETHOD StopAutoScrollTimer(); - NS_IMETHOD EnableFrameNotification(PRBool aEnable); - NS_IMETHOD LookUpSelection(nsIContent *aContent, PRInt32 aContentOffset, PRInt32 aContentLength, - SelectionDetails **aReturnDetails, PRBool aSlowCheck); - NS_IMETHOD SetMouseDownState(PRBool aState); - NS_IMETHOD GetMouseDownState(PRBool *aState); - NS_IMETHOD SetDelayCaretOverExistingSelection(PRBool aDelay); - NS_IMETHOD GetDelayCaretOverExistingSelection(PRBool *aDelay); - NS_IMETHOD SetDelayedCaretData(nsMouseEvent *aMouseEvent); - NS_IMETHOD GetDelayedCaretData(nsMouseEvent **aMouseEvent); - NS_IMETHOD GetLimiter(nsIContent **aLimiterContent); - NS_IMETHOD GetTableCellSelection(PRBool *aState); - NS_IMETHOD GetFrameForNodeOffset(nsIContent *aNode, PRInt32 aOffset, HINT aHint, nsIFrame **aReturnFrame, PRInt32 *aReturnOffset); - NS_IMETHOD AdjustOffsetsFromStyle(nsIFrame *aFrame, PRBool *changeSelection, - nsIContent** outContent, PRInt32* outStartOffset, PRInt32* outEndOffset); - NS_IMETHOD GetHint(nsIFrameSelection::HINT *aHint); - NS_IMETHOD SetHint(nsIFrameSelection::HINT aHint); - NS_IMETHOD SetScrollableView(nsIScrollableView *aScrollableView); - NS_IMETHOD GetScrollableView(nsIScrollableView **aScrollableView); -#ifdef IBMBIDI - NS_IMETHOD GetPrevNextBidiLevels(nsIPresContext *aPresContext, - nsIContent *aNode, - PRUint32 aContentOffset, - nsIFrame **aPrevFrame, - nsIFrame **aNextFrame, - PRUint8 *aPrevLevel, - PRUint8 *aNextLevel); - NS_IMETHOD GetFrameFromLevel(nsIPresContext *aPresContext, - nsIFrame *aFrameIn, - nsDirection aDirection, - PRUint8 aBidiLevel, - nsIFrame **aFrameOut); -#endif - //END INTERFACES - - - nsWeakPtr &GetPresShell(){return mPresShellWeak;} -private: - nsCOMPtr mFrameSelection; - nsCOMPtr mLimiter; - nsWeakPtr mPresShellWeak; -#ifdef IBMBIDI - nsCOMPtr mBidiKeyboard; -#endif -}; - -// Implement our nsISupports methods -NS_IMPL_ISUPPORTS3(nsTextInputSelectionImpl, nsISelectionController, nsISupportsWeakReference, nsIFrameSelection) - - -// BEGIN nsTextInputSelectionImpl - -nsTextInputSelectionImpl::nsTextInputSelectionImpl(nsIFrameSelection *aSel, nsIPresShell *aShell, nsIContent *aLimiter) -{ - NS_INIT_REFCNT(); - if (aSel && aShell) - { - mFrameSelection = aSel;//we are the owner now! - nsCOMPtr tracker = do_QueryInterface(aShell); - mLimiter = aLimiter; - mFrameSelection->Init(tracker, mLimiter); - mPresShellWeak = getter_AddRefs( NS_GetWeakReference(aShell) ); -#ifdef IBMBIDI - mBidiKeyboard = do_GetService("@mozilla.org/widget/bidikeyboard;1"); -#endif - } -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::SetDisplaySelection(PRInt16 aToggle) -{ - if (mFrameSelection) - return mFrameSelection->SetDisplaySelection(aToggle); - return NS_ERROR_NULL_POINTER; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetDisplaySelection(PRInt16 *aToggle) -{ - if (mFrameSelection) - return mFrameSelection->GetDisplaySelection(aToggle); - return NS_ERROR_NULL_POINTER; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::SetSelectionFlags(PRInt16 aToggle) -{ - return NS_OK;//stub this out. not used in input -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetSelectionFlags(PRInt16 *aOutEnable) -{ - *aOutEnable = nsISelectionDisplay::DISPLAY_TEXT; - return NS_OK; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetSelection(PRInt16 type, nsISelection **_retval) -{ - if (mFrameSelection) - return mFrameSelection->GetSelection(type, _retval); - return NS_ERROR_NULL_POINTER; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::ScrollSelectionIntoView(PRInt16 aType, PRInt16 aRegion, PRBool aIsSynchronous) -{ - if (mFrameSelection) - return mFrameSelection->ScrollSelectionIntoView(aType, aRegion, aIsSynchronous); - return NS_ERROR_NULL_POINTER; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::RepaintSelection(PRInt16 type) -{ - if (!mPresShellWeak) return NS_ERROR_NOT_INITIALIZED; - nsCOMPtr presShell = do_QueryReferent(mPresShellWeak); - if (presShell) - { - nsCOMPtr context; - if (NS_SUCCEEDED(presShell->GetPresContext(getter_AddRefs(context))) && context) - { - return mFrameSelection->RepaintSelection(context, type); - } - } - return NS_ERROR_FAILURE; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::RepaintSelection(nsIPresContext* aPresContext, SelectionType aSelectionType) -{ - return RepaintSelection(aSelectionType); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::SetCaretEnabled(PRBool enabled) -{ - if (!mPresShellWeak) return NS_ERROR_NOT_INITIALIZED; - - nsCOMPtr shell = do_QueryReferent(mPresShellWeak); - if (!shell) return NS_ERROR_FAILURE; - - // first, tell the caret which selection to use - nsCOMPtr domSel; - GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(domSel)); - if (!domSel) return NS_ERROR_FAILURE; - - nsCOMPtr caret; - shell->GetCaret(getter_AddRefs(caret)); - if (!caret) return NS_OK; - caret->SetCaretDOMSelection(domSel); - - // tell the pres shell to enable the caret, rather than settings its visibility directly. - // this way the presShell's idea of caret visibility is maintained. - nsCOMPtr selCon = do_QueryInterface(shell); - if (!selCon) return NS_ERROR_NO_INTERFACE; - selCon->SetCaretEnabled(enabled); - - return NS_OK; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::SetCaretWidth(PRInt16 pixels) -{ - if (!mPresShellWeak) return NS_ERROR_NOT_INITIALIZED; - nsresult result; - nsCOMPtr shell = do_QueryReferent(mPresShellWeak, &result); - if (shell) - { - nsCOMPtr caret; - if (NS_SUCCEEDED(result = shell->GetCaret(getter_AddRefs(caret)))) - { - return caret->SetCaretWidth(pixels); - } - } - return NS_ERROR_FAILURE; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::SetCaretReadOnly(PRBool aReadOnly) -{ - if (!mPresShellWeak) return NS_ERROR_NOT_INITIALIZED; - nsresult result; - nsCOMPtr shell = do_QueryReferent(mPresShellWeak, &result); - if (shell) - { - nsCOMPtr caret; - if (NS_SUCCEEDED(result = shell->GetCaret(getter_AddRefs(caret)))) - { - nsCOMPtr domSel; - if (NS_SUCCEEDED(result = mFrameSelection->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(domSel)))) - { - return caret->SetCaretReadOnly(aReadOnly); - } - } - - } - return NS_ERROR_FAILURE; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetCaretEnabled(PRBool *_retval) -{ - if (!mPresShellWeak) return NS_ERROR_NOT_INITIALIZED; - nsresult result; - nsCOMPtr shell = do_QueryReferent(mPresShellWeak, &result); - if (shell) - { - nsCOMPtr caret; - if (NS_SUCCEEDED(result = shell->GetCaret(getter_AddRefs(caret)))) - { - nsCOMPtr domSel; - if (NS_SUCCEEDED(result = mFrameSelection->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(domSel)))) - { - return caret->GetCaretVisible(_retval); - } - } - - } - return NS_ERROR_FAILURE; -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::CharacterMove(PRBool aForward, PRBool aExtend) -{ - if (mFrameSelection) - return mFrameSelection->CharacterMove(aForward, aExtend); - return NS_ERROR_NULL_POINTER; -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::WordMove(PRBool aForward, PRBool aExtend) -{ - if (mFrameSelection) - return mFrameSelection->WordMove(aForward, aExtend); - return NS_ERROR_NULL_POINTER; -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::LineMove(PRBool aForward, PRBool aExtend) -{ - if (mFrameSelection) - { - nsresult result = mFrameSelection->LineMove(aForward, aExtend); - if (NS_FAILED(result)) - result = CompleteMove(aForward,aExtend); - return result; - } - return NS_ERROR_NULL_POINTER; -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::IntraLineMove(PRBool aForward, PRBool aExtend) -{ - if (mFrameSelection) - return mFrameSelection->IntraLineMove(aForward, aExtend); - return NS_ERROR_NULL_POINTER; -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::PageMove(PRBool aForward, PRBool aExtend) -{ -#if XXXXX_WORK_TO_BE_COMPLETED_XXXXX - // XXX: this code needs to be finished or rewritten - // expected bahavior for PageMove is to scroll AND move the caret - nsIScrollableView *scrollableView; - nsresult result; - nscoord containerHeight, containerWidth, lineHeight; - nsPoint oldLocation; - - result = GetScrollableView(&scrollableView); - if (NS_FAILED(result)) - return result; - if (!scrollableView) - return NS_ERROR_NOT_INITIALIZED; - - // find out where we are; determine amount to page up/down - result = scrollableView->GetScrollPosition(oldLocation.x, oldLocation.y); - if (NS_FAILED(result)) - return result; - - result = scrollableView->GetLineHeight(&lineHeight); - if (NS_FAILED(result)) - return result; - - result = scrollableView->GetContainerSize(&containerWidth, &containerHeight); - if (NS_SUCCEEDED(result)) - { - // scroll this amount backwards - if (!aForward) - containerHeight = 0 - containerHeight; - - nsPoint desiredLocation(oldLocation.x, oldLocation.y + containerHeight - lineHeight); - result = scrollableView->ScrollTo(desiredLocation.x, desiredLocation.y, NS_VMREFRESH_NO_SYNC); - - // grab the parent / root DIV for this text widget - nsCOMPtr parentDIV; - result = GetLimiter(getter_AddRefs(parentDIV)); - if (NS_FAILED(result)) - return result; - if (!parentDIV) - return NS_ERROR_UNEXPECTED; - - // now we know how much to move up/down, we need to look into the content and - // figure out where that coordinate is and then place the caret at that location - nsCOMPtr content; - result = frame->GetContentAndOffsetsFromPoint(presContext, desiredLocation, getter_AddRefs(content), startOffset, endOffset, beginFrameContent); - result = GetFrameForNodeOffset(content, PRInt32 aOffset, HINT aHint, nsIFrame **aReturnFrame, PRInt32 *aReturnOffset) - } - - return result; -#else - return ScrollPage(aForward); -#endif -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::CompleteScroll(PRBool aForward) -{ - nsIScrollableView *scrollableView; - nsresult result; - result = GetScrollableView(&scrollableView); - if (NS_FAILED(result)) - return result; - if (!scrollableView) - return NS_ERROR_NOT_INITIALIZED; - - return scrollableView->ScrollByWhole(!aForward); //TRUE = top, aForward TRUE=bottom -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::CompleteMove(PRBool aForward, PRBool aExtend) -{ - // grab the parent / root DIV for this text widget - nsresult result; - nsCOMPtr parentDIV; - result = GetLimiter(getter_AddRefs(parentDIV)); - if (NS_FAILED(result)) - return result; - if (!parentDIV) - return NS_ERROR_UNEXPECTED; - - // make the caret be either at the very beginning (0) or the very end - PRInt32 offset = 0; - HINT hint = HINTLEFT; - if (aForward) - { - parentDIV->ChildCount(offset); - - // Prevent the caret from being placed after the last - // BR node in the content tree! - - if (offset > 0) - { - nsCOMPtr child; - result = parentDIV->ChildAt(offset - 1, *getter_AddRefs(child)); - if (NS_SUCCEEDED(result) && child) - { - nsCOMPtr tagName; - result = child->GetTag(*getter_AddRefs(tagName)); - if (NS_SUCCEEDED(result) && tagName.get() == nsHTMLAtoms::br) - { - --offset; - hint = HINTRIGHT; // for Bug 106855 - } - } - } - } - - result = mFrameSelection->HandleClick(parentDIV, offset, offset, aExtend, PR_FALSE, hint); - - // if we got this far, attempt to scroll no matter what the above result is - return CompleteScroll(aForward); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::ScrollPage(PRBool aForward) -{ - nsIScrollableView *scrollableView; - nsresult result; - result = GetScrollableView(&scrollableView); - if (NS_FAILED(result)) - return result; - if (!scrollableView) - return NS_ERROR_NOT_INITIALIZED; - - return scrollableView->ScrollByPages(aForward ? 1 : -1); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::ScrollLine(PRBool aForward) -{ - nsIScrollableView *scrollableView; - nsresult result; - result = GetScrollableView(&scrollableView); - if (NS_FAILED(result)) - return result; - if (!scrollableView) - return NS_ERROR_NOT_INITIALIZED; - - // will we have bug #7354 because we aren't forcing an update here? - return scrollableView->ScrollByLines(0, aForward ? 1 : -1); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::ScrollHorizontal(PRBool aLeft) -{ - nsIScrollableView *scrollableView; - nsresult result; - result = GetScrollableView(&scrollableView); - if (NS_FAILED(result)) - return result; - if (!scrollableView) - return NS_ERROR_NOT_INITIALIZED; - - // will we have bug #7354 because we aren't forcing an update here? - return scrollableView->ScrollByLines(aLeft ? -1 : 1, 0); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::SelectAll() -{ - if (mFrameSelection) - return mFrameSelection->SelectAll(); - return NS_ERROR_NULL_POINTER; -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::CheckVisibility(nsIDOMNode *node, PRInt16 startOffset, PRInt16 EndOffset, PRBool *_retval) -{ - if (!mPresShellWeak) return NS_ERROR_NOT_INITIALIZED; - nsresult result; - nsCOMPtr shell = do_QueryReferent(mPresShellWeak, &result); - if (shell) - { - return shell->CheckVisibility(node,startOffset,EndOffset, _retval); - } - return NS_ERROR_FAILURE; - -} - - -//nsTextInputSelectionImpl::FRAMESELECTIONAPIS - -NS_IMETHODIMP -nsTextInputSelectionImpl::Init(nsIFocusTracker *aTracker, nsIContent *aLimiter) -{ - return mFrameSelection->Init(aTracker, aLimiter); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::ShutDown() -{ - return mFrameSelection->ShutDown(); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::HandleTextEvent(nsGUIEvent *aGuiEvent) -{ - return mFrameSelection->HandleTextEvent(aGuiEvent); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::HandleKeyEvent(nsIPresContext* aPresContext, nsGUIEvent *aGuiEvent) -{ - return mFrameSelection->HandleKeyEvent(aPresContext, aGuiEvent); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::HandleClick(nsIContent *aNewFocus, PRUint32 aContentOffset, PRUint32 aContentEndOffset , - PRBool aContinueSelection, PRBool aMultipleSelection, PRBool aHint) -{ - return mFrameSelection->HandleClick(aNewFocus, aContentOffset, aContentEndOffset , - aContinueSelection, aMultipleSelection, aHint); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::HandleDrag(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint) -{ - return mFrameSelection->HandleDrag(aPresContext, aFrame, aPoint); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent) -{ - // We should never have a table inside a text control frame! - NS_ASSERTION(PR_TRUE, "Calling HandleTableSelection inside nsGfxTextControlFrame2!"); - return NS_OK; -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::StartAutoScrollTimer(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint, PRUint32 aDelay) -{ - return mFrameSelection->StartAutoScrollTimer(aPresContext, aFrame, aPoint, aDelay); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::StopAutoScrollTimer() -{ - return mFrameSelection->StopAutoScrollTimer(); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::EnableFrameNotification(PRBool aEnable) -{ - return mFrameSelection->EnableFrameNotification(aEnable); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::LookUpSelection(nsIContent *aContent, PRInt32 aContentOffset, PRInt32 aContentLength, - SelectionDetails **aReturnDetails, PRBool aSlowCheck) -{ - return mFrameSelection->LookUpSelection(aContent, aContentOffset, aContentLength, aReturnDetails, aSlowCheck); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::SetMouseDownState(PRBool aState) -{ - return mFrameSelection->SetMouseDownState(aState); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetMouseDownState(PRBool *aState) -{ - return mFrameSelection->GetMouseDownState(aState); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::SetDelayCaretOverExistingSelection(PRBool aDelay) -{ - return mFrameSelection->SetDelayCaretOverExistingSelection(aDelay); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetDelayCaretOverExistingSelection(PRBool *aDelay) -{ - return mFrameSelection->GetDelayCaretOverExistingSelection(aDelay); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::SetDelayedCaretData(nsMouseEvent *aMouseEvent) -{ - return mFrameSelection->SetDelayedCaretData(aMouseEvent); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetDelayedCaretData(nsMouseEvent **aMouseEvent) -{ - return mFrameSelection->GetDelayedCaretData(aMouseEvent); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetLimiter(nsIContent **aLimiterContent) -{ - return mFrameSelection->GetLimiter(aLimiterContent); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetTableCellSelection(PRBool *aState) -{ - return mFrameSelection->GetTableCellSelection(aState); -} - - -NS_IMETHODIMP -nsTextInputSelectionImpl::GetFrameForNodeOffset(nsIContent *aNode, PRInt32 aOffset, HINT aHint, nsIFrame **aReturnFrame, PRInt32 *aReturnOffset) -{ - return mFrameSelection->GetFrameForNodeOffset(aNode, aOffset, aHint,aReturnFrame,aReturnOffset); -} - -NS_IMETHODIMP -nsTextInputSelectionImpl::AdjustOffsetsFromStyle(nsIFrame *aFrame, PRBool *changeSelection, - nsIContent** outContent, PRInt32* outStartOffset, PRInt32* outEndOffset) -{ - return mFrameSelection->AdjustOffsetsFromStyle(aFrame, changeSelection, outContent, outStartOffset, outEndOffset); -} - -NS_IMETHODIMP nsTextInputSelectionImpl::GetHint(nsIFrameSelection::HINT *aHint) -{ - return mFrameSelection->GetHint(aHint); -} - -NS_IMETHODIMP nsTextInputSelectionImpl::SetHint(nsIFrameSelection::HINT aHint) -{ - return mFrameSelection->SetHint(aHint); -} - -NS_IMETHODIMP nsTextInputSelectionImpl::SetScrollableView(nsIScrollableView *aScrollableView) -{ - if(mFrameSelection) - return mFrameSelection->SetScrollableView(aScrollableView); - return NS_ERROR_FAILURE; -} - -NS_IMETHODIMP nsTextInputSelectionImpl::GetScrollableView(nsIScrollableView **aScrollableView) -{ - if(mFrameSelection) - return mFrameSelection->GetScrollableView(aScrollableView); - return NS_ERROR_FAILURE; -} - -#ifdef IBMBIDI -NS_IMETHODIMP nsTextInputSelectionImpl::GetPrevNextBidiLevels(nsIPresContext *aPresContext, - nsIContent *aNode, - PRUint32 aContentOffset, - nsIFrame **aPrevFrame, - nsIFrame **aNextFrame, - PRUint8 *aPrevLevel, - PRUint8 *aNextLevel) -{ - if (mFrameSelection) - return mFrameSelection->GetPrevNextBidiLevels(aPresContext, aNode, aContentOffset, aPrevFrame, aNextFrame, aPrevLevel, aNextLevel); - return NS_ERROR_FAILURE; -} - -NS_IMETHODIMP nsTextInputSelectionImpl::GetFrameFromLevel(nsIPresContext *aPresContext, - nsIFrame *aFrameIn, - nsDirection aDirection, - PRUint8 aBidiLevel, - nsIFrame **aFrameOut) -{ - if (mFrameSelection) - return mFrameSelection->GetFrameFromLevel(aPresContext, aFrameIn, aDirection, aBidiLevel, aFrameOut); - return NS_ERROR_FAILURE; -} -#endif // IBMBIDI - -// END nsTextInputSelectionImpl - - - -nsresult -NS_NewGfxTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) -{ - NS_PRECONDITION(aNewFrame, "null OUT ptr"); - if (nsnull == aNewFrame) { - return NS_ERROR_NULL_POINTER; - } - nsGfxTextControlFrame2* it = new (aPresShell) nsGfxTextControlFrame2(aPresShell); - if (!it) { - return NS_ERROR_OUT_OF_MEMORY; - } - *aNewFrame = it; - return NS_OK; -} - -NS_IMPL_ADDREF_INHERITED(nsGfxTextControlFrame2, nsBoxFrame); -NS_IMPL_RELEASE_INHERITED(nsGfxTextControlFrame2, nsBoxFrame); - - -NS_IMETHODIMP -nsGfxTextControlFrame2::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { - *aInstancePtr = (void*) ((nsIFormControlFrame*) this); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { - *aInstancePtr = (void*)(nsIAnonymousContentCreator*) this; - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIGfxTextControlFrame2))) { - *aInstancePtr = (void*)(nsIGfxTextControlFrame2*) this; - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider))) { - *aInstancePtr = (void*)(nsIScrollableViewProvider*) this; - return NS_OK; - } - - return nsBoxFrame::QueryInterface(aIID, aInstancePtr); -} - -#ifdef ACCESSIBILITY -NS_IMETHODIMP nsGfxTextControlFrame2::GetAccessible(nsIAccessible** aAccessible) -{ - nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); - - if (accService) { - return accService->CreateHTMLTextFieldAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); - } - - return NS_ERROR_FAILURE; -} -#endif - -nsGfxTextControlFrame2::nsGfxTextControlFrame2(nsIPresShell* aShell):nsStackFrame(aShell) -{ - mUseEditor = PR_FALSE; - mIsProcessing = PR_FALSE; - mNotifyOnInput = PR_FALSE; - mSuggestedWidth = NS_FORMSIZE_NOTSET; - mSuggestedHeight = NS_FORMSIZE_NOTSET; - mScrollableView = nsnull; - mDidPreDestroy = PR_FALSE; -} - -nsGfxTextControlFrame2::~nsGfxTextControlFrame2() -{ - //delete mTextListener; - //delete mTextSelImpl; dont delete this since mSelCon will release it. -} - -static PRBool -SuppressEventHandlers(nsIPresContext* aPresContext) -{ - PRBool suppressHandlers = PR_FALSE; - - if (aPresContext) - { - // Right now we only suppress event handlers and controller manipulation - // when in a print preview or print context! - -#ifdef USE_QI_IN_SUPPRESS_EVENT_HANDLERS - - // Using QI to see if we're printing or print previewing is more - // accurate, but a bit more heavy weight then just checking - // the pagination bool, which will return the right answer to us - // with the current implementation. - - nsCOMPtr printContext = do_QueryInterface(aPresContext); - if (printContext) - suppressHandlers = PR_TRUE; - else - { - nsCOMPtr printPreviewContext = do_QueryInterface(aPresContext); - if (printPreviewContext) - suppressHandlers = PR_TRUE; - } - -#else - - // In the current implementation, we only paginate when - // printing or in print preview. - - aPresContext->IsPaginated(&suppressHandlers); - -#endif - } - - return suppressHandlers; -} - -void -nsGfxTextControlFrame2::PreDestroy(nsIPresContext* aPresContext) -{ - // notify the editor that we are going away - if (mEditor) - { - // If we were in charge of state before, relinquish it back - // to the control. - if (mUseEditor) - { - // First get the frame state from the editor - nsAutoString value; - GetValue(value, PR_TRUE); - - mUseEditor = PR_FALSE; - - // Next store the frame state in the control - // (now that mUseEditor is false values get stored - // in content). - SetValue(value); - } - mEditor->PreDestroy(); - } - - // Clean up the controller - - if (!SuppressEventHandlers(aPresContext)) - { - nsCOMPtr controllers; - nsCOMPtr inputElement = do_QueryInterface(mContent); - if (inputElement) - inputElement->GetControllers(getter_AddRefs(controllers)); - else - { - nsCOMPtr textAreaElement = do_QueryInterface(mContent); - textAreaElement->GetControllers(getter_AddRefs(controllers)); - } - - if (controllers) - { - PRUint32 numControllers; - nsresult rv = controllers->GetControllerCount(&numControllers); - NS_ASSERTION((NS_SUCCEEDED(rv)), "bad result in gfx text control destructor"); - for (PRUint32 i = 0; i < numControllers; i ++) - { - nsCOMPtr controller; - rv = controllers->GetControllerAt(i, getter_AddRefs(controller)); - if (NS_SUCCEEDED(rv) && controller) - { - nsCOMPtr editController = do_QueryInterface(controller); - if (editController) - { - editController->SetCommandRefCon(nsnull); - } - } - } - } - } - - mSelCon = 0; - mEditor = 0; - -//unregister self from content - mTextListener->SetFrame(nsnull); - nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); - if (mTextListener) - { - nsCOMPtr erP = do_QueryInterface(mContent); - if (erP) - { - erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), NS_GET_IID(nsIDOMFocusListener)); - erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*,mTextListener), NS_GET_IID(nsIDOMKeyListener)); - } - } - - mDidPreDestroy = PR_TRUE; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::Destroy(nsIPresContext* aPresContext) -{ - if (!mDidPreDestroy) { - PreDestroy(aPresContext); - } - return nsBoxFrame::Destroy(aPresContext); -} - -void -nsGfxTextControlFrame2::RemovedAsPrimaryFrame(nsIPresContext* aPresContext) -{ - if (!mDidPreDestroy) { - PreDestroy(aPresContext); - } - else NS_ASSERTION(PR_FALSE, "RemovedAsPrimaryFrame called after PreDestroy"); -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetFrameType(nsIAtom** aType) const -{ - NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); - *aType = nsLayoutAtoms::textInputFrame; - NS_ADDREF(*aType); - return NS_OK; -} - -// XXX: wouldn't it be nice to get this from the style context! -PRBool nsGfxTextControlFrame2::IsSingleLineTextControl() const -{ - PRInt32 type; - GetType(&type); - if ((NS_FORM_INPUT_TEXT==type) || (NS_FORM_INPUT_PASSWORD==type)) { - return PR_TRUE; - } - return PR_FALSE; -} - -PRBool nsGfxTextControlFrame2::IsTextArea() const -{ - if (!mContent) - return PR_FALSE; - - nsCOMPtr tag; - mContent->GetTag(*getter_AddRefs(tag)); - - if (nsHTMLAtoms::textarea == tag) - return PR_TRUE; - - return PR_FALSE; -} - -// XXX: wouldn't it be nice to get this from the style context! -PRBool nsGfxTextControlFrame2::IsPlainTextControl() const -{ - // need to check HTML attribute of mContent and/or CSS. - return PR_TRUE; -} - -PRBool nsGfxTextControlFrame2::IsPasswordTextControl() const -{ - PRInt32 type; - GetType(&type); - if (NS_FORM_INPUT_PASSWORD==type) { - return PR_TRUE; - } - return PR_FALSE; -} - - -nsresult -nsGfxTextControlFrame2::GetColRowSizeAttr(nsIFormControlFrame* aFrame, - nsIAtom * aColSizeAttr, - nsHTMLValue & aColSize, - nsresult & aColStatus, - nsIAtom * aRowSizeAttr, - nsHTMLValue & aRowSize, - nsresult & aRowStatus) -{ - nsCOMPtr iContent; - aFrame->GetFormContent(*getter_AddRefs(iContent)); - - nsCOMPtr hContent(do_QueryInterface(iContent)); - - if (!hContent) { - return NS_ERROR_FAILURE; - } - - aColStatus = NS_CONTENT_ATTR_NOT_THERE; - if (aColSizeAttr) { - aColStatus = hContent->GetHTMLAttribute(aColSizeAttr, aColSize); - } - - aRowStatus= NS_CONTENT_ATTR_NOT_THERE; - if (aRowSizeAttr) { - aRowStatus = hContent->GetHTMLAttribute(aRowSizeAttr, aRowSize); - } - - return NS_OK; -} - - - -NS_IMETHODIMP -nsGfxTextControlFrame2::ReflowStandard(nsIPresContext* aPresContext, - nsSize& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus, - nsMargin& aBorder, - nsMargin& aPadding) -{ - // get the css size and let the frame use or override it - nsSize minSize; - - PRBool usingDefaultSize = PR_FALSE; - PRInt32 ignore; - PRInt32 type; - GetType(&type); - if ((NS_FORM_INPUT_TEXT == type) || (NS_FORM_INPUT_PASSWORD == type)) { - PRInt32 width = 0; - if (NS_CONTENT_ATTR_HAS_VALUE != GetSizeFromContent(&width)) { - width = GetDefaultColumnWidth(); - usingDefaultSize = PR_TRUE; - } - nsInputDimensionSpec textSpec(nsnull, PR_FALSE, nsnull, - nsnull, width, - PR_FALSE, nsnull, 1); - CalculateSizeStandard(aPresContext, aReflowState.rendContext, this, - textSpec, aDesiredSize, minSize, ignore, aBorder, aPadding, usingDefaultSize); - } else { - nsInputDimensionSpec areaSpec(nsHTMLAtoms::cols, PR_FALSE, nsnull, - nsnull, GetDefaultColumnWidth(), - PR_FALSE, nsHTMLAtoms::rows, 1); - CalculateSizeStandard(aPresContext, aReflowState.rendContext, this, - areaSpec, aDesiredSize, minSize, ignore, aBorder, aPadding, usingDefaultSize); - } - - // CalculateSize makes calls in the nsFormControlHelper that figures - // out the entire size of the control when in NavQuirks mode. For the - // textarea, this means the scrollbar sizes hav already been added to - // its overall size and do not need to be added here. - if (NS_FORM_TEXTAREA == type) { - float p2t; - aPresContext->GetPixelsToTwips(&p2t); - - nscoord scrollbarWidth = 0; - nscoord scrollbarHeight = 0; - float scale; - nsCOMPtr dx; - aPresContext->GetDeviceContext(getter_AddRefs(dx)); - if (dx) { - float sbWidth; - float sbHeight; - dx->GetCanonicalPixelScale(scale); - dx->GetScrollBarDimensions(sbWidth, sbHeight); - scrollbarWidth = PRInt32(sbWidth * scale); - scrollbarHeight = PRInt32(sbHeight * scale); - } else { - scrollbarWidth = nsFormControlFrame::GetScrollbarWidth(p2t); - scrollbarHeight = scrollbarWidth; - } - - aDesiredSize.height += scrollbarHeight; - minSize.height += scrollbarHeight; - aDesiredSize.width += scrollbarWidth; - minSize.width += scrollbarWidth; - } - aDesiredSize.width += aReflowState.mComputedBorderPadding.left + aReflowState.mComputedBorderPadding.right; - aDesiredSize.height += aReflowState.mComputedBorderPadding.top + aReflowState.mComputedBorderPadding.bottom; - - NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize); - return NS_OK; - -} - - - -PRInt32 -nsGfxTextControlFrame2::CalculateSizeStandard (nsIPresContext* aPresContext, - nsIRenderingContext* aRendContext, - nsIFormControlFrame* aFrame, - nsInputDimensionSpec& aSpec, - nsSize& aDesiredSize, - nsSize& aMinSize, - nscoord& aRowHeight, - nsMargin& aBorder, - nsMargin& aPadding, - PRBool aIsUsingDefSize) -{ - nscoord charWidth = 0; - aDesiredSize.width = CSS_NOTSET; - aDesiredSize.height = CSS_NOTSET; - - nsHTMLValue colAttr; - nsresult colStatus; - nsHTMLValue rowAttr; - nsresult rowStatus; - if (NS_ERROR_FAILURE == GetColRowSizeAttr(aFrame, - aSpec.mColSizeAttr, colAttr, colStatus, - aSpec.mRowSizeAttr, rowAttr, rowStatus)) { - return 0; - } - - float p2t; - aPresContext->GetPixelsToTwips(&p2t); - - nscoord fontHeight = 0; - // get leading - nsCOMPtr fontMet; - nsresult res = nsFormControlHelper::GetFrameFontFM(aPresContext, aFrame, getter_AddRefs(fontMet)); - if (NS_SUCCEEDED(res) && fontMet) { - aRendContext->SetFont(fontMet); - fontMet->GetHeight(fontHeight); - aDesiredSize.height = fontHeight; - } else { - aDesiredSize.height = GUESS_INPUT_SIZE; // punt - } - - // Internal padding is necessary for better matching IE's width - nscoord internalPadding = 0; - - // Get the Average char width to calc the min width and - // pref width. Pref Width is calced by multiplying the size times avecharwidth - // - // XXX Currently, WIN32 is the only platform to implement the GetAveCharWidth in - // nsIFontMetrics. The other need to have it implemeneted (Bug 50998) - // and then this if def removed. We are too close to RTM to implement it in all - // the platforms and ports. -#if defined(_WIN32) || defined(XP_OS2) - fontMet->GetAveCharWidth(charWidth); - - // Get frame font - const nsFont * font = nsnull; - if (NS_SUCCEEDED(aFrame->GetFont(aPresContext, font))) { - // To better match IE, take the size (in twips) and remove 4 pixels - // add this on as additional padding - internalPadding = PR_MAX(font->size - NSToCoordRound(4 * p2t), 0); - // round to a multiple of p2t - nscoord rest = internalPadding%NSToCoordRound(p2t); - if( rest < NSToCoordRound(p2t) - rest) { - internalPadding = internalPadding - rest; - } else { - internalPadding = internalPadding + NSToCoordRound(p2t) - rest; - } - } - -#else - // XP implementation of AveCharWidth - nsAutoString aveStr; - aveStr.Assign(NS_LITERAL_STRING(" ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxyz!@#$%^&*()_+=-0987654321~`';\":[]}{?><,./\\|")); - aRendContext->GetWidth(aveStr, charWidth); - charWidth /= aveStr.Length(); - // Round to the nearest twip - nscoord onePixel = NSIntPixelsToTwips(1, p2t); // get the rounding right - charWidth = nscoord((float(charWidth) / float(onePixel)) + 0.5)*onePixel; -#endif - aDesiredSize.width = charWidth; - -#ifdef DEBUG_rodsXXX - printf("Ave: %d MA: %d %d\n", charWidth, measAveWidth, charWidth-measAveWidth); - printf("Ave: %d MA: %d %d\n", charWidth/15, measAveWidth/15, (charWidth/15)-(measAveWidth/15)); -#endif - - // set the default col size back - aMinSize.width = aDesiredSize.width; - aMinSize.height = aDesiredSize.height; - - // determine the width, char height, row height - if (NS_CONTENT_ATTR_HAS_VALUE == colStatus) { // col attr will provide width - PRInt32 col = ((colAttr.GetUnit() == eHTMLUnit_Pixel) ? colAttr.GetPixelValue() : colAttr.GetIntValue()); - col = (col <= 0) ? 1 : col; // XXX why a default of 1 char, why hide it - aDesiredSize.width = col * charWidth; - } else { - aDesiredSize.width = aSpec.mColDefaultSize * charWidth; - } - - // Now add the extra internal padding on - aDesiredSize.width += internalPadding; - - aRowHeight = aDesiredSize.height; - aMinSize.height = aDesiredSize.height; - PRInt32 numRows = 0; - - if (NS_CONTENT_ATTR_HAS_VALUE == rowStatus) { // row attr will provide height - PRInt32 rowAttrInt = ((rowAttr.GetUnit() == eHTMLUnit_Pixel) - ? rowAttr.GetPixelValue() : rowAttr.GetIntValue()); - numRows = (rowAttrInt > 0) ? rowAttrInt : 1; - aDesiredSize.height = aDesiredSize.height * numRows; - } else { - aDesiredSize.height = aDesiredSize.height * aSpec.mRowDefaultSize; - } - - numRows = (aRowHeight > 0) ? (aDesiredSize.height / aRowHeight) : 0; - if (numRows == 1) { - PRInt32 type; - GetType(&type); - if (NS_FORM_TEXTAREA == type) { - aDesiredSize.height += fontHeight; - } - } - - // if we are not using the default size - // then make the minimum size the size we want to be - if (!aIsUsingDefSize) { - aMinSize.width = aDesiredSize.width; - aMinSize.height = aDesiredSize.height; - } - - return numRows; -} - - - -//------------------------------------------------------------------ -NS_IMETHODIMP -nsGfxTextControlFrame2::CreateFrameFor(nsIPresContext* aPresContext, - nsIContent * aContent, - nsIFrame** aFrame) -{ - aContent = nsnull; - return NS_ERROR_FAILURE; -} - -nsresult -nsGfxTextControlFrame2::InitEditor() -{ - // This method must be called during/after the text - // control frame's initial reflow to avoid any unintened - // forced reflows that might result when the editor - // calls into DOM/layout code while trying to set the - // initial string. - // - // This code used to be called from CreateAnonymousContent(), - // but when the editor set the initial string, it would trigger - // a PresShell listener which called FlushPendingNotifications() - // during frame construction. This was causing other form controls - // to display wrong values. - - // Check if this method has been called already. - // If so, just return early. - - if (mUseEditor) - return NS_OK; - - // If the editor is not here, then we can't use it, now can we? - if (!mEditor) - return NS_ERROR_NOT_INITIALIZED; - - // Get the current value of the textfield from the content. - nsAutoString defaultValue; - GetValue(defaultValue, PR_TRUE); - - // Turn on mUseEditor so that subsequent calls will use the - // editor. - mUseEditor = PR_TRUE; - - // If we have a default value, insert it under the div we created - // above, but be sure to use the editor so that '*' characters get - // displayed for password fields, etc. SetValue() will call the - // editor for us. - - if (!defaultValue.IsEmpty()) { - PRUint32 editorFlags = 0; - - nsresult rv = mEditor->GetFlags(&editorFlags); - - if (NS_FAILED(rv)) - return rv; - - // Avoid causing reentrant painting and reflowing by telling the editor - // that we don't want it to force immediate view refreshes or force - // immediate reflows during any editor calls. - - rv = mEditor->SetFlags(editorFlags | - nsIPlaintextEditor::eEditorUseAsyncUpdatesMask); - - if (NS_FAILED(rv)) - return rv; - - // Now call SetValue() which will make the neccessary editor calls to set - // the default value. Make sure to turn off undo before setting the default - // value, and turn it back on afterwards. This will make sure we can't undo - // past the default value. - - rv = mEditor->EnableUndo(PR_FALSE); - - if (NS_FAILED(rv)) - return rv; - - SetValue(defaultValue); - - rv = mEditor->EnableUndo(PR_TRUE); - NS_ASSERTION(!rv,"Transaction Manager must have failed"); - // Now restore the original editor flags. - - rv = mEditor->SetFlags(editorFlags); - - if (NS_FAILED(rv)) - return rv; - } - - return NS_OK; -} - -#define DIV_STRING \ - "-moz-user-focus: none;" \ - "border: 0px !important;" \ - "padding: 0px;" \ - "margin: 0px;" \ - "" - -#define DIV_STRING_SINGLELINE \ - "-moz-user-focus: none;" \ - "white-space : nowrap;" \ - "overflow: auto;" \ - "border: 0px !important;" \ - "padding: 0px;" \ - "margin: 0px;" \ - "" - -NS_IMETHODIMP -nsGfxTextControlFrame2::CreateAnonymousContent(nsIPresContext* aPresContext, - nsISupportsArray& aChildList) -{ - // Get the PresShell - - mState |= NS_FRAME_INDEPENDENT_SELECTION; - - nsCOMPtr shell; - nsresult rv = aPresContext->GetShell(getter_AddRefs(shell)); - - if (NS_FAILED(rv)) - return rv; - - if (!shell) - return NS_ERROR_FAILURE; - - // Get the DOM document - - nsCOMPtr doc; - rv = shell->GetDocument(getter_AddRefs(doc)); - if (NS_FAILED(rv)) - return rv; - if (!doc) - return NS_ERROR_FAILURE; - - nsCOMPtr domdoc = do_QueryInterface(doc, &rv); - if (NS_FAILED(rv)) - return rv; - if (!domdoc) - return NS_ERROR_FAILURE; - - // Now create a DIV and add it to the anonymous content child list. - nsCOMPtr elementFactory; - rv = GetElementFactoryService(getter_AddRefs(elementFactory)); - if (NS_FAILED(rv)) - return rv; - if (!elementFactory) - return NS_ERROR_FAILURE; - - nsCOMPtr nodeInfoManager; - rv = doc->GetNodeInfoManager(*getter_AddRefs(nodeInfoManager)); - - if (NS_FAILED(rv)) - return rv; - - NS_ENSURE_TRUE(nodeInfoManager, NS_ERROR_FAILURE); - - nsCOMPtr nodeInfo; - rv = nodeInfoManager->GetNodeInfo(nsHTMLAtoms::div, nsnull, - kNameSpaceID_XHTML, - *getter_AddRefs(nodeInfo)); - - if (NS_FAILED(rv)) - return rv; - - if (!nodeInfo) - return NS_ERROR_FAILURE; - - nsCOMPtr divContent; - - rv = elementFactory->CreateInstanceByTag(nodeInfo, getter_AddRefs(divContent)); - - if (NS_FAILED(rv)) - return rv; - - if (!divContent) - return NS_ERROR_FAILURE; - - - // Set the neccessary style attributes on the text control. - - if (IsSingleLineTextControl()) - rv = divContent->SetAttr(kNameSpaceID_None,nsHTMLAtoms::style, NS_ConvertASCIItoUCS2(DIV_STRING_SINGLELINE), PR_FALSE); - else { - nsAutoString divStr; divStr.AssignWithConversion(DIV_STRING); - const nsStyleDisplay* disp = (const nsStyleDisplay*) - mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mOverflow == NS_STYLE_OVERFLOW_SCROLL) - divStr += NS_LITERAL_STRING("overflow:scroll;"); - else if (disp->mOverflow == NS_STYLE_OVERFLOW_HIDDEN) - divStr += NS_LITERAL_STRING("overflow:hidden;"); - else divStr += NS_LITERAL_STRING("overflow:auto;"); - rv = divContent->SetAttr(kNameSpaceID_None,nsHTMLAtoms::style, divStr, PR_FALSE); - } - - if (NS_FAILED(rv)) - return rv; - - // rv = divContent->SetAttr(kNameSpaceID_None,nsXULAtoms::debug, NS_LITERAL_STRING("true"), PR_FALSE); - rv = aChildList.AppendElement(divContent); - - if (NS_FAILED(rv)) - return rv; - - // Create an editor - - rv = nsComponentManager::CreateInstance(kTextEditorCID, - nsnull, - NS_GET_IID(nsIEditor), - getter_AddRefs(mEditor)); - if (NS_FAILED(rv)) - return rv; - if (!mEditor) - return NS_ERROR_OUT_OF_MEMORY; - - // Create selection - - nsCOMPtr frameSel; - rv = nsComponentManager::CreateInstance(kFrameSelectionCID, nsnull, - NS_GET_IID(nsIFrameSelection), - getter_AddRefs(frameSel)); - - // Create a SelectionController - - mTextSelImpl = new nsTextInputSelectionImpl(frameSel,shell,divContent); - if (!mTextSelImpl) - return NS_ERROR_OUT_OF_MEMORY; - mTextListener = new nsTextInputListener(); - if (!mTextListener) - return NS_ERROR_OUT_OF_MEMORY; - mTextListener->SetFrame(this); - mSelCon = do_QueryInterface((nsISupports *)(nsISelectionController *)mTextSelImpl);//this will addref it once - if (!mSelCon) - return NS_ERROR_NO_INTERFACE; - mSelCon->SetDisplaySelection(nsISelectionController::SELECTION_ON); - - // Setup the editor flags - - PRUint32 editorFlags = 0; - if (IsPlainTextControl()) - editorFlags |= nsIPlaintextEditor::eEditorPlaintextMask; - if (IsSingleLineTextControl()) - editorFlags |= nsIPlaintextEditor::eEditorSingleLineMask; - if (IsPasswordTextControl()) - editorFlags |= nsIPlaintextEditor::eEditorPasswordMask; - - // All gfxtextcontrolframe2's are widgets - editorFlags |= nsIPlaintextEditor::eEditorWidgetMask; - - // Use async reflow and painting for text widgets to improve - // performance. - - editorFlags |= nsIPlaintextEditor::eEditorUseAsyncUpdatesMask; - - // Now initialize the editor. - // - // NOTE: Conversion of '\n' to
happens inside the - // editor's Init() call. - - rv = mEditor->Init(domdoc, shell, divContent, mSelCon, editorFlags); - - if (NS_FAILED(rv)) - return rv; - - // Initialize the controller for the editor - - if (!SuppressEventHandlers(aPresContext)) - { - nsCOMPtr controllers; - nsCOMPtr inputElement = do_QueryInterface(mContent); - if (inputElement) - rv = inputElement->GetControllers(getter_AddRefs(controllers)); - else - { - nsCOMPtr textAreaElement = do_QueryInterface(mContent); - - if (!textAreaElement) - return NS_ERROR_FAILURE; - - rv = textAreaElement->GetControllers(getter_AddRefs(controllers)); - } - - if (NS_FAILED(rv)) - return rv; - - if (controllers) - { - PRUint32 numControllers; - PRBool found = PR_FALSE; - rv = controllers->GetControllerCount(&numControllers); - for (PRUint32 i = 0; i < numControllers; i ++) - { - nsCOMPtr controller; - rv = controllers->GetControllerAt(i, getter_AddRefs(controller)); - if (NS_SUCCEEDED(rv) && controller) - { - nsCOMPtr editController = do_QueryInterface(controller); - if (editController) - { - editController->SetCommandRefCon(mEditor); - found = PR_TRUE; - } - } - } - if (!found) - rv = NS_ERROR_FAILURE; - } - } - - nsCOMPtr textEditor(do_QueryInterface(mEditor)); - if (textEditor) - { - nsHTMLValue colAttr; - nsresult colStatus; - nsHTMLValue rowAttr; - nsresult rowStatus; - PRInt32 type; - GetType(&type); - nsInputDimensionSpec *spec; - if ((NS_FORM_INPUT_TEXT == type) || (NS_FORM_INPUT_PASSWORD == type)) { - PRInt32 width = 0; - if (NS_CONTENT_ATTR_HAS_VALUE != GetSizeFromContent(&width)) { - width = GetDefaultColumnWidth(); - } - spec = new nsInputDimensionSpec(nsnull, PR_FALSE, nsnull, - nsnull, width, - PR_FALSE, nsnull, 1); - } else { - spec = new nsInputDimensionSpec(nsHTMLAtoms::cols, PR_FALSE, nsnull, - nsnull, GetDefaultColumnWidth(), - PR_FALSE, nsHTMLAtoms::rows, 1); - } - if (spec) - { - if (NS_FAILED(GetColRowSizeAttr(this, - spec->mColSizeAttr, colAttr, colStatus, - spec->mRowSizeAttr, rowAttr, rowStatus))) - return NS_ERROR_FAILURE; - PRInt32 col =-1; - if (!(colAttr.GetUnit() == eHTMLUnit_Null)) - { - col = ((colAttr.GetUnit() == eHTMLUnit_Pixel) ? colAttr.GetPixelValue() : colAttr.GetIntValue()); - col = (col <= 0) ? 1 : col; // XXX why a default of 1 char, why hide it - } - textEditor->SetWrapWidth(col); - delete spec; - } - - // Set max text field length - PRInt32 maxLength; - rv = GetMaxLength(&maxLength); - if (NS_CONTENT_ATTR_NOT_THERE != rv) - { - textEditor->SetMaxTextLength(maxLength); - } - } - - // Get the caret and make it a selection listener. - - nsCOMPtr domSelection; - if (NS_SUCCEEDED(mSelCon->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(domSelection))) && domSelection) - { - nsCOMPtr selPriv(do_QueryInterface(domSelection)); - nsCOMPtr caret; - nsCOMPtr listener; - if (NS_SUCCEEDED(shell->GetCaret(getter_AddRefs(caret))) && caret) - { - listener = do_QueryInterface(caret); - if (listener) - { - selPriv->AddSelectionListener(listener); - } - } - - selPriv->AddSelectionListener(NS_STATIC_CAST(nsISelectionListener *, mTextListener)); - } - - // also set up the text listener as a transaction listener on the editor - if (mEditor && mTextListener) - { - nsCOMPtr txMgr; - rv = mEditor->GetTransactionManager(getter_AddRefs(txMgr)); - if (NS_FAILED(rv)) return rv; - if (!txMgr) return NS_ERROR_NULL_POINTER; - - rv = txMgr->AddListener(NS_STATIC_CAST(nsITransactionListener*, mTextListener)); - if (NS_FAILED(rv)) return rv; - } - - if (mContent) - { - rv = mEditor->GetFlags(&editorFlags); - - if (NS_FAILED(rv)) - return rv; - - nsAutoString resultValue; - - // Check if the readonly attribute is set. - - rv = mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::readonly, resultValue); - - if (NS_FAILED(rv)) - return rv; - - if (NS_CONTENT_ATTR_NOT_THERE != rv) - editorFlags |= nsIPlaintextEditor::eEditorReadonlyMask; - - // Check if the disabled attribute is set. - - rv = mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::disabled, resultValue); - - if (NS_FAILED(rv)) - return rv; - - if (NS_CONTENT_ATTR_NOT_THERE != rv) - editorFlags |= nsIPlaintextEditor::eEditorDisabledMask; - - // Disable the caret and selection if neccessary. - - if (editorFlags & nsIPlaintextEditor::eEditorReadonlyMask || - editorFlags & nsIPlaintextEditor::eEditorDisabledMask) - { - if (mSelCon) - { - mSelCon->SetCaretEnabled(PR_FALSE); - - if (editorFlags & nsIPlaintextEditor::eEditorDisabledMask) - mSelCon->SetDisplaySelection(nsISelectionController::SELECTION_OFF); - } - - mEditor->SetFlags(editorFlags); - } - } - - return NS_OK; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::Reflow(nsIPresContext* aPresContext, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) -{ - DO_GLOBAL_REFLOW_COUNT("nsGfxTextControlFrame2", aReflowState.reason); - DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus); - - InitEditor(); - - // make sure the the form registers itself on the initial/first reflow - if (mState & NS_FRAME_FIRST_REFLOW) { - nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_TRUE); - mNotifyOnInput = PR_TRUE;//its ok to notify now. all has been prepared. - } - - nsresult rv = nsStackFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus); - if (NS_SUCCEEDED(rv)) - { // fix for bug 40596, width:auto means the control sets it's maxElementSize.width to it's default width - if (aDesiredSize.maxElementSize) - { - nsStylePosition *stylePosition; - GetStyleData(eStyleStruct_Position, (const nsStyleStruct *&)stylePosition); - nsStyleUnit widthUnit = stylePosition->mWidth.GetUnit(); - if (eStyleUnit_Auto == widthUnit) { - aDesiredSize.maxElementSize->width = aDesiredSize.width; - } - } - } - return rv; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer, - PRUint32 aFlags) -{ - PRBool isVisible; - if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { - return NS_OK; - } - nsresult rv = NS_OK; - if (aWhichLayer == NS_FRAME_PAINT_LAYER_FOREGROUND) { - rv = nsStackFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, NS_FRAME_PAINT_LAYER_BACKGROUND); - if (NS_FAILED(rv)) return rv; - rv = nsStackFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, NS_FRAME_PAINT_LAYER_FLOATERS); - if (NS_FAILED(rv)) return rv; - rv = nsStackFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, NS_FRAME_PAINT_LAYER_FOREGROUND); - } - DO_GLOBAL_REFLOW_COUNT_DSP("nsGfxTextControlFrame2", &aRenderingContext); - return rv; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetFrameForPoint(nsIPresContext* aPresContext, - const nsPoint& aPoint, - nsFramePaintLayer aWhichLayer, - nsIFrame** aFrame) -{ - nsresult rv = NS_ERROR_FAILURE; - if (aWhichLayer == NS_FRAME_PAINT_LAYER_FOREGROUND) { - rv = nsStackFrame::GetFrameForPoint(aPresContext, aPoint, - NS_FRAME_PAINT_LAYER_FOREGROUND, aFrame); - if (NS_SUCCEEDED(rv)) - return NS_OK; - rv = nsStackFrame::GetFrameForPoint(aPresContext, aPoint, - NS_FRAME_PAINT_LAYER_FLOATERS, aFrame); - if (NS_SUCCEEDED(rv)) - return NS_OK; - rv = nsStackFrame::GetFrameForPoint(aPresContext, aPoint, - NS_FRAME_PAINT_LAYER_BACKGROUND, aFrame); - } - return rv; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize) -{ - if (!DoesNeedRecalc(mPrefSize)) { - aSize = mPrefSize; - return NS_OK; - } - - PropagateDebug(aState); - - aSize.width = 0; - aSize.height = 0; - - PRBool collapsed = PR_FALSE; - IsCollapsed(aState, collapsed); - if (collapsed) - return NS_OK; - - nsIPresContext* aPresContext = aState.GetPresContext(); - const nsHTMLReflowState* aReflowState = aState.GetReflowState(); - nsSize styleSize(CSS_NOTSET,CSS_NOTSET); - nsFormControlFrame::GetStyleSize(aPresContext, *aReflowState, styleSize); - - if (!aReflowState) - return NS_OK; - - InitEditor(); - - if (mState & NS_FRAME_FIRST_REFLOW) - mNotifyOnInput = PR_TRUE;//its ok to notify now. all has been prepared. - - nsReflowStatus aStatus; - nsMargin border; - border.SizeTo(0, 0, 0, 0); - nsMargin padding; - padding.SizeTo(0, 0, 0, 0); - - // Get the CSS border - const nsStyleBorder* borderStyle; - const nsStylePadding* paddingStyle; - GetStyleData(eStyleStruct_Border, (const nsStyleStruct *&)borderStyle); - GetStyleData(eStyleStruct_Padding, (const nsStyleStruct *&)paddingStyle); - borderStyle->CalcBorderFor(this, border); - paddingStyle->CalcPaddingFor(this, padding); - - nsresult rv; - rv = ReflowStandard(aPresContext, aSize, *aReflowState, aStatus, border, padding); - AddInset(aSize); - - mPrefSize = aSize; - -#ifdef DEBUG_rods - { - nsMargin borderPadding(0,0,0,0); - GetBorderAndPadding(borderPadding); - nsSize size(169, 24); - nsSize actual(aSize.width/15, - aSize.height/15); - printf("nsGfxText(field) %d,%d %d,%d %d,%d\n", - size.width, size.height, actual.width, actual.height, actual.width-size.width, actual.height-size.height); // text field - } -#endif - - return NS_OK; -} - - - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetMinSize(nsBoxLayoutState& aState, nsSize& aSize) -{ -#define FIX_FOR_BUG_40596 -#ifdef FIX_FOR_BUG_40596 - aSize = mMinSize; - return NS_OK; -#else - return nsBox::GetMinSize(aState, aSize); -#endif -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetMaxSize(nsBoxLayoutState& aState, nsSize& aSize) -{ - return nsBox::GetMaxSize(aState, aSize); -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent) -{ - nsSize size; - nsresult rv = GetPrefSize(aState, size); - aAscent = size.height; - return rv; -} - -//IMPLEMENTING NS_IFORMCONTROLFRAME -NS_IMETHODIMP -nsGfxTextControlFrame2::GetName(nsAString* aResult) -{ - nsresult rv = NS_FORM_NOTOK; - if (mContent) { - nsIHTMLContent* formControl = nsnull; - rv = mContent->QueryInterface(NS_GET_IID(nsIHTMLContent),(void**)&formControl); - if (NS_SUCCEEDED(rv) && formControl) { - nsHTMLValue value; - rv = formControl->GetHTMLAttribute(nsHTMLAtoms::name, value); - if (NS_CONTENT_ATTR_HAS_VALUE == rv) { - if (eHTMLUnit_String == value.GetUnit()) { - value.GetStringValue(*aResult); - } - } - NS_RELEASE(formControl); - } - } - return rv; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetType(PRInt32* aType) const -{ - nsresult rv = NS_FORM_NOTOK; - if (mContent) { - nsIFormControl* formControl = nsnull; - rv = mContent->QueryInterface(NS_GET_IID(nsIFormControl), (void**)&formControl); - if ((NS_OK == rv) && formControl) { - rv = formControl->GetType(aType); - NS_RELEASE(formControl); - } - } - return rv; -} - -nsresult -nsGfxTextControlFrame2::GetSizeFromContent(PRInt32* aSize) const -{ - *aSize = -1; - nsresult result = NS_CONTENT_ATTR_NOT_THERE; - nsCOMPtr content(do_QueryInterface(mContent)); - - if (content) { - nsHTMLValue value; - result = content->GetHTMLAttribute(nsHTMLAtoms::size, value); - if (eHTMLUnit_Integer == value.GetUnit()) { - *aSize = value.GetIntValue(); - } - } - if (*aSize < 1) { - // This is part of bug 46224 - // when we can get a PresContent (may be cache it) - // then we can check the compatibility mode -#ifdef FUTURE_ADDITIONAL_FIX_FOR_46224 - nsCompatibility mode; - nsFormControlHelper::GetFormCompatibilityMode(aPresContext, mode); - if (eCompatibility_NavQuirks == mode) { - *aSize = 1; - } else { - *aSize = 20; - } -#else - *aSize = 20; // use '1' to be compatable with Nav 4.x, Use '20' to be compatable with IE -#endif - } - return result; -} - -void nsGfxTextControlFrame2::SetFocus(PRBool aOn , PRBool aRepaint){} - -void nsGfxTextControlFrame2::ScrollIntoView(nsIPresContext* aPresContext) -{ - if (aPresContext) { - nsCOMPtr presShell; - aPresContext->GetShell(getter_AddRefs(presShell)); - if (presShell) { - presShell->ScrollFrameIntoView(this, - NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE); - } - } -} - -void nsGfxTextControlFrame2::MouseClicked(nsIPresContext* aPresContext){} - -nscoord -nsGfxTextControlFrame2::GetVerticalInsidePadding(nsIPresContext* aPresContext, - float aPixToTwip, - nscoord aInnerHeight) const -{ - return NSIntPixelsToTwips(0, aPixToTwip); -} - - -//--------------------------------------------------------- -nscoord -nsGfxTextControlFrame2::GetHorizontalInsidePadding(nsIPresContext* aPresContext, - float aPixToTwip, - nscoord aInnerWidth, - nscoord aCharWidth) const -{ - return GetVerticalInsidePadding(aPresContext, aPixToTwip, aInnerWidth); -} - - -NS_IMETHODIMP -nsGfxTextControlFrame2::SetSuggestedSize(nscoord aWidth, nscoord aHeight) -{ - mSuggestedWidth = aWidth; - mSuggestedHeight = aHeight; - return NS_OK; -} - -nsresult -nsGfxTextControlFrame2::RequiresWidget(PRBool& aRequiresWidget) -{ - aRequiresWidget = PR_FALSE; - return NS_OK; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetFont(nsIPresContext* aPresContext, - const nsFont*& aFont) -{ - return nsFormControlHelper::GetFont(this, aPresContext, mStyleContext, aFont); -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetFormContent(nsIContent*& aContent) const -{ - nsIContent* content; - nsresult rv; - - rv = GetContent(&content); - aContent = content; - return rv; -} - -NS_IMETHODIMP nsGfxTextControlFrame2::SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAString& aValue) -{ - if (!mIsProcessing)//some kind of lock. - { - mIsProcessing = PR_TRUE; - - if (nsHTMLAtoms::value == aName) - { - if (mEditor) { - mEditor->EnableUndo(PR_FALSE); // wipe out undo info - } - if (mEditor && mUseEditor) { - // If the editor exists, the control needs to be informed that the value - // has changed. - SetValueChanged(PR_TRUE); - } - SetValue(aValue); // set new text value - if (mEditor) { - mEditor->EnableUndo(PR_TRUE); // fire up a new txn stack - } - } - else if (nsHTMLAtoms::select == aName && mSelCon) - { - // select all the text - SelectAllContents(); - } - mIsProcessing = PR_FALSE; - } - return NS_OK; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetProperty(nsIAtom* aName, nsAString& aValue) -{ - // Return the value of the property from the widget it is not null. - // If widget is null, assume the widget is GFX-rendered and return a member variable instead. - - if (nsHTMLAtoms::value == aName) { - GetValue(aValue, PR_FALSE); - } - return NS_OK; -} - - - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetEditor(nsIEditor **aEditor) -{ - NS_ENSURE_ARG_POINTER(aEditor); - *aEditor = mEditor; - NS_IF_ADDREF(*aEditor); - return NS_OK; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::OwnsValue(PRBool* aOwnsValue) -{ - NS_PRECONDITION(aOwnsValue, "aOwnsValue must be non-null"); - *aOwnsValue = mUseEditor; - return NS_OK; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetTextLength(PRInt32* aTextLength) -{ - NS_ENSURE_ARG_POINTER(aTextLength); - - nsAutoString textContents; - GetValue(textContents, PR_FALSE); // this is expensive! - *aTextLength = textContents.Length(); - return NS_OK; -} - - - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetFirstTextNode(nsIDOMCharacterData* *aFirstTextNode) -{ - if (!mEditor) - return NS_ERROR_NOT_INITIALIZED; - nsCOMPtr rootElement; - mEditor->GetRootElement(getter_AddRefs(rootElement)); - *aFirstTextNode = nsnull; - - nsCOMPtr rootNode = do_QueryInterface(rootElement); - if (!rootNode) return NS_ERROR_FAILURE; - - // for a text widget, the text of the document is in a single - // text node under the body. Let's make sure that's true. - nsCOMPtr childNodesList; - rootNode->GetChildNodes(getter_AddRefs(childNodesList)); - if (!childNodesList) - { - NS_WARNING("rootNode has no text node list"); - return NS_ERROR_FAILURE; - } - - PRUint32 numChildNodes = 0; - childNodesList->GetLength(&numChildNodes); - - nsCOMPtr firstChild; - nsresult rv = rootNode->GetFirstChild(getter_AddRefs(firstChild)); - if (NS_FAILED(rv)) return rv; - if (!firstChild) return NS_ERROR_FAILURE; - - nsCOMPtr charDataNode = do_QueryInterface(firstChild, &rv); - if (NS_FAILED(rv)) return rv; - - NS_ADDREF(*aFirstTextNode = charDataNode); - return NS_OK; -} - - -nsresult -nsGfxTextControlFrame2::SelectAllContents() -{ - nsresult rv; - - if (IsSingleLineTextControl()) - { - rv = SetSelectionRange(0, eSelectToEnd); - } - else - { - // we have to select all - if (!mEditor) - return NS_ERROR_NOT_INITIALIZED; - NS_ASSERTION(mEditor, "Should have an editor here"); - rv = mEditor->SelectAll(); - } - - return rv; -} - - -nsresult -nsGfxTextControlFrame2::SetSelectionEndPoints(PRInt32 aSelStart, PRInt32 aSelEnd) -{ - NS_ASSERTION(IsSingleLineTextControl() || IsTextArea(), "Should only call this on a single line input"); - NS_ASSERTION(mEditor, "Should have an editor here"); - NS_ASSERTION(mTextSelImpl,"selection not found!"); - - nsCOMPtr firstTextNode; - nsresult rv = GetFirstTextNode(getter_AddRefs(firstTextNode)); - if (NS_FAILED(rv) || !firstTextNode) - { - // probably an empty document. not an error - return NS_OK; - } - - nsCOMPtr firstNode = do_QueryInterface(firstTextNode, &rv); - if (!firstNode) return rv; - - // constrain the selection to this node - PRUint32 nodeLengthU; - firstTextNode->GetLength(&nodeLengthU); - PRInt32 nodeLength = (PRInt32)nodeLengthU; - - nsCOMPtr selection; - mTextSelImpl->GetSelection(nsISelectionController::SELECTION_NORMAL,getter_AddRefs(selection)); - if (!selection) return NS_ERROR_FAILURE; - - // are we setting both start and end? - if (aSelStart != eIgnoreSelect && aSelEnd != eIgnoreSelect) - { - if (aSelStart == eSelectToEnd || aSelStart > nodeLength) - aSelStart = nodeLength; - if (aSelStart < 0) - aSelStart = 0; - - if (aSelEnd == eSelectToEnd || aSelEnd > nodeLength) - aSelEnd = nodeLength; - if (aSelEnd < 0) - aSelEnd = 0; - - // remove existing ranges - selection->RemoveAllRanges(); - - nsCOMPtr selectionRange(do_CreateInstance(kRangeCID,&rv)); - if (NS_FAILED(rv)) - return rv; - - selectionRange->SetStart(firstTextNode, aSelStart); - selectionRange->SetEnd(firstTextNode, aSelEnd); - - selection->AddRange(selectionRange); - } - else // we're setting either start or end but not both - { - // does a range exist? - nsCOMPtr firstRange; - selection->GetRangeAt(0, getter_AddRefs(firstRange)); - PRBool mustAdd = PR_FALSE; - PRInt32 selStart = 0, selEnd = 0; - - if (firstRange) - { - firstRange->GetStartOffset(&selStart); - firstRange->GetEndOffset(&selEnd); - } - else - { - // no range. Make a new one. - firstRange = do_CreateInstance(kRangeCID,&rv); - if (NS_FAILED(rv)) - return rv; - mustAdd = PR_TRUE; - } - - if (aSelStart == eSelectToEnd) - selStart = nodeLength; - else if (aSelStart != eIgnoreSelect) - selStart = aSelStart; - - if (aSelEnd == eSelectToEnd) - selEnd = nodeLength; - else if (aSelEnd != eIgnoreSelect) - selEnd = aSelEnd; - - // swap them - if (selEnd < selStart) - { - PRInt32 temp = selStart; - selStart = selEnd; - selEnd = temp; - } - - firstRange->SetStart(firstTextNode, selStart); - firstRange->SetEnd(firstTextNode, selEnd); - if (mustAdd) - selection->AddRange(firstRange); - } - - return NS_OK; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::SetSelectionRange(PRInt32 aSelStart, PRInt32 aSelEnd) -{ - if (!IsSingleLineTextControl()) return NS_ERROR_NOT_IMPLEMENTED; - - // make sure we have an editor - if (!mEditor) - return NS_ERROR_NOT_INITIALIZED; - - return SetSelectionEndPoints(aSelStart, aSelEnd); -} - - -NS_IMETHODIMP -nsGfxTextControlFrame2::SetSelectionStart(PRInt32 aSelectionStart) -{ - if (!IsSingleLineTextControl() && !IsTextArea()) return NS_ERROR_NOT_IMPLEMENTED; - - // make sure we have an editor - if (!mEditor) - return NS_ERROR_NOT_INITIALIZED; - - return SetSelectionEndPoints(aSelectionStart, eIgnoreSelect); -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::SetSelectionEnd(PRInt32 aSelectionEnd) -{ - if (!IsSingleLineTextControl() && !IsTextArea()) return NS_ERROR_NOT_IMPLEMENTED; - - // make sure we have an editor - if (!mEditor) - return NS_ERROR_NOT_INITIALIZED; - - return SetSelectionEndPoints(eIgnoreSelect, aSelectionEnd); -} - - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd) -{ - NS_ENSURE_ARG_POINTER((aSelectionStart && aSelectionEnd)); - - // make sure we have an editor - if (!mEditor) - return NS_ERROR_NOT_INITIALIZED; - - *aSelectionStart = 0; - *aSelectionEnd = 0; - - nsCOMPtr selection; - mTextSelImpl->GetSelection(nsISelectionController::SELECTION_NORMAL,getter_AddRefs(selection)); - if (!selection) return NS_ERROR_FAILURE; - - // we should have only zero or one range - PRInt32 numRanges = 0; - selection->GetRangeCount(&numRanges); - if (numRanges > 1) - { - NS_ASSERTION(0, "Found more than on range in GetSelectionRange"); - } - - if (numRanges != 0) - { - nsCOMPtr firstRange; - selection->GetRangeAt(0, getter_AddRefs(firstRange)); - if (!firstRange) - return NS_ERROR_FAILURE; - - if (IsSingleLineTextControl() || IsTextArea()) - { - firstRange->GetStartOffset(aSelectionStart); - firstRange->GetEndOffset(aSelectionEnd); - } - else//multiline - { - //mContent = parent. iterate over each child. - //when text nodes are reached add text length. - //if you find range-startoffset,startnode then mark aSelecitonStart - nsresult rv = NS_ERROR_FAILURE; - nsCOMPtr contentNode; - nsCOMPtr curNode; - contentNode = do_QueryInterface(mContent); - if (!contentNode || NS_FAILED(rv = contentNode->GetFirstChild(getter_AddRefs(curNode))) || !curNode) - return rv; - nsCOMPtr startParent; - nsCOMPtr endParent; - PRInt32 startOffset; - PRInt32 endOffset; - - firstRange->GetStartContainer(getter_AddRefs(startParent)); - firstRange->GetStartOffset(&startOffset); - firstRange->GetEndContainer(getter_AddRefs(endParent)); - firstRange->GetEndOffset(&endOffset); - - PRInt32 currentTextOffset = 0; - - while(curNode) - { - nsCOMPtr domText; - domText = do_QueryInterface(curNode); - if (contentNode == startParent) - { - if (domText) - *aSelectionStart = currentTextOffset + startOffset; - else - *aSelectionStart = currentTextOffset; - } - if (curNode == endParent) - { - if (domText) - *aSelectionEnd = currentTextOffset + endOffset; - else - *aSelectionEnd = currentTextOffset; - break; - } - if (domText) - { - PRUint32 length; - if (NS_SUCCEEDED(domText->GetLength(&length))) - currentTextOffset += length; - } - else - ++currentTextOffset; - } - if (!curNode) //something went very wrong... - { - *aSelectionEnd = *aSelectionStart;//couldnt find the end - } - } - } - return NS_OK; -} - - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetSelectionContr(nsISelectionController **aSelCon) -{ - NS_ENSURE_ARG_POINTER(aSelCon); - NS_IF_ADDREF(*aSelCon = mSelCon); - return NS_OK; -} - - -/////END INTERFACE IMPLEMENTATIONS - -////NSIFRAME -NS_IMETHODIMP -nsGfxTextControlFrame2::AttributeChanged(nsIPresContext* aPresContext, - nsIContent* aChild, - PRInt32 aNameSpaceID, - nsIAtom* aAttribute, - PRInt32 aModType, - PRInt32 aHint) -{ - if (!mEditor || !mSelCon) {return NS_ERROR_NOT_INITIALIZED;} - nsresult rv = NS_OK; - - if (nsHTMLAtoms::value == aAttribute) - { - // XXX If this should happen when value= attribute is set, shouldn't it - // happen when .value is set too? - if (aHint != NS_STYLE_HINT_REFLOW) - nsFormControlHelper::StyleChangeReflow(aPresContext, this); - } - else if (nsHTMLAtoms::maxlength == aAttribute) - { - PRInt32 maxLength; - nsresult rv = GetMaxLength(&maxLength); - - nsCOMPtr textEditor = do_QueryInterface(mEditor); - if (textEditor) - { - if (NS_CONTENT_ATTR_NOT_THERE != rv) - { // set the maxLength attribute - textEditor->SetMaxTextLength(maxLength); - // if maxLength>docLength, we need to truncate the doc content - } - else { // unset the maxLength attribute - textEditor->SetMaxTextLength(-1); - } - } - } - else if (mEditor && nsHTMLAtoms::readonly == aAttribute) - { - nsresult rv = DoesAttributeExist(nsHTMLAtoms::readonly); - PRUint32 flags; - mEditor->GetFlags(&flags); - if (NS_CONTENT_ATTR_NOT_THERE != rv) - { // set readonly - flags |= nsIPlaintextEditor::eEditorReadonlyMask; - if (mSelCon) - mSelCon->SetCaretEnabled(PR_FALSE); - } - else - { // unset readonly - flags &= ~(nsIPlaintextEditor::eEditorReadonlyMask); - if (mSelCon && !(flags & nsIPlaintextEditor::eEditorDisabledMask)) - mSelCon->SetCaretEnabled(PR_TRUE); - } - mEditor->SetFlags(flags); - } - else if (mEditor && nsHTMLAtoms::disabled == aAttribute) - { - nsCOMPtr shell; - rv = aPresContext->GetShell(getter_AddRefs(shell)); - if (NS_FAILED(rv)) - return rv; - if (!shell) - return NS_ERROR_FAILURE; - - rv = DoesAttributeExist(nsHTMLAtoms::disabled); - PRUint32 flags; - mEditor->GetFlags(&flags); - if (NS_CONTENT_ATTR_NOT_THERE != rv) - { // set disabled - flags |= nsIPlaintextEditor::eEditorDisabledMask; - if (mSelCon) - { - mSelCon->SetCaretEnabled(PR_FALSE); - mSelCon->SetDisplaySelection(nsISelectionController::SELECTION_OFF); - } - } - else - { // unset disabled - flags &= ~(nsIPlaintextEditor::eEditorDisabledMask); - if (mSelCon) - { - mSelCon->SetDisplaySelection(nsISelectionController::SELECTION_HIDDEN); - } - } - mEditor->SetFlags(flags); - } - else if ((nsHTMLAtoms::size == aAttribute || - nsHTMLAtoms::rows == aAttribute || - nsHTMLAtoms::cols == aAttribute) && aHint != NS_STYLE_HINT_REFLOW) { - // XXX Bug 34573 & 50280 - // The following code should be all we need for these two bugs (it does work for bug 50280) - // This doesn't wrong entirely for rows/cols, the borders don't get painted - // to fix that I have added a REFLOW hint in nsHTMLTextAreaElement::GetMappedAttributeImpact - // but it appears there are some problems when you hold down the return key - mPrefSize.width = -1; - mPrefSize.height = -1; - nsFormControlHelper::StyleChangeReflow(aPresContext, this); - } - // Allow the base class to handle common attributes supported - // by all form elements... - else { - rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); - } - - return rv; -} - - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetText(nsString* aText) -{ - nsresult rv = NS_CONTENT_ATTR_NOT_THERE; - PRInt32 type; - GetType(&type); - if ((NS_FORM_INPUT_TEXT == type) || (NS_FORM_INPUT_PASSWORD == type)) { - // If we're going to remove newlines anyway, ignore the wrap property - GetValue(*aText, PR_TRUE); - RemoveNewlines(*aText); - } else { - nsCOMPtr textArea = do_QueryInterface(mContent); - if (textArea) { - if (mEditor) { - nsCOMPtr imeSupport = do_QueryInterface(mEditor); - if (imeSupport) - imeSupport->ForceCompositionEnd(); - } - rv = textArea->GetValue(*aText); - } - } - return rv; -} - - - -///END NSIFRAME OVERLOADS -/////BEGIN PROTECTED METHODS - -void nsGfxTextControlFrame2::RemoveNewlines(nsString &aString) -{ - // strip CR/LF and null - static const char badChars[] = {10, 13, 0}; - aString.StripChars(badChars); -} - - -nsresult -nsGfxTextControlFrame2::GetMaxLength(PRInt32* aSize) -{ - *aSize = -1; - nsresult rv = NS_CONTENT_ATTR_NOT_THERE; - - nsCOMPtr content(do_QueryInterface(mContent)); - - if (content) { - nsHTMLValue value; - rv = content->GetHTMLAttribute(nsHTMLAtoms::maxlength, value); - if (eHTMLUnit_Integer == value.GetUnit()) { - *aSize = value.GetIntValue(); - } - } - return rv; -} - -nsresult -nsGfxTextControlFrame2::DoesAttributeExist(nsIAtom *aAtt) -{ - nsresult rv = NS_CONTENT_ATTR_NOT_THERE; - - nsCOMPtr content(do_QueryInterface(mContent)); - - if (content) { - nsHTMLValue value; - rv = content->GetHTMLAttribute(aAtt, value); - } - return rv; -} - -// this is where we propagate a content changed event -NS_IMETHODIMP -nsGfxTextControlFrame2::InternalContentChanged() -{ - NS_PRECONDITION(mContent, "illegal to call unless we map to a content node"); - - if (!mContent) { return NS_ERROR_NULL_POINTER; } - - if (PR_FALSE==mNotifyOnInput) { - return NS_OK; // if notification is turned off, just return ok - } - - // Dispatch the change event - nsEventStatus status = nsEventStatus_eIgnore; - nsGUIEvent event; - event.eventStructType = NS_GUI_EVENT; - event.widget = nsnull; - event.message = NS_FORM_INPUT; - event.flags = NS_EVENT_FLAG_INIT; - - // Have the content handle the event, propagating it according to normal DOM rules. - nsWeakPtr &shell = mTextSelImpl->GetPresShell(); - nsCOMPtr presShell = do_QueryReferent(shell); - if (!presShell) - return NS_ERROR_FAILURE; - nsCOMPtr context; - if (NS_SUCCEEDED(presShell->GetPresContext(getter_AddRefs(context))) && context) - return presShell->HandleEventWithTarget(&event, nsnull, mContent, NS_EVENT_FLAG_INIT, &status); - return NS_ERROR_FAILURE; -} - -nsresult -nsGfxTextControlFrame2::InitFocusedValue() -{ - return GetText(&mFocusedValue); -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::CheckFireOnChange() -{ - nsString value; - GetText(&value); - if (!mFocusedValue.Equals(value))//different fire onchange - { - mFocusedValue = value; - FireOnChange(); - } - return NS_OK; -} - -nsresult -nsGfxTextControlFrame2::FireOnChange() -{ - // Dispatch th1e change event - nsCOMPtr content; - if (NS_SUCCEEDED(GetFormContent(*getter_AddRefs(content)))) - { - nsEventStatus status = nsEventStatus_eIgnore; - nsInputEvent event; - event.eventStructType = NS_INPUT_EVENT; - event.widget = nsnull; - event.message = NS_FORM_CHANGE; - event.flags = NS_EVENT_FLAG_INIT; - event.isShift = PR_FALSE; - event.isControl = PR_FALSE; - event.isAlt = PR_FALSE; - event.isMeta = PR_FALSE; - - // Have the content handle the event. - nsWeakPtr &shell = mTextSelImpl->GetPresShell(); - nsCOMPtr presShell = do_QueryReferent(shell); - NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE); - nsCOMPtr context; - if (NS_SUCCEEDED(presShell->GetPresContext(getter_AddRefs(context))) && context) - return presShell->HandleEventWithTarget(&event, nsnull, mContent, NS_EVENT_FLAG_INIT, &status); - } - return NS_OK; -} - - -//====== -//privates - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetValue(nsAString& aValue, PRBool aIgnoreWrap) -{ - aValue.Truncate(); // initialize out param - - if (mEditor && mUseEditor) - { - PRUint32 flags = nsIDocumentEncoder::OutputLFLineBreak;; - - if (PR_TRUE==IsPlainTextControl()) - { - flags |= nsIDocumentEncoder::OutputBodyOnly; - } - - flags |= nsIDocumentEncoder::OutputPreformatted; - - if (!aIgnoreWrap) { - nsFormControlHelper::nsHTMLTextWrap wrapProp; - nsresult rv = nsFormControlHelper::GetWrapPropertyEnum(mContent, wrapProp); - if (rv != NS_CONTENT_ATTR_NOT_THERE) { - if (wrapProp == nsFormControlHelper::eHTMLTextWrap_Hard) - { - flags |= nsIDocumentEncoder::OutputWrap; - } - } - } - - mEditor->OutputToString(NS_LITERAL_STRING("text/plain"), flags, aValue); - } - else - { - // Otherwise get the value from content. - nsCOMPtr inputControl = do_QueryInterface(mContent); - if (inputControl) - { - inputControl->GetValue(aValue); - } - else - { - nsCOMPtr textareaControl - = do_QueryInterface(mContent); - if (textareaControl) - { - textareaControl->GetValue(aValue); - } - } - } - - return NS_OK; -} - - -// END IMPLEMENTING NS_IFORMCONTROLFRAME - -void -nsGfxTextControlFrame2::SetValue(const nsAString& aValue) -{ - if (mEditor && mUseEditor) - { - nsAutoString currentValue; - GetValue(currentValue, PR_FALSE); - if (IsSingleLineTextControl()) - { - RemoveNewlines(currentValue); - } - // this is necessary to avoid infinite recursion - if (!currentValue.Equals(aValue)) - { - nsCOMPtr domSel; - nsCOMPtr selPriv; - mSelCon->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(domSel)); - if (domSel) - { - selPriv = do_QueryInterface(domSel); - if (selPriv) - selPriv->StartBatchChanges(); - } - // \r is an illegal character in the dom, but people use them, - // so convert windows and mac platform linebreaks to \n: - // Unfortunately aValue is declared const, so we have to copy - // in order to do this substitution. - currentValue.Assign(aValue); - nsFormControlHelper::PlatformToDOMLineBreaks(currentValue); - - nsCOMPtrdomDoc; - nsresult rv = mEditor->GetDocument(getter_AddRefs(domDoc)); - if (NS_FAILED(rv)) return; - if (!domDoc) return; - mSelCon->SelectAll(); - nsCOMPtr htmlEditor = do_QueryInterface(mEditor); - if (!htmlEditor) return; - - // get the flags, remove readonly and disabled, set the value, - // restore flags - PRUint32 flags, savedFlags; - mEditor->GetFlags(&savedFlags); - flags = savedFlags; - flags &= ~(nsIPlaintextEditor::eEditorDisabledMask); - flags &= ~(nsIPlaintextEditor::eEditorReadonlyMask); - mEditor->SetFlags(flags); - if (currentValue.Length() < 1) - mEditor->DeleteSelection(nsIEditor::eNone); - else { - nsCOMPtr textEditor = do_QueryInterface(mEditor); - if (textEditor) - textEditor->InsertText(currentValue); - } - mEditor->SetFlags(savedFlags); - if (selPriv) - selPriv->EndBatchChanges(); - } - - if (mScrollableView) - { - // Scroll the upper left corner of the text control's - // content area back into view. - - mScrollableView->ScrollTo(0, 0, NS_VMREFRESH_NO_SYNC); - } - } - else - { - // Otherwise set the value in content. - nsCOMPtr textControl = do_QueryInterface(mContent); - if (textControl) - { - textControl->SetValueGuaranteed(aValue, this); - } - } -} - - -NS_IMETHODIMP -nsGfxTextControlFrame2::SetInitialChildList(nsIPresContext* aPresContext, - nsIAtom* aListName, - nsIFrame* aChildList) -{ - /*nsIFrame *list = aChildList; - nsFrameState frameState; - while (list) - { - list->GetFrameState(&frameState); - frameState |= NS_FRAME_INDEPENDENT_SELECTION; - list->SetFrameState(frameState); - list->GetNextSibling(&list); - } - */ - nsresult rv = nsBoxFrame::SetInitialChildList(aPresContext, aListName, aChildList); - if (mEditor) - mEditor->PostCreate(); - //look for scroll view below this frame go along first child list - nsIFrame *first; - FirstChild(aPresContext,nsnull, &first); - - // Mark the scroll frame as being a reflow root. This will allow - // incremental reflows to be initiated at the scroll frame, rather - // than descending from the root frame of the frame hierarchy. - nsFrameState state; - first->GetFrameState(&state); - state |= NS_FRAME_REFLOW_ROOT; - first->SetFrameState(state); - -//we must turn off scrollbars for singleline text controls - PRInt32 type; - GetType(&type); - if ((NS_FORM_INPUT_TEXT == type) || (NS_FORM_INPUT_PASSWORD == type)) - { - nsIScrollableFrame *scrollableFrame = nsnull; - if (first) - first->QueryInterface(NS_GET_IID(nsIScrollableFrame), (void **) &scrollableFrame); - if (scrollableFrame) - scrollableFrame->SetScrollbarVisibility(aPresContext,PR_FALSE,PR_FALSE); - } - - //register keylistener - nsCOMPtr erP; - if (NS_SUCCEEDED(mContent->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP) - { - // register the event listeners with the DOM event reveiver - rv = erP->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener *,mTextListener), NS_GET_IID(nsIDOMKeyListener)); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register key listener"); - rv = erP->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), NS_GET_IID(nsIDOMFocusListener)); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener"); - nsCOMPtr shell; - nsresult rv = aPresContext->GetShell(getter_AddRefs(shell)); - if (NS_FAILED(rv)) - return rv; - if (!shell) - return NS_ERROR_FAILURE; - } - - while(first) - { - nsIScrollableView *scrollView; - nsIView *view; - first->GetView(aPresContext,&view); - if (view) - { - view->QueryInterface(NS_GET_IID(nsIScrollableView),(void **)&scrollView); - if (scrollView) - { - mScrollableView = scrollView; // Note: views are not addref'd - mTextSelImpl->SetScrollableView(scrollView); - break; - } - } - first->FirstChild(aPresContext,nsnull, &first); - } - - return rv; -} - - -PRInt32 -nsGfxTextControlFrame2::GetWidthInCharacters() const -{ - // see if there's a COL attribute, if so it wins - nsCOMPtr content; - nsresult rv = mContent->QueryInterface(NS_GET_IID(nsIHTMLContent), getter_AddRefs(content)); - if (NS_SUCCEEDED(rv) && content) - { - nsHTMLValue resultValue; - rv = content->GetHTMLAttribute(nsHTMLAtoms::cols, resultValue); - if (NS_CONTENT_ATTR_NOT_THERE != rv) - { - if (resultValue.GetUnit() == eHTMLUnit_Integer) - { - return (resultValue.GetIntValue()); - } - } - } - - // otherwise, see if CSS has a width specified. If so, work backwards to get the - // number of characters this width represents. - - - // otherwise, the default is just returned. - return DEFAULT_COLUMN_WIDTH; -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::GetScrollableView(nsIScrollableView** aView) -{ - nsresult rv = NS_OK; - *aView = mScrollableView; - if (mScrollableView && !IsScrollable()) { - nsIView *view = 0; - nsIScrollableView* scrollableView = 0; - rv = mScrollableView->QueryInterface(NS_GET_IID(nsIView), (void**)&view); - while (view) { - rv = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void **)&scrollableView); - if (NS_SUCCEEDED(rv) && scrollableView) - *aView = scrollableView; - view->GetParent(view); - } - } - return rv; -} - -PRBool -nsGfxTextControlFrame2::IsScrollable() const -{ - return !IsSingleLineTextControl(); -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::OnContentReset() -{ - return NS_OK; -} - -void -nsGfxTextControlFrame2::SetValueChanged(PRBool aValueChanged) -{ - nsCOMPtr elem = do_QueryInterface(mContent); - if (elem) { - elem->SetValueChanged(aValueChanged); - } -} - -NS_IMETHODIMP -nsGfxTextControlFrame2::HandleEvent(nsIPresContext* aPresContext, - nsGUIEvent* aEvent, - nsEventStatus* aEventStatus) -{ - NS_ENSURE_ARG_POINTER(aEventStatus); - - // temp fix until Bug 124990 gets fixed - PRBool isPaginated = PR_FALSE; - aPresContext->IsPaginated(&isPaginated); - if (isPaginated && NS_IS_MOUSE_EVENT(aEvent)) { - return NS_OK; - } - - return nsStackFrame::HandleEvent(aPresContext, aEvent, aEventStatus); - -} - - diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h deleted file mode 100644 index 12dbf8ed1a3..00000000000 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h +++ /dev/null @@ -1,323 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsGfxTextControlFrame2_h___ -#define nsGfxTextControlFrame2_h___ - -#include "nsStackFrame.h" -#include "nsAreaFrame.h" -#include "nsIFormControlFrame.h" -#include "nsIDOMMouseListener.h" -#include "nsIAnonymousContentCreator.h" -#include "nsIEditor.h" -#include "nsIGfxTextControlFrame.h" -#include "nsFormControlHelper.h"//for the inputdimensions -#include "nsHTMLValue.h" //for nsHTMLValue -#include "nsIFontMetrics.h" -#include "nsWeakReference.h" //for service and presshell pointers -#include "nsIScrollableViewProvider.h" - -class nsIPresState; -class nsISupportsArray; -class nsIHTMLContent; -class nsIEditor; -class nsISelectionController; -class nsTextInputSelectionImpl; -class nsTextInputListener; -class nsIDOMCharacterData; -class nsIScrollableView; -#ifdef ACCESSIBILITY -class nsIAccessible; -#endif - - -class nsGfxTextControlFrame2 : public nsStackFrame, - public nsIAnonymousContentCreator, - public nsIGfxTextControlFrame2, - public nsIScrollableViewProvider - -{ -public: - nsGfxTextControlFrame2(nsIPresShell* aShell); - virtual ~nsGfxTextControlFrame2(); - - virtual void RemovedAsPrimaryFrame(nsIPresContext* aPresContext); - - NS_IMETHOD Destroy(nsIPresContext* aPresContext); - - NS_IMETHOD Reflow(nsIPresContext* aPresContext, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); - - NS_IMETHOD Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer, - PRUint32 aFlags = 0); - - NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, - const nsPoint& aPoint, - nsFramePaintLayer aWhichLayer, - nsIFrame** aFrame); - - NS_IMETHOD HandleEvent(nsIPresContext* aPresContext, - nsGUIEvent* aEvent, - nsEventStatus* aEventStatus); - - NS_IMETHOD GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize); - NS_IMETHOD GetMinSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize); - NS_IMETHOD GetMaxSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize); - NS_IMETHOD GetAscent(nsBoxLayoutState& aBoxLayoutState, nscoord& aAscent); -#ifdef ACCESSIBILITY - NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); -#endif - -#ifdef NS_DEBUG - NS_IMETHOD GetFrameName(nsAString& aResult) const - { - aResult = NS_LITERAL_STRING("nsGfxControlFrame2"); - return NS_OK; - } -#endif - - // from nsIAnonymousContentCreator - NS_IMETHOD CreateAnonymousContent(nsIPresContext* aPresContext, - nsISupportsArray& aChildList); - - // Utility methods to set current widget state - void SetValue(const nsAString& aValue); - NS_IMETHOD SetInitialChildList(nsIPresContext* aPresContext, - nsIAtom* aListName, - nsIFrame* aChildList); - -//==== BEGIN NSIFORMCONTROLFRAME - NS_IMETHOD GetType(PRInt32* aType) const; //* - NS_IMETHOD GetName(nsAString* aName);//* - virtual void SetFocus(PRBool aOn , PRBool aRepaint); - virtual void ScrollIntoView(nsIPresContext* aPresContext); - virtual void MouseClicked(nsIPresContext* aPresContext); - virtual nscoord GetVerticalInsidePadding(nsIPresContext* aPresContext, - float aPixToTwip, - nscoord aInnerHeight) const; - virtual nscoord GetHorizontalInsidePadding(nsIPresContext* aPresContext, - float aPixToTwip, - nscoord aInnerWidth, - nscoord aCharWidth) const;/**/ - NS_IMETHOD SetSuggestedSize(nscoord aWidth, nscoord aHeight); - virtual nsresult RequiresWidget(PRBool &aRequiresWidget); - NS_IMETHOD GetFont(nsIPresContext* aPresContext, - const nsFont*& aFont); - NS_IMETHOD GetFormContent(nsIContent*& aContent) const; - NS_IMETHOD SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAString& aValue); - NS_IMETHOD GetProperty(nsIAtom* aName, nsAString& aValue); - NS_IMETHOD OnContentReset(); - - -//==== END NSIFORMCONTROLFRAME - -//==== NSIGFXTEXTCONTROLFRAME2 - - NS_IMETHOD GetEditor(nsIEditor **aEditor); - NS_IMETHOD OwnsValue(PRBool* aOwnsValue); - NS_IMETHOD GetValue(nsAString& aValue, PRBool aIgnoreWrap); - NS_IMETHOD GetTextLength(PRInt32* aTextLength); - NS_IMETHOD CheckFireOnChange(); - NS_IMETHOD SetSelectionStart(PRInt32 aSelectionStart); - NS_IMETHOD SetSelectionEnd(PRInt32 aSelectionEnd); - NS_IMETHOD SetSelectionRange(PRInt32 aSelectionStart, PRInt32 aSelectionEnd); - NS_IMETHOD GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd); - NS_IMETHOD GetSelectionContr(nsISelectionController **aSelCon); - -//==== END NSIGFXTEXTCONTROLFRAME2 -//==== OVERLOAD of nsIFrame - NS_IMETHOD GetFrameType(nsIAtom** aType) const; - - /** handler for attribute changes to mContent */ - NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, - nsIContent* aChild, - PRInt32 aNameSpaceID, - nsIAtom* aAttribute, - PRInt32 aModType, - PRInt32 aHint); - - NS_IMETHOD GetText(nsString* aText); - - NS_DECL_ISUPPORTS_INHERITED - -public: //for methods who access nsGfxTextControlFrame2 directly - - NS_IMETHOD InternalContentChanged();//notify that we have some kind of change. - /** - * Find out whether this is a single line text control. (text or password) - * @return whether this is a single line text control - */ - virtual PRBool IsSingleLineTextControl() const; - /** - * Find out whether this control is a textarea. - * @return whether this is a textarea text control - */ - virtual PRBool IsTextArea() const; - /** - * Find out whether this control edits plain text. (Currently always true.) - * @return whether this is a plain text control - */ - virtual PRBool IsPlainTextControl() const; - /** - * Find out whether this is a password control (input type=password) - * @return whether this is a password ontrol - */ - virtual PRBool IsPasswordTextControl() const; - void SetValueChanged(PRBool aValueChanged); - /** Called when the frame is focused, to remember the value for onChange. */ - nsresult InitFocusedValue(); - -protected: - - /** - * Find out whether this control is scrollable (i.e. if it is not a single - * line text control) - * @return whether this control is scrollable - */ - PRBool IsScrollable() const; - /** - * Initialize mEditor with the proper flags and the default value. - * @throws NS_ERROR_NOT_INITIALIZED if mEditor has not been created - * @throws various and sundry other things - */ - nsresult InitEditor(); - /** - * Strip all \n, \r and nulls from the given string - * @param aString the string to remove newlines from [in/out] - */ - void RemoveNewlines(nsString &aString); - /** - * Get the maxlength attribute - * @param aMaxLength the value of the max length attr - * @throws NS_CONTENT_ATTR_NOT_THERE if attr not defined - */ - nsresult GetMaxLength(PRInt32* aMaxLength); - /** - * Find out whether an attribute exists on the content or not. - * @param aAtt the attribute to determine the existence of - * @throws NS_CONTENT_ATTR_NOT_THERE if it does not exist - */ - nsresult DoesAttributeExist(nsIAtom *aAtt); - /** - * We call this when we are being destroyed or removed from the PFM. - * @param aPresContext the current pres context - */ - void PreDestroy(nsIPresContext* aPresContext); - /** - * Fire the onChange event. - */ - nsresult FireOnChange(); - -//helper methods - nsresult GetSizeFromContent(PRInt32* aSize) const; - PRInt32 GetDefaultColumnWidth() const { return (PRInt32)(20); } // this was DEFAULT_PIXEL_WIDTH - - nsresult GetColRowSizeAttr(nsIFormControlFrame* aFrame, - nsIAtom * aColSizeAttr, - nsHTMLValue & aColSize, - nsresult & aColStatus, - nsIAtom * aRowSizeAttr, - nsHTMLValue & aRowSize, - nsresult & aRowStatus); - - NS_IMETHOD ReflowStandard(nsIPresContext* aPresContext, - nsSize& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus, - nsMargin& aBorder, - nsMargin& aPadding); - - PRInt32 CalculateSizeStandard (nsIPresContext* aPresContext, - nsIRenderingContext* aRendContext, - nsIFormControlFrame* aFrame, - nsInputDimensionSpec& aSpec, - nsSize& aDesiredSize, - nsSize& aMinSize, - nscoord& aRowHeight, - nsMargin& aBorder, - nsMargin& aPadding, - PRBool aIsUsingDefSize); - - NS_IMETHOD CreateFrameFor(nsIPresContext* aPresContext, - nsIContent * aContent, - nsIFrame** aFrame); - - PRInt32 GetWidthInCharacters() const; - - // nsIScrollableViewProvider - NS_IMETHOD GetScrollableView(nsIScrollableView** aView); - -private: - //helper methods - enum { - eIgnoreSelect = -2, - eSelectToEnd = -1 - }; - - NS_IMETHODIMP GetFirstTextNode(nsIDOMCharacterData* *aFirstTextNode); - nsresult SelectAllContents(); - nsresult SetSelectionEndPoints(PRInt32 aSelStart, PRInt32 aSelEnd); - -private: - nsCOMPtr mEditor; - nsCOMPtr mSelCon; - - //cached sizes and states - nscoord mSuggestedWidth; - nscoord mSuggestedHeight; - nsSize mSize; - - // these packed bools could instead use the high order bits on mState, saving 4 bytes - PRPackedBool mUseEditor; - PRPackedBool mIsProcessing; - PRPackedBool mNotifyOnInput;//default this to off to stop any notifications until setup is complete - PRPackedBool mDidPreDestroy; // has PreDestroy been called - - nsTextInputSelectionImpl *mTextSelImpl; - nsTextInputListener *mTextListener; - nsIScrollableView *mScrollableView; - nsString mFocusedValue; -}; - -#endif - - diff --git a/mozilla/layout/html/forms/src/nsIsIndexFrame.h b/mozilla/layout/html/forms/src/nsIsIndexFrame.h index 4be761d4afc..4f615654b51 100644 --- a/mozilla/layout/html/forms/src/nsIsIndexFrame.h +++ b/mozilla/layout/html/forms/src/nsIsIndexFrame.h @@ -45,9 +45,9 @@ #include "nsIUnicodeEncoder.h" #include "nsIDOMKeyListener.h" -#include "nsGfxTextControlFrame2.h" +#include "nsTextControlFrame.h" #include "nsFormControlHelper.h" -typedef nsGfxTextControlFrame2 nsNewFrame; +typedef nsTextControlFrame nsNewFrame; class nsIPresState; class nsISupportsArray; diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp index 0eed3a33031..b09cc5fcf18 100644 --- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp @@ -38,7 +38,7 @@ #include "nsCOMPtr.h" -#include "nsGfxTextControlFrame2.h" +#include "nsTextControlFrame.h" #include "nsIDocument.h" #include "nsIDOMNSHTMLTextAreaElement.h" #include "nsIDOMNSHTMLInputElement.h" @@ -170,7 +170,7 @@ public: /** SetEditor gives an address to the editor that will be accessed * @param aEditor the editor this listener calls for editing operations */ - void SetFrame(nsGfxTextControlFrame2 *aFrame){mFrame = aFrame;} + void SetFrame(nsTextControlFrame *aFrame){mFrame = aFrame;} /*interfaces for addref and release and queryinterface*/ NS_DECL_ISUPPORTS @@ -226,7 +226,7 @@ protected: protected: - nsGfxTextControlFrame2* mFrame; // weak reference + nsTextControlFrame* mFrame; // weak reference PRPackedBool mSelectionWasCollapsed; PRPackedBool mKnowSelectionCollapsed; @@ -1102,7 +1102,7 @@ NS_IMETHODIMP nsTextInputSelectionImpl::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent) { // We should never have a table inside a text control frame! - NS_ASSERTION(PR_TRUE, "Calling HandleTableSelection inside nsGfxTextControlFrame2!"); + NS_ASSERTION(PR_TRUE, "Calling HandleTableSelection inside nsTextControlFrame!"); return NS_OK; } @@ -1254,13 +1254,13 @@ NS_IMETHODIMP nsTextInputSelectionImpl::GetFrameFromLevel(nsIPresContext *aPresC nsresult -NS_NewGfxTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) +NS_NewTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { NS_PRECONDITION(aNewFrame, "null OUT ptr"); if (nsnull == aNewFrame) { return NS_ERROR_NULL_POINTER; } - nsGfxTextControlFrame2* it = new (aPresShell) nsGfxTextControlFrame2(aPresShell); + nsTextControlFrame* it = new (aPresShell) nsTextControlFrame(aPresShell); if (!it) { return NS_ERROR_OUT_OF_MEMORY; } @@ -1268,12 +1268,12 @@ NS_NewGfxTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) return NS_OK; } -NS_IMPL_ADDREF_INHERITED(nsGfxTextControlFrame2, nsBoxFrame); -NS_IMPL_RELEASE_INHERITED(nsGfxTextControlFrame2, nsBoxFrame); +NS_IMPL_ADDREF_INHERITED(nsTextControlFrame, nsBoxFrame); +NS_IMPL_RELEASE_INHERITED(nsTextControlFrame, nsBoxFrame); NS_IMETHODIMP -nsGfxTextControlFrame2::QueryInterface(const nsIID& aIID, void** aInstancePtr) +nsTextControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) { if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; @@ -1286,8 +1286,8 @@ nsGfxTextControlFrame2::QueryInterface(const nsIID& aIID, void** aInstancePtr) *aInstancePtr = (void*)(nsIAnonymousContentCreator*) this; return NS_OK; } - if (aIID.Equals(NS_GET_IID(nsIGfxTextControlFrame2))) { - *aInstancePtr = (void*)(nsIGfxTextControlFrame2*) this; + if (aIID.Equals(NS_GET_IID(nsITextControlFrame))) { + *aInstancePtr = (void*)(nsITextControlFrame*) this; return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider))) { @@ -1299,7 +1299,7 @@ nsGfxTextControlFrame2::QueryInterface(const nsIID& aIID, void** aInstancePtr) } #ifdef ACCESSIBILITY -NS_IMETHODIMP nsGfxTextControlFrame2::GetAccessible(nsIAccessible** aAccessible) +NS_IMETHODIMP nsTextControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -1311,7 +1311,7 @@ NS_IMETHODIMP nsGfxTextControlFrame2::GetAccessible(nsIAccessible** aAccessible) } #endif -nsGfxTextControlFrame2::nsGfxTextControlFrame2(nsIPresShell* aShell):nsStackFrame(aShell) +nsTextControlFrame::nsTextControlFrame(nsIPresShell* aShell):nsStackFrame(aShell) { mUseEditor = PR_FALSE; mIsProcessing = PR_FALSE; @@ -1322,7 +1322,7 @@ nsGfxTextControlFrame2::nsGfxTextControlFrame2(nsIPresShell* aShell):nsStackFram mDidPreDestroy = PR_FALSE; } -nsGfxTextControlFrame2::~nsGfxTextControlFrame2() +nsTextControlFrame::~nsTextControlFrame() { //delete mTextListener; //delete mTextSelImpl; dont delete this since mSelCon will release it. @@ -1369,7 +1369,7 @@ SuppressEventHandlers(nsIPresContext* aPresContext) } void -nsGfxTextControlFrame2::PreDestroy(nsIPresContext* aPresContext) +nsTextControlFrame::PreDestroy(nsIPresContext* aPresContext) { // notify the editor that we are going away if (mEditor) @@ -1447,7 +1447,7 @@ nsGfxTextControlFrame2::PreDestroy(nsIPresContext* aPresContext) } NS_IMETHODIMP -nsGfxTextControlFrame2::Destroy(nsIPresContext* aPresContext) +nsTextControlFrame::Destroy(nsIPresContext* aPresContext) { if (!mDidPreDestroy) { PreDestroy(aPresContext); @@ -1456,7 +1456,7 @@ nsGfxTextControlFrame2::Destroy(nsIPresContext* aPresContext) } void -nsGfxTextControlFrame2::RemovedAsPrimaryFrame(nsIPresContext* aPresContext) +nsTextControlFrame::RemovedAsPrimaryFrame(nsIPresContext* aPresContext) { if (!mDidPreDestroy) { PreDestroy(aPresContext); @@ -1465,7 +1465,7 @@ nsGfxTextControlFrame2::RemovedAsPrimaryFrame(nsIPresContext* aPresContext) } NS_IMETHODIMP -nsGfxTextControlFrame2::GetFrameType(nsIAtom** aType) const +nsTextControlFrame::GetFrameType(nsIAtom** aType) const { NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer"); *aType = nsLayoutAtoms::textInputFrame; @@ -1474,7 +1474,7 @@ nsGfxTextControlFrame2::GetFrameType(nsIAtom** aType) const } // XXX: wouldn't it be nice to get this from the style context! -PRBool nsGfxTextControlFrame2::IsSingleLineTextControl() const +PRBool nsTextControlFrame::IsSingleLineTextControl() const { PRInt32 type; GetType(&type); @@ -1484,7 +1484,7 @@ PRBool nsGfxTextControlFrame2::IsSingleLineTextControl() const return PR_FALSE; } -PRBool nsGfxTextControlFrame2::IsTextArea() const +PRBool nsTextControlFrame::IsTextArea() const { if (!mContent) return PR_FALSE; @@ -1499,13 +1499,13 @@ PRBool nsGfxTextControlFrame2::IsTextArea() const } // XXX: wouldn't it be nice to get this from the style context! -PRBool nsGfxTextControlFrame2::IsPlainTextControl() const +PRBool nsTextControlFrame::IsPlainTextControl() const { // need to check HTML attribute of mContent and/or CSS. return PR_TRUE; } -PRBool nsGfxTextControlFrame2::IsPasswordTextControl() const +PRBool nsTextControlFrame::IsPasswordTextControl() const { PRInt32 type; GetType(&type); @@ -1517,7 +1517,7 @@ PRBool nsGfxTextControlFrame2::IsPasswordTextControl() const nsresult -nsGfxTextControlFrame2::GetColRowSizeAttr(nsIFormControlFrame* aFrame, +nsTextControlFrame::GetColRowSizeAttr(nsIFormControlFrame* aFrame, nsIAtom * aColSizeAttr, nsHTMLValue & aColSize, nsresult & aColStatus, @@ -1550,7 +1550,7 @@ nsGfxTextControlFrame2::GetColRowSizeAttr(nsIFormControlFrame* aFrame, NS_IMETHODIMP -nsGfxTextControlFrame2::ReflowStandard(nsIPresContext* aPresContext, +nsTextControlFrame::ReflowStandard(nsIPresContext* aPresContext, nsSize& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus, @@ -1624,7 +1624,7 @@ nsGfxTextControlFrame2::ReflowStandard(nsIPresContext* aPresContext, PRInt32 -nsGfxTextControlFrame2::CalculateSizeStandard (nsIPresContext* aPresContext, +nsTextControlFrame::CalculateSizeStandard (nsIPresContext* aPresContext, nsIRenderingContext* aRendContext, nsIFormControlFrame* aFrame, nsInputDimensionSpec& aSpec, @@ -1761,7 +1761,7 @@ nsGfxTextControlFrame2::CalculateSizeStandard (nsIPresContext* aPresContex //------------------------------------------------------------------ NS_IMETHODIMP -nsGfxTextControlFrame2::CreateFrameFor(nsIPresContext* aPresContext, +nsTextControlFrame::CreateFrameFor(nsIPresContext* aPresContext, nsIContent * aContent, nsIFrame** aFrame) { @@ -1770,7 +1770,7 @@ nsGfxTextControlFrame2::CreateFrameFor(nsIPresContext* aPresContext, } nsresult -nsGfxTextControlFrame2::InitEditor() +nsTextControlFrame::InitEditor() { // This method must be called during/after the text // control frame's initial reflow to avoid any unintened @@ -1867,7 +1867,7 @@ nsGfxTextControlFrame2::InitEditor() "" NS_IMETHODIMP -nsGfxTextControlFrame2::CreateAnonymousContent(nsIPresContext* aPresContext, +nsTextControlFrame::CreateAnonymousContent(nsIPresContext* aPresContext, nsISupportsArray& aChildList) { // Get the PresShell @@ -2196,12 +2196,12 @@ nsGfxTextControlFrame2::CreateAnonymousContent(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsGfxTextControlFrame2::Reflow(nsIPresContext* aPresContext, +nsTextControlFrame::Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) { - DO_GLOBAL_REFLOW_COUNT("nsGfxTextControlFrame2", aReflowState.reason); + DO_GLOBAL_REFLOW_COUNT("nsTextControlFrame", aReflowState.reason); DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus); InitEditor(); @@ -2229,7 +2229,7 @@ nsGfxTextControlFrame2::Reflow(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsGfxTextControlFrame2::Paint(nsIPresContext* aPresContext, +nsTextControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer, @@ -2247,12 +2247,12 @@ nsGfxTextControlFrame2::Paint(nsIPresContext* aPresContext, if (NS_FAILED(rv)) return rv; rv = nsStackFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, NS_FRAME_PAINT_LAYER_FOREGROUND); } - DO_GLOBAL_REFLOW_COUNT_DSP("nsGfxTextControlFrame2", &aRenderingContext); + DO_GLOBAL_REFLOW_COUNT_DSP("nsTextControlFrame", &aRenderingContext); return rv; } NS_IMETHODIMP -nsGfxTextControlFrame2::GetFrameForPoint(nsIPresContext* aPresContext, +nsTextControlFrame::GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, nsFramePaintLayer aWhichLayer, nsIFrame** aFrame) @@ -2274,7 +2274,7 @@ nsGfxTextControlFrame2::GetFrameForPoint(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsGfxTextControlFrame2::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize) +nsTextControlFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize) { if (!DoesNeedRecalc(mPrefSize)) { aSize = mPrefSize; @@ -2342,7 +2342,7 @@ nsGfxTextControlFrame2::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize) NS_IMETHODIMP -nsGfxTextControlFrame2::GetMinSize(nsBoxLayoutState& aState, nsSize& aSize) +nsTextControlFrame::GetMinSize(nsBoxLayoutState& aState, nsSize& aSize) { #define FIX_FOR_BUG_40596 #ifdef FIX_FOR_BUG_40596 @@ -2354,13 +2354,13 @@ nsGfxTextControlFrame2::GetMinSize(nsBoxLayoutState& aState, nsSize& aSize) } NS_IMETHODIMP -nsGfxTextControlFrame2::GetMaxSize(nsBoxLayoutState& aState, nsSize& aSize) +nsTextControlFrame::GetMaxSize(nsBoxLayoutState& aState, nsSize& aSize) { return nsBox::GetMaxSize(aState, aSize); } NS_IMETHODIMP -nsGfxTextControlFrame2::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent) +nsTextControlFrame::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent) { nsSize size; nsresult rv = GetPrefSize(aState, size); @@ -2370,7 +2370,7 @@ nsGfxTextControlFrame2::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent) //IMPLEMENTING NS_IFORMCONTROLFRAME NS_IMETHODIMP -nsGfxTextControlFrame2::GetName(nsAString* aResult) +nsTextControlFrame::GetName(nsAString* aResult) { nsresult rv = NS_FORM_NOTOK; if (mContent) { @@ -2391,7 +2391,7 @@ nsGfxTextControlFrame2::GetName(nsAString* aResult) } NS_IMETHODIMP -nsGfxTextControlFrame2::GetType(PRInt32* aType) const +nsTextControlFrame::GetType(PRInt32* aType) const { nsresult rv = NS_FORM_NOTOK; if (mContent) { @@ -2406,7 +2406,7 @@ nsGfxTextControlFrame2::GetType(PRInt32* aType) const } nsresult -nsGfxTextControlFrame2::GetSizeFromContent(PRInt32* aSize) const +nsTextControlFrame::GetSizeFromContent(PRInt32* aSize) const { *aSize = -1; nsresult result = NS_CONTENT_ATTR_NOT_THERE; @@ -2438,9 +2438,9 @@ nsGfxTextControlFrame2::GetSizeFromContent(PRInt32* aSize) const return result; } -void nsGfxTextControlFrame2::SetFocus(PRBool aOn , PRBool aRepaint){} +void nsTextControlFrame::SetFocus(PRBool aOn , PRBool aRepaint){} -void nsGfxTextControlFrame2::ScrollIntoView(nsIPresContext* aPresContext) +void nsTextControlFrame::ScrollIntoView(nsIPresContext* aPresContext) { if (aPresContext) { nsCOMPtr presShell; @@ -2452,10 +2452,10 @@ void nsGfxTextControlFrame2::ScrollIntoView(nsIPresContext* aPresContext) } } -void nsGfxTextControlFrame2::MouseClicked(nsIPresContext* aPresContext){} +void nsTextControlFrame::MouseClicked(nsIPresContext* aPresContext){} nscoord -nsGfxTextControlFrame2::GetVerticalInsidePadding(nsIPresContext* aPresContext, +nsTextControlFrame::GetVerticalInsidePadding(nsIPresContext* aPresContext, float aPixToTwip, nscoord aInnerHeight) const { @@ -2465,7 +2465,7 @@ nsGfxTextControlFrame2::GetVerticalInsidePadding(nsIPresContext* aPresContext, //--------------------------------------------------------- nscoord -nsGfxTextControlFrame2::GetHorizontalInsidePadding(nsIPresContext* aPresContext, +nsTextControlFrame::GetHorizontalInsidePadding(nsIPresContext* aPresContext, float aPixToTwip, nscoord aInnerWidth, nscoord aCharWidth) const @@ -2475,7 +2475,7 @@ nsGfxTextControlFrame2::GetHorizontalInsidePadding(nsIPresContext* aPresContext, NS_IMETHODIMP -nsGfxTextControlFrame2::SetSuggestedSize(nscoord aWidth, nscoord aHeight) +nsTextControlFrame::SetSuggestedSize(nscoord aWidth, nscoord aHeight) { mSuggestedWidth = aWidth; mSuggestedHeight = aHeight; @@ -2483,21 +2483,21 @@ nsGfxTextControlFrame2::SetSuggestedSize(nscoord aWidth, nscoord aHeight) } nsresult -nsGfxTextControlFrame2::RequiresWidget(PRBool& aRequiresWidget) +nsTextControlFrame::RequiresWidget(PRBool& aRequiresWidget) { aRequiresWidget = PR_FALSE; return NS_OK; } NS_IMETHODIMP -nsGfxTextControlFrame2::GetFont(nsIPresContext* aPresContext, +nsTextControlFrame::GetFont(nsIPresContext* aPresContext, const nsFont*& aFont) { return nsFormControlHelper::GetFont(this, aPresContext, mStyleContext, aFont); } NS_IMETHODIMP -nsGfxTextControlFrame2::GetFormContent(nsIContent*& aContent) const +nsTextControlFrame::GetFormContent(nsIContent*& aContent) const { nsIContent* content; nsresult rv; @@ -2507,7 +2507,7 @@ nsGfxTextControlFrame2::GetFormContent(nsIContent*& aContent) const return rv; } -NS_IMETHODIMP nsGfxTextControlFrame2::SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAString& aValue) +NS_IMETHODIMP nsTextControlFrame::SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAString& aValue) { if (!mIsProcessing)//some kind of lock. { @@ -2539,7 +2539,7 @@ NS_IMETHODIMP nsGfxTextControlFrame2::SetProperty(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsGfxTextControlFrame2::GetProperty(nsIAtom* aName, nsAString& aValue) +nsTextControlFrame::GetProperty(nsIAtom* aName, nsAString& aValue) { // Return the value of the property from the widget it is not null. // If widget is null, assume the widget is GFX-rendered and return a member variable instead. @@ -2553,7 +2553,7 @@ nsGfxTextControlFrame2::GetProperty(nsIAtom* aName, nsAString& aValue) NS_IMETHODIMP -nsGfxTextControlFrame2::GetEditor(nsIEditor **aEditor) +nsTextControlFrame::GetEditor(nsIEditor **aEditor) { NS_ENSURE_ARG_POINTER(aEditor); *aEditor = mEditor; @@ -2562,7 +2562,7 @@ nsGfxTextControlFrame2::GetEditor(nsIEditor **aEditor) } NS_IMETHODIMP -nsGfxTextControlFrame2::OwnsValue(PRBool* aOwnsValue) +nsTextControlFrame::OwnsValue(PRBool* aOwnsValue) { NS_PRECONDITION(aOwnsValue, "aOwnsValue must be non-null"); *aOwnsValue = mUseEditor; @@ -2570,7 +2570,7 @@ nsGfxTextControlFrame2::OwnsValue(PRBool* aOwnsValue) } NS_IMETHODIMP -nsGfxTextControlFrame2::GetTextLength(PRInt32* aTextLength) +nsTextControlFrame::GetTextLength(PRInt32* aTextLength) { NS_ENSURE_ARG_POINTER(aTextLength); @@ -2583,7 +2583,7 @@ nsGfxTextControlFrame2::GetTextLength(PRInt32* aTextLength) NS_IMETHODIMP -nsGfxTextControlFrame2::GetFirstTextNode(nsIDOMCharacterData* *aFirstTextNode) +nsTextControlFrame::GetFirstTextNode(nsIDOMCharacterData* *aFirstTextNode) { if (!mEditor) return NS_ERROR_NOT_INITIALIZED; @@ -2621,7 +2621,7 @@ nsGfxTextControlFrame2::GetFirstTextNode(nsIDOMCharacterData* *aFirstTextNode) nsresult -nsGfxTextControlFrame2::SelectAllContents() +nsTextControlFrame::SelectAllContents() { nsresult rv; @@ -2643,7 +2643,7 @@ nsGfxTextControlFrame2::SelectAllContents() nsresult -nsGfxTextControlFrame2::SetSelectionEndPoints(PRInt32 aSelStart, PRInt32 aSelEnd) +nsTextControlFrame::SetSelectionEndPoints(PRInt32 aSelStart, PRInt32 aSelEnd) { NS_ASSERTION(IsSingleLineTextControl() || IsTextArea(), "Should only call this on a single line input"); NS_ASSERTION(mEditor, "Should have an editor here"); @@ -2744,7 +2744,7 @@ nsGfxTextControlFrame2::SetSelectionEndPoints(PRInt32 aSelStart, PRInt32 aSelEnd } NS_IMETHODIMP -nsGfxTextControlFrame2::SetSelectionRange(PRInt32 aSelStart, PRInt32 aSelEnd) +nsTextControlFrame::SetSelectionRange(PRInt32 aSelStart, PRInt32 aSelEnd) { if (!IsSingleLineTextControl()) return NS_ERROR_NOT_IMPLEMENTED; @@ -2757,7 +2757,7 @@ nsGfxTextControlFrame2::SetSelectionRange(PRInt32 aSelStart, PRInt32 aSelEnd) NS_IMETHODIMP -nsGfxTextControlFrame2::SetSelectionStart(PRInt32 aSelectionStart) +nsTextControlFrame::SetSelectionStart(PRInt32 aSelectionStart) { if (!IsSingleLineTextControl() && !IsTextArea()) return NS_ERROR_NOT_IMPLEMENTED; @@ -2769,7 +2769,7 @@ nsGfxTextControlFrame2::SetSelectionStart(PRInt32 aSelectionStart) } NS_IMETHODIMP -nsGfxTextControlFrame2::SetSelectionEnd(PRInt32 aSelectionEnd) +nsTextControlFrame::SetSelectionEnd(PRInt32 aSelectionEnd) { if (!IsSingleLineTextControl() && !IsTextArea()) return NS_ERROR_NOT_IMPLEMENTED; @@ -2782,7 +2782,7 @@ nsGfxTextControlFrame2::SetSelectionEnd(PRInt32 aSelectionEnd) NS_IMETHODIMP -nsGfxTextControlFrame2::GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd) +nsTextControlFrame::GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd) { NS_ENSURE_ARG_POINTER((aSelectionStart && aSelectionEnd)); @@ -2879,7 +2879,7 @@ nsGfxTextControlFrame2::GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSe NS_IMETHODIMP -nsGfxTextControlFrame2::GetSelectionContr(nsISelectionController **aSelCon) +nsTextControlFrame::GetSelectionContr(nsISelectionController **aSelCon) { NS_ENSURE_ARG_POINTER(aSelCon); NS_IF_ADDREF(*aSelCon = mSelCon); @@ -2891,7 +2891,7 @@ nsGfxTextControlFrame2::GetSelectionContr(nsISelectionController **aSelCon) ////NSIFRAME NS_IMETHODIMP -nsGfxTextControlFrame2::AttributeChanged(nsIPresContext* aPresContext, +nsTextControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, @@ -2999,7 +2999,7 @@ nsGfxTextControlFrame2::AttributeChanged(nsIPresContext* aPresContext, NS_IMETHODIMP -nsGfxTextControlFrame2::GetText(nsString* aText) +nsTextControlFrame::GetText(nsString* aText) { nsresult rv = NS_CONTENT_ATTR_NOT_THERE; PRInt32 type; @@ -3027,7 +3027,7 @@ nsGfxTextControlFrame2::GetText(nsString* aText) ///END NSIFRAME OVERLOADS /////BEGIN PROTECTED METHODS -void nsGfxTextControlFrame2::RemoveNewlines(nsString &aString) +void nsTextControlFrame::RemoveNewlines(nsString &aString) { // strip CR/LF and null static const char badChars[] = {10, 13, 0}; @@ -3036,7 +3036,7 @@ void nsGfxTextControlFrame2::RemoveNewlines(nsString &aString) nsresult -nsGfxTextControlFrame2::GetMaxLength(PRInt32* aSize) +nsTextControlFrame::GetMaxLength(PRInt32* aSize) { *aSize = -1; nsresult rv = NS_CONTENT_ATTR_NOT_THERE; @@ -3054,7 +3054,7 @@ nsGfxTextControlFrame2::GetMaxLength(PRInt32* aSize) } nsresult -nsGfxTextControlFrame2::DoesAttributeExist(nsIAtom *aAtt) +nsTextControlFrame::DoesAttributeExist(nsIAtom *aAtt) { nsresult rv = NS_CONTENT_ATTR_NOT_THERE; @@ -3069,7 +3069,7 @@ nsGfxTextControlFrame2::DoesAttributeExist(nsIAtom *aAtt) // this is where we propagate a content changed event NS_IMETHODIMP -nsGfxTextControlFrame2::InternalContentChanged() +nsTextControlFrame::InternalContentChanged() { NS_PRECONDITION(mContent, "illegal to call unless we map to a content node"); @@ -3099,13 +3099,13 @@ nsGfxTextControlFrame2::InternalContentChanged() } nsresult -nsGfxTextControlFrame2::InitFocusedValue() +nsTextControlFrame::InitFocusedValue() { return GetText(&mFocusedValue); } NS_IMETHODIMP -nsGfxTextControlFrame2::CheckFireOnChange() +nsTextControlFrame::CheckFireOnChange() { nsString value; GetText(&value); @@ -3118,7 +3118,7 @@ nsGfxTextControlFrame2::CheckFireOnChange() } nsresult -nsGfxTextControlFrame2::FireOnChange() +nsTextControlFrame::FireOnChange() { // Dispatch th1e change event nsCOMPtr content; @@ -3151,7 +3151,7 @@ nsGfxTextControlFrame2::FireOnChange() //privates NS_IMETHODIMP -nsGfxTextControlFrame2::GetValue(nsAString& aValue, PRBool aIgnoreWrap) +nsTextControlFrame::GetValue(nsAString& aValue, PRBool aIgnoreWrap) { aValue.Truncate(); // initialize out param @@ -3205,7 +3205,7 @@ nsGfxTextControlFrame2::GetValue(nsAString& aValue, PRBool aIgnoreWrap) // END IMPLEMENTING NS_IFORMCONTROLFRAME void -nsGfxTextControlFrame2::SetValue(const nsAString& aValue) +nsTextControlFrame::SetValue(const nsAString& aValue) { if (mEditor && mUseEditor) { @@ -3283,7 +3283,7 @@ nsGfxTextControlFrame2::SetValue(const nsAString& aValue) NS_IMETHODIMP -nsGfxTextControlFrame2::SetInitialChildList(nsIPresContext* aPresContext, +nsTextControlFrame::SetInitialChildList(nsIPresContext* aPresContext, nsIAtom* aListName, nsIFrame* aChildList) { @@ -3364,7 +3364,7 @@ nsGfxTextControlFrame2::SetInitialChildList(nsIPresContext* aPresContext, PRInt32 -nsGfxTextControlFrame2::GetWidthInCharacters() const +nsTextControlFrame::GetWidthInCharacters() const { // see if there's a COL attribute, if so it wins nsCOMPtr content; @@ -3391,7 +3391,7 @@ nsGfxTextControlFrame2::GetWidthInCharacters() const } NS_IMETHODIMP -nsGfxTextControlFrame2::GetScrollableView(nsIScrollableView** aView) +nsTextControlFrame::GetScrollableView(nsIScrollableView** aView) { nsresult rv = NS_OK; *aView = mScrollableView; @@ -3410,19 +3410,19 @@ nsGfxTextControlFrame2::GetScrollableView(nsIScrollableView** aView) } PRBool -nsGfxTextControlFrame2::IsScrollable() const +nsTextControlFrame::IsScrollable() const { return !IsSingleLineTextControl(); } NS_IMETHODIMP -nsGfxTextControlFrame2::OnContentReset() +nsTextControlFrame::OnContentReset() { return NS_OK; } void -nsGfxTextControlFrame2::SetValueChanged(PRBool aValueChanged) +nsTextControlFrame::SetValueChanged(PRBool aValueChanged) { nsCOMPtr elem = do_QueryInterface(mContent); if (elem) { @@ -3431,7 +3431,7 @@ nsGfxTextControlFrame2::SetValueChanged(PRBool aValueChanged) } NS_IMETHODIMP -nsGfxTextControlFrame2::HandleEvent(nsIPresContext* aPresContext, +nsTextControlFrame::HandleEvent(nsIPresContext* aPresContext, nsGUIEvent* aEvent, nsEventStatus* aEventStatus) { diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.h b/mozilla/layout/html/forms/src/nsTextControlFrame.h index 12dbf8ed1a3..eaa334791b6 100644 --- a/mozilla/layout/html/forms/src/nsTextControlFrame.h +++ b/mozilla/layout/html/forms/src/nsTextControlFrame.h @@ -35,8 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -#ifndef nsGfxTextControlFrame2_h___ -#define nsGfxTextControlFrame2_h___ +#ifndef nsTextControlFrame_h___ +#define nsTextControlFrame_h___ #include "nsStackFrame.h" #include "nsAreaFrame.h" @@ -44,7 +44,7 @@ #include "nsIDOMMouseListener.h" #include "nsIAnonymousContentCreator.h" #include "nsIEditor.h" -#include "nsIGfxTextControlFrame.h" +#include "nsITextControlFrame.h" #include "nsFormControlHelper.h"//for the inputdimensions #include "nsHTMLValue.h" //for nsHTMLValue #include "nsIFontMetrics.h" @@ -65,15 +65,15 @@ class nsIAccessible; #endif -class nsGfxTextControlFrame2 : public nsStackFrame, +class nsTextControlFrame : public nsStackFrame, public nsIAnonymousContentCreator, - public nsIGfxTextControlFrame2, + public nsITextControlFrame, public nsIScrollableViewProvider { public: - nsGfxTextControlFrame2(nsIPresShell* aShell); - virtual ~nsGfxTextControlFrame2(); + nsTextControlFrame(nsIPresShell* aShell); + virtual ~nsTextControlFrame(); virtual void RemovedAsPrimaryFrame(nsIPresContext* aPresContext); @@ -179,7 +179,7 @@ public: NS_DECL_ISUPPORTS_INHERITED -public: //for methods who access nsGfxTextControlFrame2 directly +public: //for methods who access nsTextControlFrame directly NS_IMETHOD InternalContentChanged();//notify that we have some kind of change. /** diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 335bd1d4df2..a260bdc9e6b 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -4139,7 +4139,7 @@ nsCSSFrameConstructor::ConstructTextControlFrame(nsIPresShell* aPresShell, aPresContext->GetWidgetRenderingMode(&mode); if (eWidgetRendering_Gfx == mode) { - rv = NS_NewGfxTextControlFrame(aPresShell, &aNewFrame); + rv = NS_NewTextControlFrame(aPresShell, &aNewFrame); if (NS_FAILED(rv)) { aNewFrame = nsnull; } diff --git a/mozilla/layout/macbuild/layout.xml b/mozilla/layout/macbuild/layout.xml index f70aa64da22..3278633313f 100644 --- a/mozilla/layout/macbuild/layout.xml +++ b/mozilla/layout/macbuild/layout.xml @@ -1741,7 +1741,7 @@ Name - nsGfxTextControlFrame2.cpp + nsTextControlFrame.cpp MacOS Text Debug @@ -2697,7 +2697,7 @@ Name - nsGfxTextControlFrame2.cpp + nsTextControlFrame.cpp MacOS @@ -4640,7 +4640,7 @@ Name - nsGfxTextControlFrame2.cpp + nsTextControlFrame.cpp MacOS Text Debug @@ -5596,7 +5596,7 @@ Name - nsGfxTextControlFrame2.cpp + nsTextControlFrame.cpp MacOS @@ -6295,7 +6295,7 @@ layout.shlb Name - nsGfxTextControlFrame2.cpp + nsTextControlFrame.cpp MacOS