| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 } | 167 } |
| 168 LayoutUnit marginLogicalRight() const { | 168 LayoutUnit marginLogicalRight() const { |
| 169 if (!includeLogicalRightEdge()) | 169 if (!includeLogicalRightEdge()) |
| 170 return LayoutUnit(); | 170 return LayoutUnit(); |
| 171 return isHorizontal() ? boxModelObject().marginRight() | 171 return isHorizontal() ? boxModelObject().marginRight() |
| 172 : boxModelObject().marginBottom(); | 172 : boxModelObject().marginBottom(); |
| 173 } | 173 } |
| 174 LayoutUnit marginLogicalWidth() const { | 174 LayoutUnit marginLogicalWidth() const { |
| 175 return marginLogicalLeft() + marginLogicalRight(); | 175 return marginLogicalLeft() + marginLogicalRight(); |
| 176 } | 176 } |
| 177 int borderLogicalLeft() const { | 177 LayoutUnit borderLogicalLeft() const { |
| 178 if (!includeLogicalLeftEdge()) | 178 if (!includeLogicalLeftEdge()) |
| 179 return 0; | 179 return LayoutUnit(); |
| 180 return isHorizontal() | 180 return LayoutUnit( |
| 181 ? getLineLayoutItem() | 181 isHorizontal() |
| 182 .style(isFirstLineStyle()) | 182 ? getLineLayoutItem().style(isFirstLineStyle())->borderLeftWidth() |
| 183 ->borderLeftWidth() | 183 : getLineLayoutItem().style(isFirstLineStyle())->borderTopWidth()); |
| 184 : getLineLayoutItem() | |
| 185 .style(isFirstLineStyle()) | |
| 186 ->borderTopWidth(); | |
| 187 } | 184 } |
| 188 int borderLogicalRight() const { | 185 LayoutUnit borderLogicalRight() const { |
| 189 if (!includeLogicalRightEdge()) | 186 if (!includeLogicalRightEdge()) |
| 190 return 0; | 187 return LayoutUnit(); |
| 191 return isHorizontal() | 188 return LayoutUnit( |
| 192 ? getLineLayoutItem() | 189 isHorizontal() |
| 193 .style(isFirstLineStyle()) | 190 ? getLineLayoutItem().style(isFirstLineStyle())->borderRightWidth() |
| 194 ->borderRightWidth() | 191 : getLineLayoutItem() |
| 195 : getLineLayoutItem() | 192 .style(isFirstLineStyle()) |
| 196 .style(isFirstLineStyle()) | 193 ->borderBottomWidth()); |
| 197 ->borderBottomWidth(); | |
| 198 } | 194 } |
| 199 int paddingLogicalLeft() const { | 195 int paddingLogicalLeft() const { |
| 200 if (!includeLogicalLeftEdge()) | 196 if (!includeLogicalLeftEdge()) |
| 201 return 0; | 197 return 0; |
| 202 return (isHorizontal() ? boxModelObject().paddingLeft() | 198 return (isHorizontal() ? boxModelObject().paddingLeft() |
| 203 : boxModelObject().paddingTop()) | 199 : boxModelObject().paddingTop()) |
| 204 .toInt(); | 200 .toInt(); |
| 205 } | 201 } |
| 206 int paddingLogicalRight() const { | 202 int paddingLogicalRight() const { |
| 207 if (!includeLogicalRightEdge()) | 203 if (!includeLogicalRightEdge()) |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 | 485 |
| 490 inline void InlineFlowBox::setHasBadChildList() { | 486 inline void InlineFlowBox::setHasBadChildList() { |
| 491 #if DCHECK_IS_ON() | 487 #if DCHECK_IS_ON() |
| 492 m_hasBadChildList = true; | 488 m_hasBadChildList = true; |
| 493 #endif | 489 #endif |
| 494 } | 490 } |
| 495 | 491 |
| 496 } // namespace blink | 492 } // namespace blink |
| 497 | 493 |
| 498 #endif // InlineFlowBox_h | 494 #endif // InlineFlowBox_h |
| OLD | NEW |