diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 3f5be285bad..ea3e9e1dd73 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -3512,7 +3512,6 @@ nsCSSFrameConstructor::FindHTMLData(Element* aElement, SIMPLE_TAG_CREATE(video, NS_NewHTMLVideoFrame), SIMPLE_TAG_CREATE(audio, NS_NewHTMLVideoFrame), #endif - SIMPLE_TAG_CREATE(isindex, NS_NewIsIndexFrame), SIMPLE_TAG_CREATE(progress, NS_NewProgressFrame) }; diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index 6fb5c1f0797..ef73a56765e 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -78,7 +78,6 @@ CPPSRCS = \ nsImageControlFrame.cpp \ nsLegendFrame.cpp \ nsListControlFrame.cpp \ - nsIsIndexFrame.cpp \ nsSelectsAreaFrame.cpp \ $(NULL) diff --git a/layout/forms/nsIsIndexFrame.cpp b/layout/forms/nsIsIndexFrame.cpp deleted file mode 100644 index 3d960d92815..00000000000 --- a/layout/forms/nsIsIndexFrame.cpp +++ /dev/null @@ -1,578 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla 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/MPL/ - * - * 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 of 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 MPL, 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 MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsIsIndexFrame.h" - -#include "nsIContent.h" -#include "prtypes.h" -#include "nsIAtom.h" -#include "nsPresContext.h" -#include "nsGkAtoms.h" -#include "nsPresState.h" -#include "nsWidgetsCID.h" -#include "nsIComponentManager.h" -#include "nsHTMLParts.h" -#include "nsIDOMHTMLInputElement.h" -#include "nsINameSpaceManager.h" -#include "nsCOMPtr.h" -#include "nsIDOMElement.h" -#include "nsIDOMDocument.h" -#include "nsIDocument.h" -#include "nsIPresShell.h" -#include "nsIDOMHTMLInputElement.h" -#include "nsIStatefulFrame.h" -#include "nsXPCOM.h" -#include "nsISupportsPrimitives.h" -#include "nsIComponentManager.h" -#include "nsHTMLParts.h" -#include "nsLinebreakConverter.h" -#include "nsIHTMLDocument.h" -#include "nsXPIDLString.h" -#include "nsReadableUtils.h" -#include "nsNetUtil.h" -#include "nsICharsetConverterManager.h" -#include "nsEscape.h" -#include "nsIDOMKeyListener.h" -#include "nsIDOMKeyEvent.h" -#include "nsIFormControlFrame.h" -#include "nsINodeInfo.h" -#include "nsIDOMEventTarget.h" -#include "nsContentCID.h" -#include "nsNodeInfoManager.h" -#include "nsContentCreatorFunctions.h" -#include "nsContentUtils.h" -#include "nsLayoutErrors.h" - -namespace dom = mozilla::dom; - -nsIFrame* -NS_NewIsIndexFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) -{ - return new (aPresShell) nsIsIndexFrame(aContext); -} - -NS_IMPL_FRAMEARENA_HELPERS(nsIsIndexFrame) - -nsIsIndexFrame::nsIsIndexFrame(nsStyleContext* aContext) : - nsBlockFrame(aContext) -{ - SetFlags(NS_BLOCK_FLOAT_MGR); -} - -nsIsIndexFrame::~nsIsIndexFrame() -{ -} - -void -nsIsIndexFrame::DestroyFrom(nsIFrame* aDestructRoot) -{ - // remove ourself as a listener of the text control (bug 40533) - if (mInputContent) { - if (mListener) { - mInputContent->RemoveEventListenerByIID(mListener, NS_GET_IID(nsIDOMKeyListener)); - } - nsContentUtils::DestroyAnonymousContent(&mInputContent); - } - nsContentUtils::DestroyAnonymousContent(&mTextContent); - nsContentUtils::DestroyAnonymousContent(&mPreHr); - nsContentUtils::DestroyAnonymousContent(&mPostHr); - nsBlockFrame::DestroyFrom(aDestructRoot); -} - -// REVIEW: We don't need to override BuildDisplayList, nsBlockFrame will honour -// our visibility setting - -nsresult -nsIsIndexFrame::UpdatePromptLabel(PRBool aNotify) -{ - if (!mTextContent) return NS_ERROR_UNEXPECTED; - - nsresult result = NS_OK; - - // Get the text from the "prompt" attribute. - // If it is zero length, set it to a default value (localized) - nsXPIDLString prompt; - if (mContent) - mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::prompt, prompt); - - if (prompt.IsEmpty()) { - // Generate localized label. - // We can't make any assumption as to what the default would be - // because the value is localized for non-english platforms, thus - // it might not be the string "This is a searchable index. Enter search keywords: " - result = - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "IsIndexPromptWithSpace", prompt); - } - - mTextContent->SetText(prompt, aNotify); - - return NS_OK; -} - -nsresult -nsIsIndexFrame::GetInputFrame(nsIFormControlFrame** oFrame) -{ - if (!mInputContent) NS_WARNING("null content - cannot restore state"); - if (mInputContent) { - nsIFrame *frame = mInputContent->GetPrimaryFrame(); - if (frame) { - *oFrame = do_QueryFrame(frame); - return *oFrame ? NS_OK : NS_NOINTERFACE; - } - } - return NS_OK; -} - -void -nsIsIndexFrame::GetInputValue(nsString& oString) -{ - nsCOMPtr txtCtrl = do_QueryInterface(mInputContent); - if (txtCtrl) { - txtCtrl->GetTextEditorValue(oString, PR_FALSE); - } -} - -void -nsIsIndexFrame::SetInputValue(const nsString& aString) -{ - nsCOMPtr txtCtrl = do_QueryInterface(mInputContent); - if (txtCtrl) { - txtCtrl->SetTextEditorValue(aString, PR_FALSE); - } -} - -void -nsIsIndexFrame::SetFocus(PRBool aOn, PRBool aRepaint) -{ - nsIFormControlFrame* frame = nsnull; - GetInputFrame(&frame); - if (frame) { - frame->SetFocus(aOn, aRepaint); - } -} - -nsresult -nsIsIndexFrame::CreateAnonymousContent(nsTArray& aElements) -{ - // Get the node info manager (used to create hr's and input's) - nsCOMPtr doc = mContent->GetDocument(); - nsNodeInfoManager *nimgr = doc->NodeInfoManager(); - - // Create an hr - nsCOMPtr hrInfo; - hrInfo = nimgr->GetNodeInfo(nsGkAtoms::hr, nsnull, kNameSpaceID_XHTML, - nsIDOMNode::ELEMENT_NODE); - - NS_NewHTMLElement(getter_AddRefs(mPreHr), hrInfo.forget(), - dom::NOT_FROM_PARSER); - if (!mPreHr || !aElements.AppendElement(mPreHr)) - return NS_ERROR_OUT_OF_MEMORY; - - // Add a child text content node for the label - NS_NewTextNode(getter_AddRefs(mTextContent), nimgr); - if (!mTextContent) - return NS_ERROR_OUT_OF_MEMORY; - - // set the value of the text node and add it to the child list - UpdatePromptLabel(PR_FALSE); - if (!aElements.AppendElement(mTextContent)) - return NS_ERROR_OUT_OF_MEMORY; - - // Create text input field - nsCOMPtr inputInfo; - inputInfo = nimgr->GetNodeInfo(nsGkAtoms::input, nsnull, kNameSpaceID_XHTML, - nsIDOMNode::ELEMENT_NODE); - - NS_NewHTMLElement(getter_AddRefs(mInputContent), inputInfo.forget(), - dom::NOT_FROM_PARSER); - if (!mInputContent) - return NS_ERROR_OUT_OF_MEMORY; - - mInputContent->SetAttr(kNameSpaceID_None, nsGkAtoms::type, - NS_LITERAL_STRING("text"), PR_FALSE); - - if (!aElements.AppendElement(mInputContent)) - return NS_ERROR_OUT_OF_MEMORY; - - // Register as an event listener to submit on Enter press - mListener = new nsIsIndexFrame::KeyListener(this); - mInputContent->AddEventListenerByIID(mListener, NS_GET_IID(nsIDOMKeyListener)); - - // Create an hr - hrInfo = nimgr->GetNodeInfo(nsGkAtoms::hr, nsnull, kNameSpaceID_XHTML, - nsIDOMNode::ELEMENT_NODE); - NS_NewHTMLElement(getter_AddRefs(mPostHr), hrInfo.forget(), - dom::NOT_FROM_PARSER); - if (!mPostHr || !aElements.AppendElement(mPostHr)) - return NS_ERROR_OUT_OF_MEMORY; - - return NS_OK; -} - -void -nsIsIndexFrame::AppendAnonymousContentTo(nsBaseContentList& aElements, - PRUint32 aFilter) -{ - aElements.MaybeAppendElement(mTextContent); - aElements.MaybeAppendElement(mInputContent); -} - -NS_QUERYFRAME_HEAD(nsIsIndexFrame) - NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) - NS_QUERYFRAME_ENTRY(nsIStatefulFrame) -NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame) - -NS_IMPL_ISUPPORTS2(nsIsIndexFrame::KeyListener, - nsIDOMKeyListener, - nsIDOMEventListener) - -nscoord -nsIsIndexFrame::GetMinWidth(nsRenderingContext *aRenderingContext) -{ - nscoord result; - DISPLAY_MIN_WIDTH(this, result); - - // Our min width is our pref width; the rest of our reflow is - // happily handled by nsBlockFrame - result = GetPrefWidth(aRenderingContext); - return result; -} - -PRBool -nsIsIndexFrame::IsLeaf() const -{ - return PR_TRUE; -} - -NS_IMETHODIMP -nsIsIndexFrame::AttributeChanged(PRInt32 aNameSpaceID, - nsIAtom* aAttribute, - PRInt32 aModType) -{ - nsresult rv = NS_OK; - if (nsGkAtoms::prompt == aAttribute) { - rv = UpdatePromptLabel(PR_TRUE); - } else { - rv = nsBlockFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); - } - return rv; -} - -nsresult -nsIsIndexFrame::KeyListener::KeyPress(nsIDOMEvent* aEvent) -{ - mOwner->KeyPress(aEvent); - return NS_OK; -} - -void -nsIsIndexFrame::KeyPress(nsIDOMEvent* aEvent) -{ - nsCOMPtr keyEvent = do_QueryInterface(aEvent); - if (keyEvent) { - PRUint32 code; - keyEvent->GetKeyCode(&code); - if (code == 0) { - keyEvent->GetCharCode(&code); - } - if (nsIDOMKeyEvent::DOM_VK_RETURN == code) { - OnSubmit(PresContext()); - aEvent->PreventDefault(); // XXX Needed? - } - } -} - -#ifdef NS_DEBUG -NS_IMETHODIMP -nsIsIndexFrame::GetFrameName(nsAString& aResult) const -{ - return MakeFrameName(NS_LITERAL_STRING("IsIndex"), aResult); -} -#endif - -// submission -// much of this is cut and paste from nsFormFrame::OnSubmit -NS_IMETHODIMP -nsIsIndexFrame::OnSubmit(nsPresContext* aPresContext) -{ - if (!mContent || !mInputContent) { - return NS_ERROR_UNEXPECTED; - } - - if (mContent->IsEditable()) { - return NS_OK; - } - - nsresult result = NS_OK; - - // Begin ProcessAsURLEncoded - nsAutoString data; - - nsCOMPtr encoder; - if(NS_FAILED(GetEncoder(getter_AddRefs(encoder)))) // Non-fatal error - encoder = nsnull; - - nsAutoString value; - GetInputValue(value); - URLEncode(value, encoder, data); - // End ProcessAsURLEncoded - - // make the url string - nsAutoString href; - - // Get the document. - // We'll need it now to form the URL we're submitting to. - // We'll also need it later to get the DOM window when notifying form submit observers (bug 33203) - nsCOMPtr document = mContent->GetDocument(); - if (!document) return NS_OK; // No doc means don't submit, see Bug 28988 - - // Resolve url to an absolute url - nsIURI *baseURI = document->GetDocBaseURI(); - if (!baseURI) { - NS_ERROR("No Base URL found in Form Submit!"); - return NS_OK; // No base URL -> exit early, see Bug 30721 - } - - // If an action is not specified and we are inside - // a HTML document then reload the URL. This makes us - // compatible with 4.x browsers. - // If we are in some other type of document such as XML or - // XUL, do nothing. This prevents undesirable reloading of - // a document inside XUL. - - nsresult rv; - nsCOMPtr htmlDoc; - htmlDoc = do_QueryInterface(document, &rv); - if (NS_FAILED(rv)) { - // Must be a XML, XUL or other non-HTML document type - // so do nothing. - return NS_OK; - } - - // Necko's MakeAbsoluteURI doesn't reuse the baseURL's rel path if it is - // passed a zero length rel path. - nsCAutoString relPath; - baseURI->GetSpec(relPath); - if (!relPath.IsEmpty()) { - CopyUTF8toUTF16(relPath, href); - - // If re-using the same URL, chop off old query string (bug 25330) - PRInt32 queryStart = href.FindChar('?'); - if (kNotFound != queryStart) { - href.Truncate(queryStart); - } - } else { - NS_ERROR("Rel path couldn't be formed in form submit!"); - return NS_ERROR_OUT_OF_MEMORY; - } - - // Add the URI encoded form values to the URI - // Get the scheme of the URI. - nsCOMPtr actionURL; - nsXPIDLCString scheme; - PRBool isJSURL = PR_FALSE; - const nsACString &docCharset = document->GetDocumentCharacterSet(); - const nsPromiseFlatCString& flatDocCharset = PromiseFlatCString(docCharset); - - if (NS_SUCCEEDED(result = NS_NewURI(getter_AddRefs(actionURL), href, - flatDocCharset.get(), - baseURI))) { - result = actionURL->SchemeIs("javascript", &isJSURL); - } - // Append the URI encoded variable/value pairs for GET's - if (!isJSURL) { // Not for JS URIs, see bug 26917 - if (href.FindChar('?') == kNotFound) { // Add a ? if needed - href.Append(PRUnichar('?')); - } else { // Adding to existing query string - if (href.Last() != '&' && href.Last() != '?') { // Add a & if needed - href.Append(PRUnichar('&')); - } - } - href.Append(data); - } - nsCOMPtr uri; - result = NS_NewURI(getter_AddRefs(uri), href, - flatDocCharset.get(), baseURI); - if (NS_FAILED(result)) return result; - - // Now pretend we're triggering a link - nsContentUtils::TriggerLink(mContent, aPresContext, uri, - EmptyString(), PR_TRUE, PR_TRUE, PR_TRUE); - return result; -} - -void nsIsIndexFrame::GetSubmitCharset(nsCString& oCharset) -{ - oCharset.AssignLiteral("UTF-8"); // default to utf-8 - // XXX - // We may want to get it from the HTML 4 Accept-Charset attribute first - // see 17.3 The FORM element in HTML 4 for details - - // Get the charset from document - nsIDocument* doc = mContent->GetDocument(); - if (doc) { - oCharset = doc->GetDocumentCharacterSet(); - } -} - -NS_IMETHODIMP nsIsIndexFrame::GetEncoder(nsIUnicodeEncoder** encoder) -{ - *encoder = nsnull; - nsCAutoString charset; - nsresult rv = NS_OK; - GetSubmitCharset(charset); - - // Get Charset, get the encoder. - nsICharsetConverterManager * ccm = nsnull; - rv = CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &ccm); - if(NS_SUCCEEDED(rv) && (nsnull != ccm)) { - rv = ccm->GetUnicodeEncoderRaw(charset.get(), encoder); - NS_RELEASE(ccm); - if (!*encoder) { - rv = NS_ERROR_FAILURE; - } - if (NS_SUCCEEDED(rv)) { - rv = (*encoder)->SetOutputErrorBehavior(nsIUnicodeEncoder::kOnError_Replace, nsnull, (PRUnichar)'?'); - } - } - return rv; -} - -// XXX i18n helper routines -char* -nsIsIndexFrame::UnicodeToNewBytes(const PRUnichar* aSrc, PRUint32 aLen, nsIUnicodeEncoder* encoder) -{ - char* res = nsnull; - if(NS_SUCCEEDED(encoder->Reset())) - { - PRInt32 maxByteLen = 0; - if(NS_SUCCEEDED(encoder->GetMaxLength(aSrc, (PRInt32) aLen, &maxByteLen))) - { - res = new char[maxByteLen+1]; - if(nsnull != res) - { - PRInt32 reslen = maxByteLen; - PRInt32 reslen2 ; - PRInt32 srclen = aLen; - encoder->Convert(aSrc, &srclen, res, &reslen); - reslen2 = maxByteLen-reslen; - encoder->Finish(res+reslen, &reslen2); - res[reslen+reslen2] = '\0'; - } - } - - } - return res; -} - -// XXX i18n helper routines -void -nsIsIndexFrame::URLEncode(const nsString& aString, nsIUnicodeEncoder* encoder, nsString& oString) -{ - char* inBuf = nsnull; - if(encoder) - inBuf = UnicodeToNewBytes(aString.get(), aString.Length(), encoder); - - if(nsnull == inBuf) - inBuf = ToNewCString(aString); - - // convert to CRLF breaks - char* convertedBuf = nsLinebreakConverter::ConvertLineBreaks(inBuf, - nsLinebreakConverter::eLinebreakAny, nsLinebreakConverter::eLinebreakNet); - delete [] inBuf; - - char* outBuf = nsEscape(convertedBuf, url_XPAlphas); - oString.AssignASCII(outBuf); - nsMemory::Free(outBuf); - nsMemory::Free(convertedBuf); -} - -//---------------------------------------------------------------------- -// nsIStatefulFrame -//---------------------------------------------------------------------- -NS_IMETHODIMP -nsIsIndexFrame::SaveState(SpecialStateID aStateID, nsPresState** aState) -{ - NS_ENSURE_ARG_POINTER(aState); - - *aState = nsnull; - - // Get the value string - nsAutoString stateString; - GetInputValue(stateString); - - if (! stateString.IsEmpty()) { - - // Construct a pres state and store value in it. - *aState = new nsPresState(); - if (!*aState) - return NS_ERROR_OUT_OF_MEMORY; - - nsCOMPtr state - (do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID)); - - if (!state) - return NS_ERROR_OUT_OF_MEMORY; - - state->SetData(stateString); - (*aState)->SetStateProperty(state); - } - - return NS_OK; -} - -NS_IMETHODIMP -nsIsIndexFrame::RestoreState(nsPresState* aState) -{ - NS_ENSURE_ARG_POINTER(aState); - - // Set the value to the stored state. - nsCOMPtr stateString - (do_QueryInterface(aState->GetStateProperty())); - - if (!stateString) { - NS_ERROR("Not a state!"); - return NS_ERROR_FAILURE; - } - - nsAutoString data; - stateString->GetData(data); - SetInputValue(data); - - return NS_OK; -} diff --git a/layout/forms/nsIsIndexFrame.h b/layout/forms/nsIsIndexFrame.h deleted file mode 100644 index 92b408c64a5..00000000000 --- a/layout/forms/nsIsIndexFrame.h +++ /dev/null @@ -1,134 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla 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/MPL/ - * - * 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 of 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 MPL, 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 MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsIsIndexFrame_h___ -#define nsIsIndexFrame_h___ - -#include "nsBlockFrame.h" -#include "nsIFormControlFrame.h" -#include "nsIAnonymousContentCreator.h" -#include "nsIStatefulFrame.h" -#include "nsIUnicodeEncoder.h" -#include "nsIDOMKeyListener.h" - -#include "nsTextControlFrame.h" -typedef nsTextControlFrame nsNewFrame; - -class nsIsIndexFrame : public nsBlockFrame, - public nsIAnonymousContentCreator, - public nsIStatefulFrame -{ -public: - nsIsIndexFrame(nsStyleContext* aContext); - virtual ~nsIsIndexFrame(); - - virtual void DestroyFrom(nsIFrame* aDestructRoot); - -private: - void KeyPress(nsIDOMEvent* aKeyEvent); - - class KeyListener : public nsIDOMKeyListener - { - NS_DECL_ISUPPORTS - - KeyListener(nsIsIndexFrame* aOwner) : mOwner(aOwner) { }; - - NS_IMETHOD KeyDown(nsIDOMEvent* aKeyEvent) { return NS_OK; } - - NS_IMETHOD KeyUp(nsIDOMEvent* aKeyEvent) { return NS_OK; } - - NS_IMETHOD KeyPress(nsIDOMEvent* aKeyEvent); // we only care when a key is pressed - - NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; } - - nsIsIndexFrame* mOwner; - }; - -public: - NS_DECL_QUERYFRAME - NS_DECL_FRAMEARENA_HELPERS - - // nsIFormControlFrame - virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext); - - virtual PRBool IsLeaf() const; - -#ifdef NS_DEBUG - NS_IMETHOD GetFrameName(nsAString& aResult) const; -#endif - NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, - nsIAtom* aAttribute, - PRInt32 aModType); - - void SetFocus(PRBool aOn, PRBool aRepaint); - - // nsIAnonymousContentCreator - virtual nsresult CreateAnonymousContent(nsTArray& aElements); - virtual void AppendAnonymousContentTo(nsBaseContentList& aElements, - PRUint32 aFilter); - - NS_IMETHOD OnSubmit(nsPresContext* aPresContext); - - //nsIStatefulFrame - NS_IMETHOD SaveState(SpecialStateID aStateID, nsPresState** aState); - NS_IMETHOD RestoreState(nsPresState* aState); - -protected: - // native anonymous content generated by this frame when - // asked via the nsIAnonymousContentCreator interface. - nsCOMPtr mTextContent; - nsCOMPtr mInputContent; - nsCOMPtr mPreHr; - nsCOMPtr mPostHr; - -private: - nsresult UpdatePromptLabel(PRBool aNotify); - nsresult GetInputFrame(nsIFormControlFrame** oFrame); - void GetInputValue(nsString& oString); - void SetInputValue(const nsString& aString); - - void GetSubmitCharset(nsCString& oCharset); - NS_IMETHOD GetEncoder(nsIUnicodeEncoder** encoder); - char* UnicodeToNewBytes(const PRUnichar* aSrc, PRUint32 aLen, nsIUnicodeEncoder* encoder); - void URLEncode(const nsString& aString, nsIUnicodeEncoder* encoder, nsString& oString); - - nsCOMPtr mListener; -}; - -#endif - - diff --git a/layout/generic/nsHTMLParts.h b/layout/generic/nsHTMLParts.h index dbba69dec1d..6635f9b8bfa 100644 --- a/layout/generic/nsHTMLParts.h +++ b/layout/generic/nsHTMLParts.h @@ -205,8 +205,6 @@ NS_NewListControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); nsIFrame* NS_NewComboboxControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext, PRUint32 aFlags); nsIFrame* -NS_NewIsIndexFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); -nsIFrame* NS_NewProgressFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); // Table frame factories diff --git a/layout/generic/nsQueryFrame.h b/layout/generic/nsQueryFrame.h index 244e3524c36..4880ef08c1f 100644 --- a/layout/generic/nsQueryFrame.h +++ b/layout/generic/nsQueryFrame.h @@ -136,7 +136,6 @@ public: nsImageControlFrame_id, nsImageFrame_id, nsInlineFrame_id, - nsIsIndexFrame_id, nsLeafBoxFrame_id, nsLeafFrame_id, nsLegendFrame_id, diff --git a/layout/style/contenteditable.css b/layout/style/contenteditable.css index 77b1004db87..cef0a25208f 100644 --- a/layout/style/contenteditable.css +++ b/layout/style/contenteditable.css @@ -59,7 +59,7 @@ textarea:-moz-read-write > .anonymous-div:-moz-read-only { img:-moz-read-write, img:-moz-read-write[usemap], area:-moz-read-write, object:-moz-read-write, object:-moz-read-write[usemap], applet:-moz-read-write, hr:-moz-read-write, button:-moz-read-write, -isindex:-moz-read-write, select:-moz-read-write, +select:-moz-read-write, a:-moz-read-write:link img, a:-moz-read-write:visited img, a:-moz-read-write:active img, a:-moz-read-write:-moz-only-whitespace[name] { cursor: default; @@ -108,13 +108,6 @@ input[contenteditable="true"][type="file"] { -moz-user-focus: none !important; } -isindex:-moz-read-write[prompt] -{ - -moz-user-select: none !important; - -moz-user-input: none !important; - -moz-user-focus: none !important; -} - /* emulation of non-standard HTML tag */ marquee:-moz-read-write { -moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-horizontal-editable'); diff --git a/layout/style/html.css b/layout/style/html.css index 0dfc67624ab..f8e272d1308 100644 --- a/layout/style/html.css +++ b/layout/style/html.css @@ -87,7 +87,6 @@ header, hgroup, hr, html, -isindex, li, listing, map, @@ -125,7 +124,6 @@ form, header, hgroup, html, -isindex, map, nav, section {