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

Side by Side Diff: sky/engine/core/rendering/RenderInline.cpp

Issue 689733003: Remove most of FloatingObject. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
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 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 RenderBlock* block = containingBlock(); 446 RenderBlock* block = containingBlock();
447 447
448 // Delete our line boxes before we do the inline split into continuations. 448 // Delete our line boxes before we do the inline split into continuations.
449 block->deleteLineBoxTree(); 449 block->deleteLineBoxTree();
450 450
451 bool madeNewBeforeBlock = false; 451 bool madeNewBeforeBlock = false;
452 if (block->isAnonymousBlock() && (!block->parent() || !block->parent()->crea tesAnonymousWrapper())) { 452 if (block->isAnonymousBlock() && (!block->parent() || !block->parent()->crea tesAnonymousWrapper())) {
453 // We can reuse this block and make it the preBlock of the next continua tion. 453 // We can reuse this block and make it the preBlock of the next continua tion.
454 pre = block; 454 pre = block;
455 pre->removePositionedObjects(0); 455 pre->removePositionedObjects(0);
456 if (pre->isRenderBlockFlow())
457 toRenderBlockFlow(pre)->removeFloatingObjects();
458 block = block->containingBlock(); 456 block = block->containingBlock();
459 } else { 457 } else {
460 // No anonymous block available for use. Make one. 458 // No anonymous block available for use. Make one.
461 pre = block->createAnonymousBlock(); 459 pre = block->createAnonymousBlock();
462 madeNewBeforeBlock = true; 460 madeNewBeforeBlock = true;
463 } 461 }
464 462
465 RenderBlock* post = toRenderBlock(pre->createAnonymousBoxWithSameTypeAs(bloc k)); 463 RenderBlock* post = toRenderBlock(pre->createAnonymousBoxWithSameTypeAs(bloc k));
466 464
467 RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nex tSibling(); 465 RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nex tSibling();
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 pixelSnappedBox.maxY(), 1526 pixelSnappedBox.maxY(),
1529 pixelSnappedBox.maxX() + outlineWidth, 1527 pixelSnappedBox.maxX() + outlineWidth,
1530 pixelSnappedBox.maxY() + outlineWidth, 1528 pixelSnappedBox.maxY() + outlineWidth,
1531 BSBottom, outlineColor, outlineStyle, 1529 BSBottom, outlineColor, outlineStyle,
1532 outlineWidth, 1530 outlineWidth,
1533 outlineWidth, 1531 outlineWidth,
1534 antialias); 1532 antialias);
1535 } 1533 }
1536 1534
1537 } // namespace blink 1535 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBoxModelObject.cpp ('k') | sky/engine/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698