diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 94fa0889319..9229058c30c 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -8410,9 +8410,11 @@ nsCSSFrameConstructor::ConstructAlternateImageFrame(nsIPresShell*    aPresShell,
                                            aStyleContext, PR_FALSE);
 
   // If the frame is out-of-flow, then mark it as such
-  nsFrameState  frameState;
-  containerFrame->GetFrameState(&frameState);
-  containerFrame->SetFrameState(frameState | NS_FRAME_OUT_OF_FLOW);
+  if (isOutOfFlow) {
+    nsFrameState  frameState;
+    containerFrame->GetFrameState(&frameState);
+    containerFrame->SetFrameState(frameState | NS_FRAME_OUT_OF_FLOW);
+  }
 
   // Create a text frame to display the alt-text. It gets a pseudo-element
   // style context
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index 94fa0889319..9229058c30c 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -8410,9 +8410,11 @@ nsCSSFrameConstructor::ConstructAlternateImageFrame(nsIPresShell*    aPresShell,
                                            aStyleContext, PR_FALSE);
 
   // If the frame is out-of-flow, then mark it as such
-  nsFrameState  frameState;
-  containerFrame->GetFrameState(&frameState);
-  containerFrame->SetFrameState(frameState | NS_FRAME_OUT_OF_FLOW);
+  if (isOutOfFlow) {
+    nsFrameState  frameState;
+    containerFrame->GetFrameState(&frameState);
+    containerFrame->SetFrameState(frameState | NS_FRAME_OUT_OF_FLOW);
+  }
 
   // Create a text frame to display the alt-text. It gets a pseudo-element
   // style context