mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Change ns(I)GfxTextControlFrame(2) -> ns(I)TextControlFrame (bug 129909), r=rods 

@netscape.com, sr=bzbarsky@mit.edu, a=asa
This commit is contained in:
jkeiser%netscape.com 2002-07-26 20:57:24 +00:00
Родитель 425acabeaf
Коммит 252470c837
33 изменённых файлов: 237 добавлений и 288 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
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<nsIContent> content(do_QueryInterface(mDOMNode));
nsIFrame *frame = nsnull;
shell->GetPrimaryFrameFor(content, &frame);
nsCOMPtr<nsIGfxTextControlFrame2> tframe(do_QueryInterface(frame));
nsCOMPtr<nsITextControlFrame> tframe(do_QueryInterface(frame));
if (!tframe)
return;
@ -463,7 +463,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::MakeSelection(PRInt32 aStartPos, PRInt3
nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
nsIFrame *frame = nsnull;
shell->GetPrimaryFrameFor(content, &frame);
nsCOMPtr<nsIGfxTextControlFrame2> tframe(do_QueryInterface(frame));
nsCOMPtr<nsITextControlFrame> tframe(do_QueryInterface(frame));
if (!tframe)
return NS_ERROR_FAILURE;

4
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).

19
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)

20
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<nsIFormControlFrame> formControlFrame = getter_AddRefs(GetFormControlFrame(PR_TRUE));
nsCOMPtr<nsIGfxTextControlFrame2>
nsCOMPtr<nsITextControlFrame>
textControlFrame(do_QueryInterface(formControlFrame));
if (textControlFrame) {
@ -873,7 +873,7 @@ nsHTMLTextAreaElement::SetSelectionStart(PRInt32 aSelectionStart)
{
nsCOMPtr<nsIFormControlFrame> formControlFrame = getter_AddRefs(GetFormControlFrame(PR_TRUE));
nsCOMPtr<nsIGfxTextControlFrame2>
nsCOMPtr<nsITextControlFrame>
textControlFrame(do_QueryInterface(formControlFrame));
if (textControlFrame)
@ -888,7 +888,7 @@ nsHTMLTextAreaElement::GetSelectionEnd(PRInt32 *aSelectionEnd)
NS_ENSURE_ARG_POINTER(aSelectionEnd);
nsCOMPtr<nsIFormControlFrame> formControlFrame = getter_AddRefs(GetFormControlFrame(PR_TRUE));
nsCOMPtr<nsIGfxTextControlFrame2>
nsCOMPtr<nsITextControlFrame>
textControlFrame(do_QueryInterface(formControlFrame));
if (textControlFrame) {
@ -904,7 +904,7 @@ nsHTMLTextAreaElement::SetSelectionEnd(PRInt32 aSelectionEnd)
{
nsCOMPtr<nsIFormControlFrame> formControlFrame = getter_AddRefs(GetFormControlFrame(PR_TRUE));
nsCOMPtr<nsIGfxTextControlFrame2>
nsCOMPtr<nsITextControlFrame>
textControlFrame(do_QueryInterface(formControlFrame));
if (textControlFrame)

2
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;
}

4
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;

2
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

2
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)

4
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;

160
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<nsIAccessibilityService> 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<nsIPresShell> 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<nsIContent> 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<nsIHTMLContent> 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<nsITextControlElement> 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)
{

16
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.
/**

6
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);
}

6
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 <div> used by <inputs> never gets scrollbars.
nsCOMPtr<nsIGfxTextControlFrame2> textFrame(do_QueryInterface(mParent));
nsCOMPtr<nsITextControlFrame> textFrame(do_QueryInterface(mParent));
if (textFrame) {
// Make sure we are not a text area.
nsCOMPtr<nsIContent> content;
@ -1312,7 +1312,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
frame->GetStyleData(eStyleStruct_Visibility, (const nsStyleStruct*&)ourVis);
if (NS_STYLE_DIRECTION_RTL == ourVis->mDirection) {
nsCOMPtr<nsIGfxTextControlFrame2> textControl(
nsCOMPtr<nsITextControlFrame> textControl(
do_QueryInterface(mOuter->mParent) );
if (textControl) {
needsLayout = PR_TRUE;

2
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);

6
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);
}

6
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 <div> used by <inputs> never gets scrollbars.
nsCOMPtr<nsIGfxTextControlFrame2> textFrame(do_QueryInterface(mParent));
nsCOMPtr<nsITextControlFrame> textFrame(do_QueryInterface(mParent));
if (textFrame) {
// Make sure we are not a text area.
nsCOMPtr<nsIContent> content;
@ -1312,7 +1312,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
frame->GetStyleData(eStyleStruct_Visibility, (const nsStyleStruct*&)ourVis);
if (NS_STYLE_DIRECTION_RTL == ourVis->mDirection) {
nsCOMPtr<nsIGfxTextControlFrame2> textControl(
nsCOMPtr<nsITextControlFrame> textControl(
do_QueryInterface(mOuter->mParent) );
if (textControl) {
needsLayout = PR_TRUE;

2
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);

14
layout/html/forms/public/MANIFEST
Просмотреть файл

@ -1,14 +0,0 @@
#
# This is a list of local files which get copied to the mozilla:dist:layout directory
#
nsIComboboxControlFrame.h
nsIListControlFrame.h
nsIFormControlFrame.h
nsIRadioControlFrame.h
nsICheckboxControlFrame.h
nsIFormSubmitObserver.h
nsIFormProcessor.h
nsISelectControlFrame.h
nsIGfxTextControlFrame.h
nsIImageControlFrame.h

2
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

38
layout/html/forms/public/makefile.win
Просмотреть файл

@ -1,38 +0,0 @@
#!nmake
#
# 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 Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
DEPTH=..\..\..\..
EXPORTS=nsIListControlFrame.h \
nsIImageControlFrame.h \
nsIComboboxControlFrame.h \
nsIRadioControlFrame.h \
nsICheckboxControlFrame.h \
nsIFormControlFrame.h \
nsIFormSubmitObserver.h \
nsIFormProcessor.h \
nsISelectControlFrame.h \
nsIGfxTextControlFrame.h
MODULE=layout
include <$(DEPTH)\config\rules.mak>

0
layout/html/forms/public/nsIGfxTextControlFrame.h
Просмотреть файл

2
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)

2
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 \

2
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 \

4
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;

2
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

0
layout/html/forms/src/nsGfxTextControlFrame2.cpp
Просмотреть файл

0
layout/html/forms/src/nsGfxTextControlFrame2.h
Просмотреть файл

4
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;

160
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<nsIAccessibilityService> 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<nsIPresShell> 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<nsIContent> 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<nsIHTMLContent> 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<nsITextControlElement> 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)
{

16
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.
/**

2
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;
}

10
layout/macbuild/layout.xml
Просмотреть файл

@ -1741,7 +1741,7 @@
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsGfxTextControlFrame2.cpp</PATH>
<PATH>nsTextControlFrame.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
@ -2697,7 +2697,7 @@
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsGfxTextControlFrame2.cpp</PATH>
<PATH>nsTextControlFrame.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
@ -4640,7 +4640,7 @@
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsGfxTextControlFrame2.cpp</PATH>
<PATH>nsTextControlFrame.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
@ -5596,7 +5596,7 @@
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsGfxTextControlFrame2.cpp</PATH>
<PATH>nsTextControlFrame.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
@ -6295,7 +6295,7 @@
<FILEREF>
<TARGETNAME>layout.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsGfxTextControlFrame2.cpp</PATH>
<PATH>nsTextControlFrame.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUP>