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

Side by Side Diff: Source/core/layout/LayoutBlock.cpp

Issue 1124993002: Cleanup: Only need one bit (not two) to express flow thread state. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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
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 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 } else { 589 } else {
590 LayoutObject* cloneLayoutObject = toElement(node())->createLayoutObject( styleRef()); 590 LayoutObject* cloneLayoutObject = toElement(node())->createLayoutObject( styleRef());
591 cloneBlock = toLayoutBlock(cloneLayoutObject); 591 cloneBlock = toLayoutBlock(cloneLayoutObject);
592 cloneBlock->setStyle(mutableStyle()); 592 cloneBlock->setStyle(mutableStyle());
593 593
594 // This takes care of setting the right value of childrenInline in case 594 // This takes care of setting the right value of childrenInline in case
595 // generated content is added to cloneBlock and 'this' does not have 595 // generated content is added to cloneBlock and 'this' does not have
596 // generated content added yet. 596 // generated content added yet.
597 cloneBlock->setChildrenInline(cloneBlock->firstChild() ? cloneBlock->fir stChild()->isInline() : childrenInline()); 597 cloneBlock->setChildrenInline(cloneBlock->firstChild() ? cloneBlock->fir stChild()->isInline() : childrenInline());
598 } 598 }
599 cloneBlock->setFlowThreadState(flowThreadState()); 599 cloneBlock->setIsInsideFlowThread(isInsideFlowThread());
600 return cloneBlock; 600 return cloneBlock;
601 } 601 }
602 602
603 void LayoutBlock::splitBlocks(LayoutBlock* fromBlock, LayoutBlock* toBlock, 603 void LayoutBlock::splitBlocks(LayoutBlock* fromBlock, LayoutBlock* toBlock,
604 LayoutBlock* middleBlock, 604 LayoutBlock* middleBlock,
605 LayoutObject* beforeChild, LayoutBoxModelObject* oldCont) 605 LayoutObject* beforeChild, LayoutBoxModelObject* oldCont)
606 { 606 {
607 ASSERT(isDescendantOf(fromBlock)); 607 ASSERT(isDescendantOf(fromBlock));
608 608
609 if (!beforeChild && isAfterContent(lastChild())) 609 if (!beforeChild && isAfterContent(lastChild()))
(...skipping 3310 matching lines...) Expand 10 before | Expand all | Expand 10 after
3920 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 3920 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
3921 { 3921 {
3922 showLayoutObject(); 3922 showLayoutObject();
3923 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 3923 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
3924 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 3924 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
3925 } 3925 }
3926 3926
3927 #endif 3927 #endif
3928 3928
3929 } // namespace blink 3929 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698