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

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

Issue 697653004: [CSS Grid Layout] Grid items must set a new formatting context. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Applied additional suggested changes. Created 6 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 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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 438
439 protected: 439 protected:
440 // Returns the logicalOffset at the top of the next page. If the offset pass ed in is already at the top of the current page, 440 // Returns the logicalOffset at the top of the next page. If the offset pass ed in is already at the top of the current page,
441 // then nextPageLogicalTop with ExcludePageBoundary will still move to the t op of the next page. nextPageLogicalTop with 441 // then nextPageLogicalTop with ExcludePageBoundary will still move to the t op of the next page. nextPageLogicalTop with
442 // IncludePageBoundary set will not. 442 // IncludePageBoundary set will not.
443 // 443 //
444 // For a page height of 800px, the first rule will return 800 if the value p assed in is 0. The second rule will simply return 0. 444 // For a page height of 800px, the first rule will return 800 if the value p assed in is 0. The second rule will simply return 0.
445 enum PageBoundaryRule { ExcludePageBoundary, IncludePageBoundary }; 445 enum PageBoundaryRule { ExcludePageBoundary, IncludePageBoundary };
446 LayoutUnit nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundaryRule = E xcludePageBoundary) const; 446 LayoutUnit nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundaryRule = E xcludePageBoundary) const;
447 447
448 bool createsBlockFormattingContext() const; 448 bool createsNewFormattingContext() const;
449 449
450 public: 450 public:
451 LayoutUnit pageLogicalHeightForOffset(LayoutUnit offset) const; 451 LayoutUnit pageLogicalHeightForOffset(LayoutUnit offset) const;
452 LayoutUnit pageRemainingLogicalHeightForOffset(LayoutUnit offset, PageBounda ryRule = IncludePageBoundary) const; 452 LayoutUnit pageRemainingLogicalHeightForOffset(LayoutUnit offset, PageBounda ryRule = IncludePageBoundary) const;
453 453
454 protected: 454 protected:
455 // A page break is required at some offset due to space shortage in the curr ent fragmentainer. 455 // A page break is required at some offset due to space shortage in the curr ent fragmentainer.
456 void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage); 456 void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage);
457 457
458 // Update minimum page height required to avoid fragmentation where it shoul dn't occur (inside 458 // Update minimum page height required to avoid fragmentation where it shoul dn't occur (inside
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 // FIXME: This is temporary as we move code that accesses block flow 495 // FIXME: This is temporary as we move code that accesses block flow
496 // member variables out of RenderBlock and into RenderBlockFlow. 496 // member variables out of RenderBlock and into RenderBlockFlow.
497 friend class RenderBlockFlow; 497 friend class RenderBlockFlow;
498 }; 498 };
499 499
500 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 500 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
501 501
502 } // namespace blink 502 } // namespace blink
503 503
504 #endif // RenderBlock_h 504 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-item-margins-not-collapse-expected.html ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698