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

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

Issue 2542723002: Margins that start at fragmentainer boundaries should be collapsed away. (Closed)
Patch Set: Back out an unnecessary and potentially harmful change. Created 4 years 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. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
6 * All rights reserved. 6 * 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 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 // End helper functions and structs used by layoutBlockChildren. 504 // End helper functions and structs used by layoutBlockChildren.
505 505
506 void removeFromGlobalMaps(); 506 void removeFromGlobalMaps();
507 bool widthAvailableToChildrenHasChanged(); 507 bool widthAvailableToChildrenHasChanged();
508 508
509 protected: 509 protected:
510 bool isPageLogicalHeightKnown() const { 510 bool isPageLogicalHeightKnown() const {
511 return pageLogicalHeightForOffset(LayoutUnit()); 511 return pageLogicalHeightForOffset(LayoutUnit());
512 } 512 }
513 513
514 // Returns the logical offset at the top of the next page, for a given offset.
515 LayoutUnit nextPageLogicalTop(LayoutUnit logicalOffset) const;
516
517 // Paginated content inside this block was laid out. 514 // Paginated content inside this block was laid out.
518 // |logicalBottomOffsetAfterPagination| is the logical bottom offset of the 515 // |logicalBottomOffsetAfterPagination| is the logical bottom offset of the
519 // child content after applying any forced or unforced breaks as needed. 516 // child content after applying any forced or unforced breaks as needed.
520 void paginatedContentWasLaidOut( 517 void paginatedContentWasLaidOut(
521 LayoutUnit logicalBottomOffsetAfterPagination); 518 LayoutUnit logicalBottomOffsetAfterPagination);
522 519
523 // Adjust from painting offsets to the local coords of this layoutObject 520 // Adjust from painting offsets to the local coords of this layoutObject
524 void offsetForContents(LayoutPoint&) const; 521 void offsetForContents(LayoutPoint&) const;
525 522
526 PositionWithAffinity positionForPointRespectingEditingBoundaries( 523 PositionWithAffinity positionForPointRespectingEditingBoundaries(
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 // TODO(lunalu): Temporary in order to ensure compatibility with existing 565 // TODO(lunalu): Temporary in order to ensure compatibility with existing
569 // layout test results. 566 // layout test results.
570 virtual void adjustChildDebugRect(LayoutRect&) const {} 567 virtual void adjustChildDebugRect(LayoutRect&) const {}
571 }; 568 };
572 569
573 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 570 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
574 571
575 } // namespace blink 572 } // namespace blink
576 573
577 #endif // LayoutBlock_h 574 #endif // LayoutBlock_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698