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

Side by Side Diff: Source/core/layout/LayoutBlock.h

Issue 1163583006: Don't eat margins when column height isn't yet known. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | Annotate | Revision Log
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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 LayoutBlock* continuationBefore(LayoutObject* beforeChild); 405 LayoutBlock* continuationBefore(LayoutObject* beforeChild);
406 LayoutBlockFlow* containingColumnsBlock(bool allowAnonymousColumnBlock = tru e); 406 LayoutBlockFlow* containingColumnsBlock(bool allowAnonymousColumnBlock = tru e);
407 LayoutBlockFlow* columnsBlockForSpanningElement(LayoutObject* newChild); 407 LayoutBlockFlow* columnsBlockForSpanningElement(LayoutObject* newChild);
408 408
409 // End helper functions and structs used by layoutBlockChildren. 409 // End helper functions and structs used by layoutBlockChildren.
410 410
411 void removeFromGlobalMaps(); 411 void removeFromGlobalMaps();
412 bool widthAvailableToChildrenHasChanged(); 412 bool widthAvailableToChildrenHasChanged();
413 413
414 protected: 414 protected:
415 bool isPageLogicalHeightKnown(LayoutUnit logicalOffset) const { return pageL ogicalHeightForOffset(logicalOffset); }
416
415 // 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, 417 // 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,
416 // then nextPageLogicalTop with ExcludePageBoundary will still move to the t op of the next page. nextPageLogicalTop with 418 // then nextPageLogicalTop with ExcludePageBoundary will still move to the t op of the next page. nextPageLogicalTop with
417 // IncludePageBoundary set will not. 419 // IncludePageBoundary set will not.
418 // 420 //
419 // 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. 421 // 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.
420 enum PageBoundaryRule { ExcludePageBoundary, IncludePageBoundary }; 422 enum PageBoundaryRule { ExcludePageBoundary, IncludePageBoundary };
421 LayoutUnit nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundaryRule = E xcludePageBoundary) const; 423 LayoutUnit nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundaryRule = E xcludePageBoundary) const;
422 424
423 bool createsNewFormattingContext() const; 425 bool createsNewFormattingContext() const;
424 426
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 // FIXME: This is temporary as we move code that accesses block flow 466 // FIXME: This is temporary as we move code that accesses block flow
465 // member variables out of LayoutBlock and into LayoutBlockFlow. 467 // member variables out of LayoutBlock and into LayoutBlockFlow.
466 friend class LayoutBlockFlow; 468 friend class LayoutBlockFlow;
467 }; 469 };
468 470
469 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 471 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
470 472
471 } // namespace blink 473 } // namespace blink
472 474
473 #endif // LayoutBlock_h 475 #endif // LayoutBlock_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698