Merge 98010

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 265 matching lines @@
     if (AXObjectCache::accessibilityEnabled())
         owner->document()->axObjectCache()->childrenChanged(owner);
 }
 
 static RenderObject* findBeforeAfterParent(RenderObject* object)
 {
     // Only table parts need to search for the :before or :after parent
     if (!(object->isTable() || object->isTableSection() || object->isTableRow()))
         return object;
 
+    // If there is a :first-letter style applied on the :before or :after content,
+    // then we want the parent of the first-letter block
     RenderObject* beforeAfterParent = object;
-    while (beforeAfterParent && !(beforeAfterParent->isText() || beforeAfterParent->isImage()))
+    while (beforeAfterParent && !(beforeAfterParent->isText() || beforeAfterParent->isImage())
+        && (beforeAfterParent->style()->styleType() != FIRST_LETTER))
         beforeAfterParent = beforeAfterParent->firstChild();
+
     return beforeAfterParent ? beforeAfterParent->parent() : 0;
 }
 
 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);
@@ skipping 140 matching lines @@
                     // Images get an empty style that inherits from the pseudo.
                     RefPtr<RenderStyle> style = RenderStyle::create();
                     style->inheritFrom(pseudoElementStyle);
                     genChild->setStyle(style.release());
                 } else {
                     // RenderListItem may insert a list marker here. We do not need to care about this case.
                     // Otherwise, genChild must be a first-letter container. updateFirstLetter() will take care of it.
                     ASSERT(genChild->isListMarker() || genChild->style()->styleType() == FIRST_LETTER);
                 }
             }
-
-            // Update style on the remaining text fragment after the first-letter.
-            if (beforeAfterParent->style()->styleType() == FIRST_LETTER) {
-                if (RenderObject* nextSibling = beforeAfterParent->nextSibling()) {
-                    if (nextSibling->isText() && nextSibling->style()->styleType() == child->style()->styleType())
-                        nextSibling->setStyle(pseudoElementStyle);
-                }
-            }
         }
         return; // We've updated the generated content. That's all we needed to do.
     }
     
     RenderObject* insertBefore = (type == BEFORE) ? owner->virtualChildren()->firstChild() : 0;
     if (insertBefore && insertBefore->isAnonymousBlock() && insertBefore->childrenInline() && !insertBefore->isEmpty()) {
         // We are going to add the "before" element. We have to check whether the "insertBefore" element
         // is an anonymous block with inline children. If it is, then we should insert the "before" element
         // before the first inline child of the anonymous block, otherwise we will end up with the "before"
         // element in a different block. We do this only when the anonymous block has children, otherwise
@@ skipping 55 matching lines @@
             }
             if (generatedContentContainer->isChildAllowed(renderer, pseudoElementStyle))
                 generatedContentContainer->addChild(renderer);
             else
                 renderer->destroy();
         }
     }
 }
 
 } // namespace WebCore