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

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

Issue 9372048: Merge 106968 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 // We can reuse this block and make it the preBlock of the next continua tion. 376 // We can reuse this block and make it the preBlock of the next continua tion.
377 pre = block; 377 pre = block;
378 pre->removePositionedObjects(0); 378 pre->removePositionedObjects(0);
379 block = block->containingBlock(); 379 block = block->containingBlock();
380 } else { 380 } else {
381 // No anonymous block available for use. Make one. 381 // No anonymous block available for use. Make one.
382 pre = block->createAnonymousBlock(); 382 pre = block->createAnonymousBlock();
383 madeNewBeforeBlock = true; 383 madeNewBeforeBlock = true;
384 } 384 }
385 385
386 RenderBlock* post = block->createAnonymousBlock(); 386 RenderBlock* post = block->createAnonymousBlockWithSameTypeAs(pre);
387 387
388 RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nex tSibling(); 388 RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nex tSibling();
389 if (madeNewBeforeBlock) 389 if (madeNewBeforeBlock)
390 block->children()->insertChildNode(block, pre, boxFirst); 390 block->children()->insertChildNode(block, pre, boxFirst);
391 block->children()->insertChildNode(block, newBlockBox, boxFirst); 391 block->children()->insertChildNode(block, newBlockBox, boxFirst);
392 block->children()->insertChildNode(block, post, boxFirst); 392 block->children()->insertChildNode(block, post, boxFirst);
393 block->setChildrenInline(false); 393 block->setChildrenInline(false);
394 394
395 if (madeNewBeforeBlock) { 395 if (madeNewBeforeBlock) {
396 RenderObject* o = boxFirst; 396 RenderObject* o = boxFirst;
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 region.clip.scale(deviceScaleFactor); 1551 region.clip.scale(deviceScaleFactor);
1552 } 1552 }
1553 } 1553 }
1554 1554
1555 regions.append(region); 1555 regions.append(region);
1556 } 1556 }
1557 } 1557 }
1558 #endif 1558 #endif
1559 1559
1560 } // namespace WebCore 1560 } // 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