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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 246403015: [New Multicolumn] Create RenderMultiColumnSet during renderer creation, not during layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
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 4691 matching lines...) Expand 10 before | Expand all | Expand 10 after
4702 ASSERT_NOT_REACHED(); 4702 ASSERT_NOT_REACHED();
4703 return 0; 4703 return 0;
4704 } 4704 }
4705 4705
4706 RenderRegion* RenderBlock::regionAtBlockOffset(LayoutUnit blockOffset) const 4706 RenderRegion* RenderBlock::regionAtBlockOffset(LayoutUnit blockOffset) const
4707 { 4707 {
4708 RenderFlowThread* flowThread = flowThreadContainingBlock(); 4708 RenderFlowThread* flowThread = flowThreadContainingBlock();
4709 if (!flowThread || !flowThread->hasValidRegionInfo()) 4709 if (!flowThread || !flowThread->hasValidRegionInfo())
4710 return 0; 4710 return 0;
4711 4711
4712 return flowThread->regionAtBlockOffset(offsetFromLogicalTopOfFirstPage() + b lockOffset, true); 4712 return flowThread->regionAtBlockOffset(offsetFromLogicalTopOfFirstPage() + b lockOffset);
4713 } 4713 }
4714 4714
4715 LayoutUnit RenderBlock::collapsedMarginBeforeForChild(const RenderBox* child) co nst 4715 LayoutUnit RenderBlock::collapsedMarginBeforeForChild(const RenderBox* child) co nst
4716 { 4716 {
4717 // If the child has the same directionality as we do, then we can just retur n its 4717 // If the child has the same directionality as we do, then we can just retur n its
4718 // collapsed margin. 4718 // collapsed margin.
4719 if (!child->isWritingModeRoot()) 4719 if (!child->isWritingModeRoot())
4720 return child->collapsedMarginBefore(); 4720 return child->collapsedMarginBefore();
4721 4721
4722 // The child has a different directionality. If the child is parallel, then it's just 4722 // The child has a different directionality. If the child is parallel, then it's just
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
4954 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4954 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4955 { 4955 {
4956 showRenderObject(); 4956 showRenderObject();
4957 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4957 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4958 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4958 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4959 } 4959 }
4960 4960
4961 #endif 4961 #endif
4962 4962
4963 } // namespace WebCore 4963 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderFlowThread.h » ('j') | Source/core/rendering/RenderMultiColumnFlowThread.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698