Fix for bad vertical alignment on replaced object frames, bug 36997 r=dbaron sr=attinasi

layout/generic/nsObjectFrame.cpp

@@ -1146,8 +1146,14 @@ nsObjectFrame::Reflow(nsIPresContext*          aPresContext,
   }
   // finish up
   if (NS_FAILED(rv)) {
-    // if we got an error, we'll check for alternative content with
-    // CantRenderReplacedElement()
+    // if we got an error, we are probably going to be replaced
+
+    // for a replaced object frame, clear our vertical alignment style info, see bug 36997
+    nsStyleTextReset* text = NS_STATIC_CAST(nsStyleTextReset*,
+      mStyleContext->GetUniqueStyleData(mPresContext,  eStyleStruct_TextReset));
+    text->mVerticalAlign.SetNormalValue();
+
+    //check for alternative content with CantRenderReplacedElement()
     nsIPresShell* presShell;
     aPresContext->GetShell(&presShell);
     rv = presShell->CantRenderReplacedElement(aPresContext, this);

layout/html/base/src/nsObjectFrame.cpp

@@ -1146,8 +1146,14 @@ nsObjectFrame::Reflow(nsIPresContext*          aPresContext,
   }
   // finish up
   if (NS_FAILED(rv)) {
-    // if we got an error, we'll check for alternative content with
-    // CantRenderReplacedElement()
+    // if we got an error, we are probably going to be replaced
+
+    // for a replaced object frame, clear our vertical alignment style info, see bug 36997
+    nsStyleTextReset* text = NS_STATIC_CAST(nsStyleTextReset*,
+      mStyleContext->GetUniqueStyleData(mPresContext,  eStyleStruct_TextReset));
+    text->mVerticalAlign.SetNormalValue();
+
+    //check for alternative content with CantRenderReplacedElement()
     nsIPresShell* presShell;
     aPresContext->GetShell(&presShell);
     rv = presShell->CantRenderReplacedElement(aPresContext, this);