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

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

Issue 9375039: Merge 106968 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash-expected.txt ('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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 // We can reuse this block and make it the preBlock of the next continua tion. 378 // We can reuse this block and make it the preBlock of the next continua tion.
379 pre = block; 379 pre = block;
380 pre->removePositionedObjects(0); 380 pre->removePositionedObjects(0);
381 block = block->containingBlock(); 381 block = block->containingBlock();
382 } else { 382 } else {
383 // No anonymous block available for use. Make one. 383 // No anonymous block available for use. Make one.
384 pre = block->createAnonymousBlock(); 384 pre = block->createAnonymousBlock();
385 madeNewBeforeBlock = true; 385 madeNewBeforeBlock = true;
386 } 386 }
387 387
388 RenderBlock* post = block->createAnonymousBlock(); 388 RenderBlock* post = block->createAnonymousBlockWithSameTypeAs(pre);
389 389
390 RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nex tSibling(); 390 RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nex tSibling();
391 if (madeNewBeforeBlock) 391 if (madeNewBeforeBlock)
392 block->children()->insertChildNode(block, pre, boxFirst); 392 block->children()->insertChildNode(block, pre, boxFirst);
393 block->children()->insertChildNode(block, newBlockBox, boxFirst); 393 block->children()->insertChildNode(block, newBlockBox, boxFirst);
394 block->children()->insertChildNode(block, post, boxFirst); 394 block->children()->insertChildNode(block, post, boxFirst);
395 block->setChildrenInline(false); 395 block->setChildrenInline(false);
396 396
397 if (madeNewBeforeBlock) { 397 if (madeNewBeforeBlock) {
398 RenderObject* o = boxFirst; 398 RenderObject* o = boxFirst;
(...skipping 1145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 region.clip.scale(deviceScaleFactor); 1544 region.clip.scale(deviceScaleFactor);
1545 } 1545 }
1546 } 1546 }
1547 1547
1548 regions.append(region); 1548 regions.append(region);
1549 } 1549 }
1550 } 1550 }
1551 #endif 1551 #endif
1552 1552
1553 } // namespace WebCore 1553 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698