Merge 97075 - Style for updated due to inability to locate

Source/WebCore/rendering/RenderObjectChildList.cpp

 /*
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 279 matching lines @@
 }
 
 RenderObject* RenderObjectChildList::beforePseudoElementRenderer(const RenderObject* owner) const
 {
     // An anonymous (generated) inline run-in that has PseudoId BEFORE must come from a grandparent.
     // Therefore we should skip these generated run-ins when checking our immediate children.
     // If we don't find our :before child immediately, then we should check if we own a
     // generated inline run-in in the next level of children.
     RenderObject* first = const_cast<RenderObject*>(owner);
     do {
-        // Skip list markers and generated run-ins
         first = first->firstChild();
-        while (first && first->isListMarker()) {
-            if (first->parent() != owner && first->parent()->isAnonymousBlock())
-                first = first->parent();
-            first = first->nextSibling();
-        }
-        while (first && first->isRenderInline() && first->isRunIn())
-            first = first->nextSibling();
+        // Skip list markers and generated run-ins.
+        while (first && (first->isListMarker() || (first->isRenderInline() && first->isRunIn())))
+            first = first->nextInPreOrderAfterChildren(owner);
     } while (first && first->isAnonymous() && first->style()->styleType() == NOPSEUDO);
 
     if (!first)
         return 0;
 
     if (first->style()->styleType() == BEFORE)
         return first;
 
     // Check for a possible generated run-in, using run-in positioning rules.
-    // Skip inlines and floating / positioned blocks, and place as the first child.
     first = owner->firstChild();
     if (!first->isRenderBlock())
         return 0;
-    while (first && first->isFloatingOrPositioned())
+    
+    first = first->firstChild();
+    // We still need to skip any list markers that could exist before the run-in.
+    while (first && first->isListMarker())
         first = first->nextSibling();
-    if (first) {
-        first = first->firstChild();
-        // We still need to skip any list markers that could exist before the run-in.
-        while (first && first->isListMarker())
-            first = first->nextSibling();
-        if (first && first->style()->styleType() == BEFORE && first->isRenderInline() && first->isRunIn())
-            return first;
-    }
+    if (first && first->style()->styleType() == BEFORE && first->isRenderInline() && first->isRunIn())
+        return first;
+    
     return 0;
 }
 
 RenderObject* RenderObjectChildList::afterPseudoElementRenderer(const RenderObject* owner) const
 {
     RenderObject* last = const_cast<RenderObject*>(owner);
     do {
         last = last->lastChild();
     } while (last && last->isAnonymous() && last->style()->styleType() == NOPSEUDO && !last->isListMarker());
     if (last && last->style()->styleType() != AFTER)
@@ skipping 180 matching lines @@
             }
             if (generatedContentContainer->isChildAllowed(renderer, pseudoElementStyle))
                 generatedContentContainer->addChild(renderer);
             else
                 renderer->destroy();
         }
     }
 }
 
 } // namespace WebCore