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

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

Issue 567463004: Move adjustForUnsplittableChild() from RenderBlock to RenderBlockFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 460
461 protected: 461 protected:
462 // A page break is required at some offset due to space shortage in the curr ent fragmentainer. 462 // A page break is required at some offset due to space shortage in the curr ent fragmentainer.
463 void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage); 463 void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage);
464 464
465 // Update minimum page height required to avoid fragmentation where it shoul dn't occur (inside 465 // Update minimum page height required to avoid fragmentation where it shoul dn't occur (inside
466 // unbreakable content, between orphans and widows, etc.). This will be used as a hint to the 466 // unbreakable content, between orphans and widows, etc.). This will be used as a hint to the
467 // column balancer to help set a good minimum column height. 467 // column balancer to help set a good minimum column height.
468 void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight); 468 void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight);
469 469
470 LayoutUnit adjustForUnsplittableChild(RenderBox* child, LayoutUnit logicalOf fset, bool includeMargins = false); // If the child is unsplittable and can't fi t on the current page, return the top of the next page/column.
471
472 // Adjust from painting offsets to the local coords of this renderer 470 // Adjust from painting offsets to the local coords of this renderer
473 void offsetForContents(LayoutPoint&) const; 471 void offsetForContents(LayoutPoint&) const;
474 472
475 bool requiresColumns(int desiredColumnCount) const; 473 bool requiresColumns(int desiredColumnCount) const;
476 474
477 virtual bool updateLogicalWidthAndColumnWidth(); 475 virtual bool updateLogicalWidthAndColumnWidth();
478 476
479 virtual bool canCollapseAnonymousBlockChild() const { return true; } 477 virtual bool canCollapseAnonymousBlockChild() const { return true; }
480 478
481 public: 479 public:
(...skipping 22 matching lines...) Expand all
504 // FIXME: This is temporary as we move code that accesses block flow 502 // FIXME: This is temporary as we move code that accesses block flow
505 // member variables out of RenderBlock and into RenderBlockFlow. 503 // member variables out of RenderBlock and into RenderBlockFlow.
506 friend class RenderBlockFlow; 504 friend class RenderBlockFlow;
507 }; 505 };
508 506
509 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 507 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
510 508
511 } // namespace blink 509 } // namespace blink
512 510
513 #endif // RenderBlock_h 511 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderBlock.cpp » ('j') | Source/core/rendering/RenderBlockFlow.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698