--- a/layout/base/nsFrameTraversal.cpp
+++ b/layout/base/nsFrameTraversal.cpp
@@ -77,16 +77,20 @@ protected:
   */
   
   virtual nsIFrame* GetFirstChildInner(nsIFrame* aFrame);
   virtual nsIFrame* GetLastChildInner(nsIFrame* aFrame);  
 
   virtual nsIFrame* GetNextSiblingInner(nsIFrame* aFrame);
   virtual nsIFrame* GetPrevSiblingInner(nsIFrame* aFrame);
 
+  /**
+   * Return the placeholder frame for aFrame if it has one, otherwise return
+   * aFrame itself.
+   */
   nsIFrame* GetPlaceholderFrame(nsIFrame* aFrame);
   bool      IsPopupFrame(nsIFrame* aFrame);
 
   nsPresContext* const mPresContext;
   const bool mLockScroll;
   const bool mFollowOOFs;
   const bool mSkipPopupChecks;
   const nsIteratorType mType;
@@ -479,28 +483,22 @@ nsIFrame*
 nsFrameIterator::GetPrevSiblingInner(nsIFrame* aFrame) {
   return aFrame->GetPrevSibling();
 }
 
 
 nsIFrame*
 nsFrameIterator::GetPlaceholderFrame(nsIFrame* aFrame)
 {
-  nsIFrame* result = aFrame;
-  nsIPresShell *presShell = mPresContext->GetPresShell();
-  if (presShell) {
-    nsIFrame* placeholder = presShell->GetPlaceholderFrameFor(aFrame);
-    if (placeholder)
-      result = placeholder;
+  if (MOZ_LIKELY(!aFrame || !aFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW))) {
+    return aFrame;
   }
-
-  if (result != aFrame)
-    result = GetPlaceholderFrame(result);
-
-  return result;
+  nsIFrame* placeholder =
+    aFrame->PresContext()->PresShell()->GetPlaceholderFrameFor(aFrame);
+  return placeholder ? placeholder : aFrame;
 }
 
 bool
 nsFrameIterator::IsPopupFrame(nsIFrame* aFrame)
 {
   // If skipping popup checks, pretend this isn't one.
   if (mSkipPopupChecks) {
     return false;