Merge 90568

Source/WebCore/rendering/RenderFlexibleBox.cpp

 /*
  * This file is part of the render object implementation for KHTML.
  *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 71 matching lines @@
                     --m_currentOrdinal;
                     if (!m_currentOrdinal)
                         return 0;
                     m_currentChild = m_box->lastChildBox();
                 }
             }
             else
                 m_currentChild = m_forward ? m_currentChild->nextSiblingBox() : m_currentChild->previousSiblingBox();
             if (m_currentChild && m_currentChild->style()->boxOrdinalGroup() > m_lastOrdinal)
                 m_lastOrdinal = m_currentChild->style()->boxOrdinalGroup();
-        } while (!m_currentChild || m_currentChild->style()->boxOrdinalGroup() != m_currentOrdinal
-                 || m_currentChild->style()->visibility() == COLLAPSE);
+        } while (!m_currentChild || (!m_currentChild->isAnonymous()
+                 && (m_currentChild->style()->boxOrdinalGroup() != m_currentOrdinal || m_currentChild->style()->visibility() == COLLAPSE)));
         return m_currentChild;
     }
 
 private:
     RenderFlexibleBox* m_box;
     RenderBox* m_currentChild;
     bool m_forward;
     unsigned int m_currentOrdinal;
     unsigned int m_lastOrdinal;
 };
@@ skipping 905 matching lines @@
     if (isPositioned())
         return "RenderFlexibleBox (positioned)";
     if (isAnonymous())
         return "RenderFlexibleBox (generated)";
     if (isRelPositioned())
         return "RenderFlexibleBox (relative positioned)";
     return "RenderFlexibleBox";
 }
 
 } // namespace WebCore