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

Side by Side Diff: WebCore/rendering/RenderInline.cpp

Issue 1783003: Merge 58201 - <rdar://problem/7898436> :after content is duplicated... (Closed) Base URL: svn://chrome-svn/chrome/branches/WebKit/375/
Patch Set: Created 10 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 // Hook the clone up as a continuation of |curr|. 267 // Hook the clone up as a continuation of |curr|.
268 RenderInline* inlineCurr = toRenderInline(curr); 268 RenderInline* inlineCurr = toRenderInline(curr);
269 oldCont = inlineCurr->continuation(); 269 oldCont = inlineCurr->continuation();
270 inlineCurr->setContinuation(clone); 270 inlineCurr->setContinuation(clone);
271 clone->setContinuation(oldCont); 271 clone->setContinuation(oldCont);
272 272
273 // Someone may have indirectly caused a <q> to split. When this hap pens, the :after content 273 // Someone may have indirectly caused a <q> to split. When this hap pens, the :after content
274 // has to move into the inline continuation. Call updateBeforeAfter Content to ensure that the inline's :after 274 // has to move into the inline continuation. Call updateBeforeAfter Content to ensure that the inline's :after
275 // content gets properly destroyed. 275 // content gets properly destroyed.
276 if (document()->usesBeforeAfterRules()) 276 if (document()->usesBeforeAfterRules())
277 inlineCurr->children()->updateBeforeAfterContent(this, AFTER); 277 inlineCurr->children()->updateBeforeAfterContent(inlineCurr, AFT ER);
278 278
279 // Now we need to take all of the children starting from the first c hild 279 // Now we need to take all of the children starting from the first c hild
280 // *after* currChild and append them all to the clone. 280 // *after* currChild and append them all to the clone.
281 o = currChild->nextSibling(); 281 o = currChild->nextSibling();
282 while (o) { 282 while (o) {
283 RenderObject* tmp = o; 283 RenderObject* tmp = o;
284 o = tmp->nextSibling(); 284 o = tmp->nextSibling();
285 clone->addChildIgnoringContinuation(inlineCurr->children()->remo veChildNode(curr, tmp), 0); 285 clone->addChildIgnoringContinuation(inlineCurr->children()->remo veChildNode(curr, tmp), 0);
286 tmp->setNeedsLayoutAndPrefWidthsRecalc(); 286 tmp->setNeedsLayoutAndPrefWidthsRecalc();
287 } 287 }
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 region.clip.scale(pageScaleFactor); 1123 region.clip.scale(pageScaleFactor);
1124 } 1124 }
1125 } 1125 }
1126 1126
1127 regions.append(region); 1127 regions.append(region);
1128 } 1128 }
1129 } 1129 }
1130 #endif 1130 #endif
1131 1131
1132 } // namespace WebCore 1132 } // namespace WebCore
OLDNEW
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698