OLD | NEW |
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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 // These two functions are overridden for inline-block. | 126 // These two functions are overridden for inline-block. |
127 LayoutUnit LineHeight( | 127 LayoutUnit LineHeight( |
128 bool first_line, | 128 bool first_line, |
129 LineDirectionMode, | 129 LineDirectionMode, |
130 LinePositionMode = kPositionOnContainingLine) const final; | 130 LinePositionMode = kPositionOnContainingLine) const final; |
131 int BaselinePosition( | 131 int BaselinePosition( |
132 FontBaseline, | 132 FontBaseline, |
133 bool first_line, | 133 bool first_line, |
134 LineDirectionMode, | 134 LineDirectionMode, |
135 LinePositionMode = kPositionOnContainingLine) const override; | 135 LinePositionMode = kPositionOnContainingLine) const override; |
| 136 bool UseLogicalBottomMarginEdgeForInlineBlockBaseline() const; |
136 | 137 |
137 LayoutUnit MinLineHeightForReplacedObject(bool is_first_line, | 138 LayoutUnit MinLineHeightForReplacedObject(bool is_first_line, |
138 LayoutUnit replaced_height) const; | 139 LayoutUnit replaced_height) const; |
139 | 140 |
140 virtual bool CreatesNewFormattingContext() const { return true; } | 141 virtual bool CreatesNewFormattingContext() const { return true; } |
141 | 142 |
142 const char* GetName() const override; | 143 const char* GetName() const override; |
143 | 144 |
144 protected: | 145 protected: |
145 // Insert a child correctly into the tree when |beforeDescendant| isn't a | 146 // Insert a child correctly into the tree when |beforeDescendant| isn't a |
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 // TODO(loonybear): Temporary in order to ensure compatibility with existing | 567 // TODO(loonybear): Temporary in order to ensure compatibility with existing |
567 // layout test results. | 568 // layout test results. |
568 virtual void AdjustChildDebugRect(LayoutRect&) const {} | 569 virtual void AdjustChildDebugRect(LayoutRect&) const {} |
569 }; | 570 }; |
570 | 571 |
571 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, IsLayoutBlock()); | 572 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, IsLayoutBlock()); |
572 | 573 |
573 } // namespace blink | 574 } // namespace blink |
574 | 575 |
575 #endif // LayoutBlock_h | 576 #endif // LayoutBlock_h |
OLD | NEW |