From c3faec0fa4fb49e312571f6a77939576540dafe1 Mon Sep 17 00:00:00 2001 From: "jkeiser%netscape.com" Date: Fri, 26 Jul 2002 20:44:02 +0000 Subject: [PATCH] Move nsIHTMLContent.h into content/html/content/public (bug 77069), r=heikki, sr=jst, a=asa --- content/html/content/public/MANIFEST | 1 + content/html/content/public/Makefile.in | 1 + content/html/content/public/makefile.win | 1 + layout/html/base/src/MANIFEST | 1 - layout/html/base/src/Makefile.in | 1 - layout/html/base/src/makefile.win | 1 - layout/html/base/src/nsIHTMLContent.h | 103 ----------------------- 7 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 layout/html/base/src/nsIHTMLContent.h diff --git a/content/html/content/public/MANIFEST b/content/html/content/public/MANIFEST index 4335309dc1b7..012ea62e2a37 100644 --- a/content/html/content/public/MANIFEST +++ b/content/html/content/public/MANIFEST @@ -4,6 +4,7 @@ nsIForm.h nsIFormControl.h nsIFormSubmission.h +nsIHTMLContent.h nsILink.h nsIOptionElement.h nsIRadioControlElement.h diff --git a/content/html/content/public/Makefile.in b/content/html/content/public/Makefile.in index 54ddb3bfef8e..08dc06ab01b3 100644 --- a/content/html/content/public/Makefile.in +++ b/content/html/content/public/Makefile.in @@ -37,6 +37,7 @@ XPIDLSRCS = \ EXPORTS = \ nsIFormControl.h \ nsIForm.h \ + nsIHTMLContent.h \ nsILink.h \ nsIOptionElement.h \ nsIRadioControlElement.h \ diff --git a/content/html/content/public/makefile.win b/content/html/content/public/makefile.win index 9de2daa95efd..b4d0a214b825 100644 --- a/content/html/content/public/makefile.win +++ b/content/html/content/public/makefile.win @@ -29,6 +29,7 @@ XPIDLSRCS = \ EXPORTS= \ nsIFormControl.h \ nsIForm.h \ + nsIHTMLContent.h \ nsILink.h \ nsIOptionElement.h \ nsIRadioControlElement.h \ diff --git a/layout/html/base/src/MANIFEST b/layout/html/base/src/MANIFEST index 86a8536850c4..b27dc8cb64b4 100644 --- a/layout/html/base/src/MANIFEST +++ b/layout/html/base/src/MANIFEST @@ -3,5 +3,4 @@ # nsILineIterator.h -nsIHTMLContent.h nsHTMLParts.h diff --git a/layout/html/base/src/Makefile.in b/layout/html/base/src/Makefile.in index d9b3133fcb5e..b9057266a984 100644 --- a/layout/html/base/src/Makefile.in +++ b/layout/html/base/src/Makefile.in @@ -112,7 +112,6 @@ CPPSRCS += \ endif EXPORTS = \ - nsIHTMLContent.h \ nsILineIterator.h \ nsHTMLParts.h \ $(NULL) diff --git a/layout/html/base/src/makefile.win b/layout/html/base/src/makefile.win index 02eb056102b9..67d7e30f2bf1 100644 --- a/layout/html/base/src/makefile.win +++ b/layout/html/base/src/makefile.win @@ -60,7 +60,6 @@ DEFINES = $(DEFINES) -DXP_NEW_SELECTION !endif EXPORTS = \ - nsIHTMLContent.h \ nsILineIterator.h \ nsHTMLParts.h \ !ifdef IBMBIDI diff --git a/layout/html/base/src/nsIHTMLContent.h b/layout/html/base/src/nsIHTMLContent.h deleted file mode 100644 index e8efa9cb9464..000000000000 --- a/layout/html/base/src/nsIHTMLContent.h +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#ifndef nsIHTMLContent_h___ -#define nsIHTMLContent_h___ - -#include "nsIXMLContent.h" -#include "nsHTMLValue.h" -class nsString; -class nsIFrame; -class nsIStyleRule; -class nsIPresContext; -class nsIHTMLMappedAttributes; -class nsIURI; -struct nsRuleData; - -// IID for the nsIHTMLContent class -#define NS_IHTMLCONTENT_IID \ -{ 0xb9e110b0, 0x94d6, 0x11d1, \ - {0x89, 0x5c, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} } - -typedef void (*nsMapRuleToAttributesFunc)(const nsIHTMLMappedAttributes* aAttributes, - nsRuleData* aData); - -// Abstract interface for all html content -class nsIHTMLContent : public nsIXMLContent -{ -public: - NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHTMLCONTENT_IID) - - /** - * If this html content is a container, then compact asks it to minimize - * it's storage usage. - */ - NS_IMETHOD Compact() = 0; - - NS_IMETHOD SetHTMLAttribute(nsIAtom* aAttribute, - const nsHTMLValue& aValue, - PRBool aNotify) = 0; - - NS_IMETHOD GetHTMLAttribute(nsIAtom* aAttribute, - nsHTMLValue& aValue) const = 0; - NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const = 0; - - NS_IMETHOD AttributeToString(nsIAtom* aAttribute, - const nsHTMLValue& aValue, - nsAString& aResult) const = 0; - - NS_IMETHOD StringToAttribute(nsIAtom* aAttribute, - const nsAString& aValue, - nsHTMLValue& aResult) = 0; - - /** - * Get the base URL for any relative URLs within this piece - * of content. Generally, this is the document's base URL, - * but certain content carries a local base for backward - * compatibility. - */ - NS_IMETHOD GetBaseURL(nsIURI*& aBaseURL) const = 0; - - /** - * Get the base target for any links within this piece - * of content. Generally, this is the document's base target, - * but certain content carries a local base for backward - * compatibility. - */ - NS_IMETHOD GetBaseTarget(nsAString& aBaseTarget) const = 0; -}; - -#endif /* nsIHTMLContent_h___ */