| 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 int borderLogicalRight() const | 148 int borderLogicalRight() const |
| 149 { | 149 { |
| 150 if (!includeLogicalRightEdge()) | 150 if (!includeLogicalRightEdge()) |
| 151 return 0; | 151 return 0; |
| 152 return isHorizontal() ? getLineLayoutItem().style(isFirstLineStyle())->b
orderRightWidth() : getLineLayoutItem().style(isFirstLineStyle())->borderBottomW
idth(); | 152 return isHorizontal() ? getLineLayoutItem().style(isFirstLineStyle())->b
orderRightWidth() : getLineLayoutItem().style(isFirstLineStyle())->borderBottomW
idth(); |
| 153 } | 153 } |
| 154 int paddingLogicalLeft() const | 154 int paddingLogicalLeft() const |
| 155 { | 155 { |
| 156 if (!includeLogicalLeftEdge()) | 156 if (!includeLogicalLeftEdge()) |
| 157 return 0; | 157 return 0; |
| 158 return isHorizontal() ? boxModelObject().paddingLeft() : boxModelObject(
).paddingTop(); | 158 return (isHorizontal() ? boxModelObject().paddingLeft() : boxModelObject
().paddingTop()).toInt(); |
| 159 } | 159 } |
| 160 int paddingLogicalRight() const | 160 int paddingLogicalRight() const |
| 161 { | 161 { |
| 162 if (!includeLogicalRightEdge()) | 162 if (!includeLogicalRightEdge()) |
| 163 return 0; | 163 return 0; |
| 164 return isHorizontal() ? boxModelObject().paddingRight() : boxModelObject
().paddingBottom(); | 164 return (isHorizontal() ? boxModelObject().paddingRight() : boxModelObjec
t().paddingBottom()).toInt(); |
| 165 } | 165 } |
| 166 | 166 |
| 167 bool includeLogicalLeftEdge() const { return m_includeLogicalLeftEdge; } | 167 bool includeLogicalLeftEdge() const { return m_includeLogicalLeftEdge; } |
| 168 bool includeLogicalRightEdge() const { return m_includeLogicalRightEdge; } | 168 bool includeLogicalRightEdge() const { return m_includeLogicalRightEdge; } |
| 169 void setEdges(bool includeLeft, bool includeRight) | 169 void setEdges(bool includeLeft, bool includeRight) |
| 170 { | 170 { |
| 171 m_includeLogicalLeftEdge = includeLeft; | 171 m_includeLogicalLeftEdge = includeLeft; |
| 172 m_includeLogicalRightEdge = includeRight; | 172 m_includeLogicalRightEdge = includeRight; |
| 173 } | 173 } |
| 174 | 174 |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 inline void InlineFlowBox::setHasBadChildList() | 367 inline void InlineFlowBox::setHasBadChildList() |
| 368 { | 368 { |
| 369 #if ENABLE(ASSERT) | 369 #if ENABLE(ASSERT) |
| 370 m_hasBadChildList = true; | 370 m_hasBadChildList = true; |
| 371 #endif | 371 #endif |
| 372 } | 372 } |
| 373 | 373 |
| 374 } // namespace blink | 374 } // namespace blink |
| 375 | 375 |
| 376 #endif // InlineFlowBox_h | 376 #endif // InlineFlowBox_h |
| OLD | NEW |