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

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

Issue 1399493002: Column balancing refactoring. Don't propagate data during layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more code review Created 5 years, 2 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 2680 matching lines...) Expand 10 before | Expand all | Expand 10 after
2691 // question (i.e. no remaining space), rather than being part of the latter (i.e. one 2691 // question (i.e. no remaining space), rather than being part of the latter (i.e. one
2692 // whole page length of remaining space). 2692 // whole page length of remaining space).
2693 remainingHeight = intMod(remainingHeight, pageLogicalHeight); 2693 remainingHeight = intMod(remainingHeight, pageLogicalHeight);
2694 } 2694 }
2695 return remainingHeight; 2695 return remainingHeight;
2696 } 2696 }
2697 2697
2698 return flowThread->pageRemainingLogicalHeightForOffset(offset, pageBoundaryR ule); 2698 return flowThread->pageRemainingLogicalHeightForOffset(offset, pageBoundaryR ule);
2699 } 2699 }
2700 2700
2701 void LayoutBlock::setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage) 2701 void LayoutBlock::paginatedContentWasLaidOut(LayoutUnit logicalTopOffsetAfterPag ination)
2702 { 2702 {
2703 if (LayoutFlowThread* flowThread = flowThreadContainingBlock()) 2703 if (LayoutFlowThread* flowThread = flowThreadContainingBlock())
2704 flowThread->setPageBreak(offsetFromLogicalTopOfFirstPage() + offset, spa ceShortage); 2704 flowThread->contentWasLaidOut(offsetFromLogicalTopOfFirstPage() + logica lTopOffsetAfterPagination);
2705 } 2705 }
2706 2706
2707 void LayoutBlock::updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeigh t) 2707 void LayoutBlock::updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeigh t)
2708 { 2708 {
2709 if (LayoutFlowThread* flowThread = flowThreadContainingBlock()) 2709 if (LayoutFlowThread* flowThread = flowThreadContainingBlock())
2710 flowThread->updateMinimumPageHeight(offsetFromLogicalTopOfFirstPage() + offset, minHeight); 2710 flowThread->updateMinimumPageHeight(offsetFromLogicalTopOfFirstPage() + offset, minHeight);
2711 } 2711 }
2712 2712
2713 LayoutUnit LayoutBlock::collapsedMarginBeforeForChild(const LayoutBox& child) co nst 2713 LayoutUnit LayoutBlock::collapsedMarginBeforeForChild(const LayoutBox& child) co nst
2714 { 2714 {
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
2942 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2942 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2943 { 2943 {
2944 showLayoutObject(); 2944 showLayoutObject();
2945 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2945 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2946 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2946 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2947 } 2947 }
2948 2948
2949 #endif 2949 #endif
2950 2950
2951 } // namespace blink 2951 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.h ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698