Changed CantRenderReplacedElement() to handle APPLET as well

layout/base/nsCSSFrameConstructor.cpp

@@ -4053,8 +4053,9 @@ nsCSSFrameConstructor::CantRenderReplacedElement(nsIPresContext* aPresContext,
       parentFrame->InsertFrames(*aPresContext, *presShell, nsnull, prevSibling, newFrame);
     }
 
-  } else if (nsHTMLAtoms::object == tag.get()) {
-    // It's an OBJECT element, so we should display the contents instead
+  } else if ((nsHTMLAtoms::object == tag.get()) ||
+             (nsHTMLAtoms::applet == tag.get())) {
+    // It's an OBJECT element or APPLET, so we should display the contents instead
     nsCOMPtr<nsIStyleContext> styleContext;
     const nsStyleDisplay*     display;
 

layout/base/nsIPresShell.h

@@ -196,7 +196,7 @@ public:
   // Called when the replaced element can not be rendered, and we should
   // instead render the element's contents.
   // The content object associated with aFrame should either be a IMG
-  // element or an OBJECT element.
+  // element, an OBJECT element, or an APPLET element
   NS_IMETHOD CantRenderReplacedElement(nsIPresContext* aPresContext,
                                        nsIFrame*       aFrame) = 0;
 

layout/base/public/nsIPresShell.h

@@ -196,7 +196,7 @@ public:
   // Called when the replaced element can not be rendered, and we should
   // instead render the element's contents.
   // The content object associated with aFrame should either be a IMG
-  // element or an OBJECT element.
+  // element, an OBJECT element, or an APPLET element
   NS_IMETHOD CantRenderReplacedElement(nsIPresContext* aPresContext,
                                        nsIFrame*       aFrame) = 0;
 

layout/html/style/src/nsCSSFrameConstructor.cpp

@@ -4053,8 +4053,9 @@ nsCSSFrameConstructor::CantRenderReplacedElement(nsIPresContext* aPresContext,
       parentFrame->InsertFrames(*aPresContext, *presShell, nsnull, prevSibling, newFrame);
     }
 
-  } else if (nsHTMLAtoms::object == tag.get()) {
-    // It's an OBJECT element, so we should display the contents instead
+  } else if ((nsHTMLAtoms::object == tag.get()) ||
+             (nsHTMLAtoms::applet == tag.get())) {
+    // It's an OBJECT element or APPLET, so we should display the contents instead
     nsCOMPtr<nsIStyleContext> styleContext;
     const nsStyleDisplay*     display;