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

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

Issue 1406973008: Calculate minimum column height after layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: code review Created 5 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 * (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 2632 matching lines...) Expand 10 before | Expand all | Expand 10 after
2643 2643
2644 return flowThread->pageRemainingLogicalHeightForOffset(offset, pageBoundaryR ule); 2644 return flowThread->pageRemainingLogicalHeightForOffset(offset, pageBoundaryR ule);
2645 } 2645 }
2646 2646
2647 void LayoutBlock::paginatedContentWasLaidOut(LayoutUnit logicalTopOffsetAfterPag ination) 2647 void LayoutBlock::paginatedContentWasLaidOut(LayoutUnit logicalTopOffsetAfterPag ination)
2648 { 2648 {
2649 if (LayoutFlowThread* flowThread = flowThreadContainingBlock()) 2649 if (LayoutFlowThread* flowThread = flowThreadContainingBlock())
2650 flowThread->contentWasLaidOut(offsetFromLogicalTopOfFirstPage() + logica lTopOffsetAfterPagination); 2650 flowThread->contentWasLaidOut(offsetFromLogicalTopOfFirstPage() + logica lTopOffsetAfterPagination);
2651 } 2651 }
2652 2652
2653 void LayoutBlock::updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeigh t)
2654 {
2655 if (LayoutFlowThread* flowThread = flowThreadContainingBlock())
2656 flowThread->updateMinimumPageHeight(offsetFromLogicalTopOfFirstPage() + offset, minHeight);
2657 }
2658
2659 LayoutUnit LayoutBlock::collapsedMarginBeforeForChild(const LayoutBox& child) co nst 2653 LayoutUnit LayoutBlock::collapsedMarginBeforeForChild(const LayoutBox& child) co nst
2660 { 2654 {
2661 // If the child has the same directionality as we do, then we can just retur n its 2655 // If the child has the same directionality as we do, then we can just retur n its
2662 // collapsed margin. 2656 // collapsed margin.
2663 if (!child.isWritingModeRoot()) 2657 if (!child.isWritingModeRoot())
2664 return child.collapsedMarginBefore(); 2658 return child.collapsedMarginBefore();
2665 2659
2666 // The child has a different directionality. If the child is parallel, then it's just 2660 // The child has a different directionality. If the child is parallel, then it's just
2667 // flipped relative to us. We can use the collapsed margin for the opposite edge. 2661 // flipped relative to us. We can use the collapsed margin for the opposite edge.
2668 if (child.isHorizontalWritingMode() == isHorizontalWritingMode()) 2662 if (child.isHorizontalWritingMode() == isHorizontalWritingMode())
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
2888 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2882 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2889 { 2883 {
2890 showLayoutObject(); 2884 showLayoutObject();
2891 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2885 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2892 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2886 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2893 } 2887 }
2894 2888
2895 #endif 2889 #endif
2896 2890
2897 } // namespace blink 2891 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.h ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698