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

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

Issue 135043007: Remove default parameter from virtual layoutBlock function (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBlockFlow.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1511 matching lines...) Expand 10 before | Expand all | Expand 10 after
1522 if (!hasSpecifiedPageLogicalHeight && !pageLogicalHeight) 1522 if (!hasSpecifiedPageLogicalHeight && !pageLogicalHeight)
1523 colInfo->clearForcedBreaks(); 1523 colInfo->clearForcedBreaks();
1524 1524
1525 colInfo->setPaginationUnit(paginationUnit()); 1525 colInfo->setPaginationUnit(paginationUnit());
1526 } else if (isRenderFlowThread()) { 1526 } else if (isRenderFlowThread()) {
1527 pageLogicalHeight = 1; // This is just a hack to always make sure we hav e a page logical height. 1527 pageLogicalHeight = 1; // This is just a hack to always make sure we hav e a page logical height.
1528 pageLogicalHeightChanged = toRenderFlowThread(this)->pageLogicalSizeChan ged(); 1528 pageLogicalHeightChanged = toRenderFlowThread(this)->pageLogicalSizeChan ged();
1529 } 1529 }
1530 } 1530 }
1531 1531
1532 void RenderBlock::layoutBlock(bool, LayoutUnit) 1532 void RenderBlock::layoutBlock(bool)
1533 { 1533 {
1534 ASSERT_NOT_REACHED(); 1534 ASSERT_NOT_REACHED();
1535 clearNeedsLayout(); 1535 clearNeedsLayout();
1536 } 1536 }
1537 1537
1538 void RenderBlock::addOverflowFromChildren() 1538 void RenderBlock::addOverflowFromChildren()
1539 { 1539 {
1540 if (!hasColumns()) { 1540 if (!hasColumns()) {
1541 if (childrenInline()) 1541 if (childrenInline())
1542 toRenderBlockFlow(this)->addOverflowFromInlineChildren(); 1542 toRenderBlockFlow(this)->addOverflowFromInlineChildren();
(...skipping 4127 matching lines...) Expand 10 before | Expand all | Expand 10 after
5670 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5670 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5671 { 5671 {
5672 showRenderObject(); 5672 showRenderObject();
5673 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5673 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5674 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5674 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5675 } 5675 }
5676 5676
5677 #endif 5677 #endif
5678 5678
5679 } // namespace WebCore 5679 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698