diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index e4219f30901..f429a6d96e5 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -19,7 +19,6 @@ #include "nsGenericHTMLElement.h" #include "nsIAtom.h" -#include "nsIContentDelegate.h" #include "nsICSSParser.h" #include "nsICSSStyleRule.h" #include "nsICSSDeclaration.h" @@ -76,7 +75,6 @@ NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); //NS_DEFINE_IID(kIHTMLContentIID, NS_IHTMLCONTENT_IID); -static NS_DEFINE_IID(kIContentDelegateIID, NS_ICONTENTDELEGATE_IID); static NS_DEFINE_IID(kIDOMAttributeIID, NS_IDOMATTRIBUTE_IID); static NS_DEFINE_IID(kIDOMNamedNodeMapIID, NS_IDOMNAMEDNODEMAP_IID); static NS_DEFINE_IID(kIPrivateDOMEventIID, NS_IPRIVATEDOMEVENT_IID); diff --git a/mozilla/layout/base/public/Makefile b/mozilla/layout/base/public/Makefile index 6c8c8d24684..e0152c15089 100644 --- a/mozilla/layout/base/public/Makefile +++ b/mozilla/layout/base/public/Makefile @@ -22,7 +22,6 @@ MODULE = raptor EXPORTS = \ nslayout.h \ nsIContent.h \ - nsIContentDelegate.h \ nsIDocument.h \ nsIDocumentContainer.h \ nsIDocumentObserver.h \ diff --git a/mozilla/layout/base/public/makefile.win b/mozilla/layout/base/public/makefile.win index 894679dcd2d..28e7f59b9fa 100644 --- a/mozilla/layout/base/public/makefile.win +++ b/mozilla/layout/base/public/makefile.win @@ -20,7 +20,6 @@ DEPTH=..\..\.. EXPORTS = \ nslayout.h \ nsIContent.h \ - nsIContentDelegate.h \ nsIDocument.h \ nsIDocumentContainer.h \ nsIDocumentObserver.h \ diff --git a/mozilla/layout/base/public/nsIContentDelegate.h b/mozilla/layout/base/public/nsIContentDelegate.h deleted file mode 100644 index f0cf8643ba5..00000000000 --- a/mozilla/layout/base/public/nsIContentDelegate.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ -#ifndef nsIContentDelegate_h___ -#define nsIContentDelegate_h___ - -#include "nslayout.h" -class nsIFrame; -class nsIPresContext; -class nsIStyleContext; - -#define NS_ICONTENTDELEGATE_IID \ - { 0x0f135ce0, 0xa286, 0x11d1, \ - {0x89, 0x73, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} } - -/** - * API for content delegation. Content objects create these objects to - * provide hooks to creating their visual presentation. - */ -class nsIContentDelegate : public nsISupports { -public: - /** - * Create a new frame object that will be responsible for the layout - * and presentation of the content. - */ - NS_IMETHOD CreateFrame(nsIPresContext* aPresContext, - nsIContent* aContent, - nsIFrame* aParentFrame, - nsIStyleContext* aStyleContext, - nsIFrame*& aFrame) = 0; -}; - -#endif /* nsIContentDelegate_h___ */ diff --git a/mozilla/layout/base/src/nsContainerFrame.cpp b/mozilla/layout/base/src/nsContainerFrame.cpp index 4d480a1497f..d673eb2c419 100644 --- a/mozilla/layout/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/base/src/nsContainerFrame.cpp @@ -22,7 +22,6 @@ #include "nsIRunaround.h" #include "nsISpaceManager.h" #include "nsIStyleContext.h" -#include "nsIContentDelegate.h" #include "nsRect.h" #include "nsPoint.h" #include "nsGUIEvent.h" diff --git a/mozilla/layout/base/src/nsPresShell.cpp b/mozilla/layout/base/src/nsPresShell.cpp index 6d0dd2c30cb..3fe957249e1 100644 --- a/mozilla/layout/base/src/nsPresShell.cpp +++ b/mozilla/layout/base/src/nsPresShell.cpp @@ -18,7 +18,6 @@ #include "nsIPresShell.h" #include "nsIPresContext.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIDocument.h" #include "nsIDocumentObserver.h" #include "nsIStyleSet.h" diff --git a/mozilla/layout/base/src/nsSplittableFrame.cpp b/mozilla/layout/base/src/nsSplittableFrame.cpp index bb32653bc51..2a004b5bab5 100644 --- a/mozilla/layout/base/src/nsSplittableFrame.cpp +++ b/mozilla/layout/base/src/nsSplittableFrame.cpp @@ -17,7 +17,6 @@ */ #include "nsSplittableFrame.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIPresContext.h" #include "nsIStyleContext.h" #include "nsISizeOfHandler.h" diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index a76984f0adc..d40684e0464 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -33,7 +33,6 @@ #include "nsIPtr.h" #include "nsAbsoluteFrame.h" #include "nsPlaceholderFrame.h" -#include "nsIContentDelegate.h" #include "nsIHTMLContent.h" #include "nsHTMLParts.h" #include "nsHTMLBase.h" diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index 12bb99b7fd0..4c865989e67 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -25,7 +25,6 @@ #include "nsViewsCID.h" #include "nsIView.h" #include "nsIViewManager.h" -#include "nsIContentDelegate.h" #include "nsIWidget.h" #include "nsHTMLIIDs.h" #include "nsPageFrame.h" diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp index c9c16998b7c..d8ce3154393 100644 --- a/mozilla/layout/generic/nsPageFrame.cpp +++ b/mozilla/layout/generic/nsPageFrame.cpp @@ -17,7 +17,6 @@ */ #include "nsPageFrame.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIPresContext.h" #include "nsIStyleContext.h" #include "nsIReflowCommand.h" diff --git a/mozilla/layout/generic/nsPlaceholderFrame.cpp b/mozilla/layout/generic/nsPlaceholderFrame.cpp index 01f41e87735..e100e114cae 100644 --- a/mozilla/layout/generic/nsPlaceholderFrame.cpp +++ b/mozilla/layout/generic/nsPlaceholderFrame.cpp @@ -17,7 +17,6 @@ */ #include "nsPlaceholderFrame.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIFloaterContainer.h" #include "nsBodyFrame.h" #include "nsIStyleContext.h" diff --git a/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp b/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp index d59559fd92a..7be241d7db1 100644 --- a/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp +++ b/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp @@ -18,7 +18,6 @@ #include "nsAbsoluteFrame.h" #include "nsBodyFrame.h" #include "nsIAbsoluteItems.h" -#include "nsIContentDelegate.h" #include "nsIStyleContext.h" #include "nsStyleConsts.h" #include "nsHTMLIIDs.h" diff --git a/mozilla/layout/html/base/src/nsBodyFrame.cpp b/mozilla/layout/html/base/src/nsBodyFrame.cpp index 57504a04cc5..d23bab97c82 100644 --- a/mozilla/layout/html/base/src/nsBodyFrame.cpp +++ b/mozilla/layout/html/base/src/nsBodyFrame.cpp @@ -17,7 +17,6 @@ */ #include "nsBodyFrame.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIReflowCommand.h" #include "nsIStyleContext.h" #include "nsStyleConsts.h" diff --git a/mozilla/layout/html/base/src/nsHTMLBase.cpp b/mozilla/layout/html/base/src/nsHTMLBase.cpp index e36c173687e..3272054b50a 100644 --- a/mozilla/layout/html/base/src/nsHTMLBase.cpp +++ b/mozilla/layout/html/base/src/nsHTMLBase.cpp @@ -23,7 +23,6 @@ #include "nsStyleConsts.h" #include "nsViewsCID.h" -#include "nsIContentDelegate.h" #include "nsIPresContext.h" #include "nsIStyleContext.h" #include "nsIView.h" diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp index a76984f0adc..d40684e0464 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -33,7 +33,6 @@ #include "nsIPtr.h" #include "nsAbsoluteFrame.h" #include "nsPlaceholderFrame.h" -#include "nsIContentDelegate.h" #include "nsIHTMLContent.h" #include "nsHTMLParts.h" #include "nsHTMLBase.h" diff --git a/mozilla/layout/html/base/src/nsHTMLContent.cpp b/mozilla/layout/html/base/src/nsHTMLContent.cpp index 64d832ed7c4..e2114f10b03 100644 --- a/mozilla/layout/html/base/src/nsHTMLContent.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContent.cpp @@ -20,7 +20,6 @@ #include "nsIArena.h" #include "nsIAtom.h" #include "nsIHTMLAttributes.h" -#include "nsIContentDelegate.h" #include "nsFrame.h" #include "nsHTMLIIDs.h" #include "nsISupportsArray.h" @@ -32,7 +31,6 @@ #include "nsDOMEvent.h" #include "nsIPrivateDOMEvent.h" -static NS_DEFINE_IID(kIContentDelegateIID, NS_ICONTENTDELEGATE_IID); static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp index 12bb99b7fd0..4c865989e67 100644 --- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp @@ -25,7 +25,6 @@ #include "nsViewsCID.h" #include "nsIView.h" #include "nsIViewManager.h" -#include "nsIContentDelegate.h" #include "nsIWidget.h" #include "nsHTMLIIDs.h" #include "nsPageFrame.h" diff --git a/mozilla/layout/html/base/src/nsPageFrame.cpp b/mozilla/layout/html/base/src/nsPageFrame.cpp index c9c16998b7c..d8ce3154393 100644 --- a/mozilla/layout/html/base/src/nsPageFrame.cpp +++ b/mozilla/layout/html/base/src/nsPageFrame.cpp @@ -17,7 +17,6 @@ */ #include "nsPageFrame.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIPresContext.h" #include "nsIStyleContext.h" #include "nsIReflowCommand.h" diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp index 01f41e87735..e100e114cae 100644 --- a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp +++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp @@ -17,7 +17,6 @@ */ #include "nsPlaceholderFrame.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIFloaterContainer.h" #include "nsBodyFrame.h" #include "nsIStyleContext.h" diff --git a/mozilla/layout/html/base/src/nsScrollFrame.cpp b/mozilla/layout/html/base/src/nsScrollFrame.cpp index 48efd44ab79..150951dd01c 100644 --- a/mozilla/layout/html/base/src/nsScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsScrollFrame.cpp @@ -17,7 +17,6 @@ */ #include "nsScrollFrame.h" #include "nsIPresContext.h" -#include "nsIContentDelegate.h" #include "nsIStyleContext.h" #include "nsIReflowCommand.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp index e4219f30901..f429a6d96e5 100644 --- a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp @@ -19,7 +19,6 @@ #include "nsGenericHTMLElement.h" #include "nsIAtom.h" -#include "nsIContentDelegate.h" #include "nsICSSParser.h" #include "nsICSSStyleRule.h" #include "nsICSSDeclaration.h" @@ -76,7 +75,6 @@ NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); //NS_DEFINE_IID(kIHTMLContentIID, NS_IHTMLCONTENT_IID); -static NS_DEFINE_IID(kIContentDelegateIID, NS_ICONTENTDELEGATE_IID); static NS_DEFINE_IID(kIDOMAttributeIID, NS_IDOMATTRIBUTE_IID); static NS_DEFINE_IID(kIDOMNamedNodeMapIID, NS_IDOMNAMEDNODEMAP_IID); static NS_DEFINE_IID(kIPrivateDOMEventIID, NS_IPRIVATEDOMEVENT_IID); diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index b355ef0e598..9261349970c 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -24,7 +24,6 @@ #include "nsIRenderingContext.h" #include "nsCSSRendering.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIHTMLContent.h" #include "nsHTMLIIDs.h" #include "nsCSSLayout.h" diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp index 960cdc18daa..a6ceb25190e 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp @@ -24,7 +24,6 @@ #include "nsStyleConsts.h" #include "nsIPresContext.h" #include "nsIPtr.h" -#include "nsIContentDelegate.h" #include "nsHTMLAtoms.h" NS_DEF_PTR(nsIContent); diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index 9791025c370..108f3ae1dfb 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -19,7 +19,6 @@ #include "nsIRenderingContext.h" #include "nsIStyleContext.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsCellMap.h" #include "nsTableCellFrame.h" #include "nsHTMLParts.h" diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp index df1e064dfc9..794c0b279c2 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp @@ -25,7 +25,6 @@ #include "nsIRenderingContext.h" #include "nsCSSRendering.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsCSSLayout.h" #include "nsVoidArray.h" #include "nsIReflowCommand.h" diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index 49c0d29ac70..80188421cf5 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -23,7 +23,6 @@ #include "nsIHTMLAttributes.h" #include "nsHTMLAtoms.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsHTMLTagContent.h" #include "nsTableFrame.h" #include "nsTableCellFrame.h" diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp index ea9a4113f94..9fdbcddc976 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp @@ -23,7 +23,6 @@ #include "nsIStyleContext.h" #include "nsStyleConsts.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIView.h" #include "nsIPtr.h" #include "nsIReflowCommand.h" diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index b355ef0e598..9261349970c 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -24,7 +24,6 @@ #include "nsIRenderingContext.h" #include "nsCSSRendering.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIHTMLContent.h" #include "nsHTMLIIDs.h" #include "nsCSSLayout.h" diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp index 960cdc18daa..a6ceb25190e 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp @@ -24,7 +24,6 @@ #include "nsStyleConsts.h" #include "nsIPresContext.h" #include "nsIPtr.h" -#include "nsIContentDelegate.h" #include "nsHTMLAtoms.h" NS_DEF_PTR(nsIContent); diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index 9791025c370..108f3ae1dfb 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -19,7 +19,6 @@ #include "nsIRenderingContext.h" #include "nsIStyleContext.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsCellMap.h" #include "nsTableCellFrame.h" #include "nsHTMLParts.h" diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp index df1e064dfc9..794c0b279c2 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.cpp +++ b/mozilla/layout/tables/nsTableOuterFrame.cpp @@ -25,7 +25,6 @@ #include "nsIRenderingContext.h" #include "nsCSSRendering.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsCSSLayout.h" #include "nsVoidArray.h" #include "nsIReflowCommand.h" diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index 49c0d29ac70..80188421cf5 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -23,7 +23,6 @@ #include "nsIHTMLAttributes.h" #include "nsHTMLAtoms.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsHTMLTagContent.h" #include "nsTableFrame.h" #include "nsTableCellFrame.h" diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index ea9a4113f94..9fdbcddc976 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -23,7 +23,6 @@ #include "nsIStyleContext.h" #include "nsStyleConsts.h" #include "nsIContent.h" -#include "nsIContentDelegate.h" #include "nsIView.h" #include "nsIPtr.h" #include "nsIReflowCommand.h"