| OLD | NEW |
| 1 /** | 1 /** |
| 2 * Copyright (C) 2005 Apple Computer, Inc. | 2 * Copyright (C) 2005 Apple Computer, Inc. |
| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 { | 93 { |
| 94 ASSERT(linePositionMode == PositionOnContainingLine); | 94 ASSERT(linePositionMode == PositionOnContainingLine); |
| 95 // We want to call the LayoutBlock version of firstLineBoxBaseline to | 95 // We want to call the LayoutBlock version of firstLineBoxBaseline to |
| 96 // avoid LayoutFlexibleBox synthesizing a baseline that we don't want. | 96 // avoid LayoutFlexibleBox synthesizing a baseline that we don't want. |
| 97 // We use this check as a proxy for "are there any line boxes in this button
" | 97 // We use this check as a proxy for "are there any line boxes in this button
" |
| 98 if (!hasLineIfEmpty() && LayoutBlock::firstLineBoxBaseline() == -1) { | 98 if (!hasLineIfEmpty() && LayoutBlock::firstLineBoxBaseline() == -1) { |
| 99 // To ensure that we have a consistent baseline when we have no children
, | 99 // To ensure that we have a consistent baseline when we have no children
, |
| 100 // even when we have the anonymous LayoutBlock child, we calculate the | 100 // even when we have the anonymous LayoutBlock child, we calculate the |
| 101 // baseline for the empty case manually here. | 101 // baseline for the empty case manually here. |
| 102 if (direction == HorizontalLine) { | 102 if (direction == HorizontalLine) { |
| 103 return marginTop() + size().height() - borderBottom() - paddingBotto
m() - horizontalScrollbarHeight(); | 103 return (marginTop() + size().height() - borderBottom() - paddingBott
om() - horizontalScrollbarHeight()).toInt(); |
| 104 } | 104 } |
| 105 return marginRight() + size().width() - borderLeft() - paddingLeft() - v
erticalScrollbarWidth(); | 105 return (marginRight() + size().width() - borderLeft() - paddingLeft() -
verticalScrollbarWidth()).toInt(); |
| 106 } | 106 } |
| 107 return LayoutFlexibleBox::baselinePosition(baseline, firstLine, direction, l
inePositionMode); | 107 return LayoutFlexibleBox::baselinePosition(baseline, firstLine, direction, l
inePositionMode); |
| 108 } | 108 } |
| 109 | 109 |
| 110 | 110 |
| 111 // For compatibility with IE/FF we only clip overflow on input elements. | 111 // For compatibility with IE/FF we only clip overflow on input elements. |
| 112 bool LayoutButton::hasControlClip() const | 112 bool LayoutButton::hasControlClip() const |
| 113 { | 113 { |
| 114 return !isHTMLButtonElement(node()); | 114 return !isHTMLButtonElement(node()); |
| 115 } | 115 } |
| 116 } // namespace blink | 116 } // namespace blink |
| OLD | NEW |