Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Unified Diff: Source/WebCore/dom/PseudoElement.cpp

Issue 12301012: Merge 143060 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/dom/PseudoElement.cpp
===================================================================
--- Source/WebCore/dom/PseudoElement.cpp (revision 143280)
+++ Source/WebCore/dom/PseudoElement.cpp (working copy)
@@ -30,6 +30,7 @@
#include "ContentData.h"
#include "NodeRenderingContext.h"
#include "RenderObject.h"
+#include "RenderQuote.h"
namespace WebCore {
@@ -82,9 +83,11 @@
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();
}
}
« no previous file with comments | « LayoutTests/fast/css-generated-content/quote-layout-focus-crash-expected.txt ('k') | Source/WebCore/rendering/RenderQuote.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698