Merge 143060

Source/WebCore/dom/PseudoElement.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "PseudoElement.h"
 
 #include "ContentData.h"
 #include "NodeRenderingContext.h"
 #include "RenderObject.h"
+#include "RenderQuote.h"
 
 namespace WebCore {
 
 const QualifiedName& pseudoElementTagName()
 {
     DEFINE_STATIC_LOCAL(QualifiedName, name, (nullAtom, "<pseudo>", nullAtom));
     return name;
 }
 
 String PseudoElement::pseudoElementNameForEvents(PseudoId pseudoId)
@@ skipping 32 matching lines @@
 
     RenderObject* renderer = this->renderer();
     if (!renderer || !renderer->style()->regionThread().isEmpty())
         return;
 
     RenderStyle* style = renderer->style();
     ASSERT(style->contentData());
 
     for (const ContentData* content = style->contentData(); content; content = content->next()) {
         RenderObject* child = content->createRenderer(document(), style);
-        if (renderer->isChildAllowed(child, style))
+        if (renderer->isChildAllowed(child, style)) {
             renderer->addChild(child);
-        else
+            if (child->isQuote())
+                toRenderQuote(child)->attachQuote();
+        } else
             child->destroy();
     }
 }
 
 bool PseudoElement::rendererIsNeeded(const NodeRenderingContext& context)
 {
     return pseudoElementRendererIsNeeded(context.style());
 }
 
 void PseudoElement::didRecalcStyle(StyleChange)
@@ skipping 11 matching lines @@
 
         // The style for the RenderTextFragment for first letter is managed by an enclosing block, not by us.
         if (child->style()->styleType() == FIRST_LETTER)
             continue;
 
         child->setPseudoStyle(renderer->style());
     }
 }
 
 } // namespace