diff --git a/layout/html/content/src/nsHTMLApplet.cpp b/layout/html/content/src/nsHTMLApplet.cpp
index dec3c094bcaa..d7d295ae0399 100644
--- a/layout/html/content/src/nsHTMLApplet.cpp
+++ b/layout/html/content/src/nsHTMLApplet.cpp
@@ -16,32 +16,82 @@
  * Corporation.  Portions created by Netscape are Copyright (C) 1998
  * Netscape Communications Corporation.  All Rights Reserved.
  */
-#include "nsHTMLParts.h"
-#include "nsObjectContent.h"
+#include "nsIDOMHTMLAppletElement.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIDOMEventReceiver.h"
+#include "nsIHTMLContent.h"
+#include "nsHTMLGenericContent.h"
+#include "nsHTMLAtoms.h"
 #include "nsHTMLIIDs.h"
+#include "nsIStyleContext.h"
+#include "nsStyleConsts.h"
+#include "nsIPresContext.h"
 
-#define nsHTMLAppletSuper nsObjectContent
+static NS_DEFINE_IID(kIDOMHTMLAppletElementIID, NS_IDOMHTMLAPPLETELEMENT_IID);
 
-class nsHTMLApplet : public nsHTMLAppletSuper {
+class nsHTMLApplet : public nsIDOMHTMLAppletElement,
+                     public nsIScriptObjectOwner,
+                     public nsIDOMEventReceiver,
+                     public nsIHTMLContent
+{
 public:
   nsHTMLApplet(nsIAtom* aTag);
+  ~nsHTMLApplet();
+
+  // nsISupports
+  NS_DECL_ISUPPORTS
+
+  // nsIDOMNode
+  NS_IMPL_IDOMNODE_USING_GENERIC(mInner)
+
+  // nsIDOMElement
+  NS_IMPL_IDOMELEMENT_USING_GENERIC(mInner)
+
+  // nsIDOMHTMLElement
+  NS_IMPL_IDOMHTMLELEMENT_USING_GENERIC(mInner)
+
+  // nsIDOMHTMLAppletElement
+  NS_IMETHOD GetAlign(nsString& aAlign);
+  NS_IMETHOD SetAlign(const nsString& aAlign);
+  NS_IMETHOD GetAlt(nsString& aAlt);
+  NS_IMETHOD SetAlt(const nsString& aAlt);
+  NS_IMETHOD GetArchive(nsString& aArchive);
+  NS_IMETHOD SetArchive(const nsString& aArchive);
+  NS_IMETHOD GetCode(nsString& aCode);
+  NS_IMETHOD SetCode(const nsString& aCode);
+  NS_IMETHOD GetCodeBase(nsString& aCodeBase);
+  NS_IMETHOD SetCodeBase(const nsString& aCodeBase);
+  NS_IMETHOD GetHeight(nsString& aHeight);
+  NS_IMETHOD SetHeight(const nsString& aHeight);
+  NS_IMETHOD GetHspace(nsString& aHspace);
+  NS_IMETHOD SetHspace(const nsString& aHspace);
+  NS_IMETHOD GetName(nsString& aName);
+  NS_IMETHOD SetName(const nsString& aName);
+  NS_IMETHOD GetObject(nsString& aObject);
+  NS_IMETHOD SetObject(const nsString& aObject);
+  NS_IMETHOD GetVspace(nsString& aVspace);
+  NS_IMETHOD SetVspace(const nsString& aVspace);
+  NS_IMETHOD GetWidth(nsString& aWidth);
+  NS_IMETHOD SetWidth(const nsString& aWidth);
+
+  // nsIScriptObjectOwner
+  NS_IMPL_ISCRIPTOBJECTOWNER_USING_GENERIC(mInner)
+
+  // nsIDOMEventReceiver
+  NS_IMPL_IDOMEVENTRECEIVER_USING_GENERIC(mInner)
+
+  // nsIContent
+  NS_IMPL_ICONTENT_USING_GENERIC(mInner)
+
+  // nsIHTMLContent
+  NS_IMPL_IHTMLCONTENT_USING_GENERIC(mInner)
 
 protected:
-  virtual ~nsHTMLApplet();
+  nsHTMLGenericContainerContent mInner;
 };
 
-nsHTMLApplet::nsHTMLApplet(nsIAtom* aTag)
-  : nsHTMLAppletSuper(aTag)
-{
-}
-
-nsHTMLApplet::~nsHTMLApplet()
-{
-}
-
 nsresult
-NS_NewHTMLApplet(nsIHTMLContent** aInstancePtrResult,
-                 nsIAtom* aTag)
+NS_NewHTMLApplet(nsIHTMLContent** aInstancePtrResult, nsIAtom* aTag)
 {
   NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
   if (nsnull == aInstancePtrResult) {
@@ -51,5 +101,242 @@ NS_NewHTMLApplet(nsIHTMLContent** aInstancePtrResult,
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
-  return it->QueryInterface(kIHTMLContentIID, (void **) aInstancePtrResult);
+  return it->QueryInterface(kIHTMLContentIID, (void**) aInstancePtrResult);
+}
+
+nsHTMLApplet::nsHTMLApplet(nsIAtom* aTag)
+{
+  NS_INIT_REFCNT();
+  mInner.Init(this, aTag);
+}
+
+nsHTMLApplet::~nsHTMLApplet()
+{
+}
+
+NS_IMPL_ADDREF(nsHTMLApplet)
+
+NS_IMPL_RELEASE(nsHTMLApplet)
+
+nsresult
+nsHTMLApplet::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
+  if (aIID.Equals(kIDOMHTMLAppletElementIID)) {
+    nsIDOMHTMLAppletElement* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    mRefCnt++;
+    return NS_OK;
+  }
+  return NS_NOINTERFACE;
+}
+
+nsresult
+nsHTMLApplet::CloneNode(nsIDOMNode** aReturn)
+{
+  nsHTMLApplet* it = new nsHTMLApplet(mInner.mTag);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  mInner.CopyInnerTo(this, &it->mInner);
+  return it->QueryInterface(kIDOMNodeIID, (void**) aReturn);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetAlign(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::align, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetAlign(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::align, aValue, eSetAttrNotify_Reflow);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetAlt(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::alt, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetAlt(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::alt, aValue, eSetAttrNotify_None);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetArchive(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::archive, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetArchive(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::archive, aValue, eSetAttrNotify_Restart);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetCode(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::code, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetCode(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::code, aValue, eSetAttrNotify_Restart);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetCodeBase(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::codebase, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetCodeBase(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::codebase, aValue, eSetAttrNotify_Restart);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetHeight(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::height, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetHeight(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::height, aValue, eSetAttrNotify_Reflow);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetHspace(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::hspace, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetHspace(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::hspace, aValue, eSetAttrNotify_Reflow);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetName(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::name, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetName(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::name, aValue, eSetAttrNotify_Restart);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetObject(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::object, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetObject(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::object, aValue, eSetAttrNotify_None);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetVspace(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::vspace, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetVspace(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::vspace, aValue, eSetAttrNotify_Reflow);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::GetWidth(nsString& aValue)
+{
+  mInner.GetAttribute(nsHTMLAtoms::width, aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::SetWidth(const nsString& aValue)
+{
+  return mInner.SetAttr(nsHTMLAtoms::width, aValue, eSetAttrNotify_Reflow);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::StringToAttribute(nsIAtom* aAttribute,
+                                const nsString& aValue,
+                                nsHTMLValue& aResult)
+{
+  if (aAttribute == nsHTMLAtoms::align) {
+    if (nsHTMLGenericContent::ParseAlignValue(aValue, aResult)) {
+      return NS_CONTENT_ATTR_HAS_VALUE;
+    }
+  }
+  else if (nsHTMLGenericContent::ParseImageAttribute(aAttribute,
+                                                     aValue, aResult)) {
+    return NS_CONTENT_ATTR_HAS_VALUE;
+  }
+  return NS_CONTENT_ATTR_NOT_THERE;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::AttributeToString(nsIAtom* aAttribute,
+                                nsHTMLValue& aValue,
+                                nsString& aResult) const
+{
+  if (aAttribute == nsHTMLAtoms::align) {
+    if (eHTMLUnit_Enumerated == aValue.GetUnit()) {
+      nsHTMLGenericContent::AlignValueToString(aValue, aResult);
+      return NS_CONTENT_ATTR_HAS_VALUE;
+    }
+  }
+  else if (nsHTMLGenericContent::ImageAttributeToString(aAttribute,
+                                                        aValue, aResult)) {
+    return NS_CONTENT_ATTR_HAS_VALUE;
+  }
+  return mInner.AttributeToString(aAttribute, aValue, aResult);
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::MapAttributesInto(nsIStyleContext* aContext,
+                                nsIPresContext* aPresContext)
+{
+  mInner.MapImageAlignAttributeInto(aContext, aPresContext);
+  mInner.MapImageAttributesInto(aContext, aPresContext);
+  mInner.MapImageBorderAttributesInto(aContext, aPresContext, nsnull);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLApplet::HandleDOMEvent(nsIPresContext& aPresContext,
+                             nsEvent* aEvent,
+                             nsIDOMEvent** aDOMEvent,
+                             PRUint32 aFlags,
+                             nsEventStatus& aEventStatus)
+{
+  return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
+                               aFlags, aEventStatus);
 }