| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2012 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 | 107 |
| 108 void LayoutFileUploadControl::computePreferredLogicalWidths() | 108 void LayoutFileUploadControl::computePreferredLogicalWidths() |
| 109 { | 109 { |
| 110 ASSERT(preferredLogicalWidthsDirty()); | 110 ASSERT(preferredLogicalWidthsDirty()); |
| 111 | 111 |
| 112 m_minPreferredLogicalWidth = LayoutUnit(); | 112 m_minPreferredLogicalWidth = LayoutUnit(); |
| 113 m_maxPreferredLogicalWidth = LayoutUnit(); | 113 m_maxPreferredLogicalWidth = LayoutUnit(); |
| 114 const ComputedStyle& styleToUse = styleRef(); | 114 const ComputedStyle& styleToUse = styleRef(); |
| 115 | 115 |
| 116 if (styleToUse.width().isFixed() && styleToUse.width().value() > 0) | 116 if (styleToUse.width().isFixed() && styleToUse.width().value() > 0) |
| 117 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentB
oxLogicalWidthForBoxSizing(styleToUse.width().value()); | 117 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentB
oxLogicalWidthForBoxSizing(LayoutUnit(styleToUse.width().value())); |
| 118 else | 118 else |
| 119 computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferred
LogicalWidth); | 119 computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferred
LogicalWidth); |
| 120 | 120 |
| 121 if (styleToUse.minWidth().isFixed() && styleToUse.minWidth().value() > 0) { | 121 if (styleToUse.minWidth().isFixed() && styleToUse.minWidth().value() > 0) { |
| 122 m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjust
ContentBoxLogicalWidthForBoxSizing(LayoutUnit(styleToUse.minWidth().value()))); | 122 m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjust
ContentBoxLogicalWidthForBoxSizing(LayoutUnit(styleToUse.minWidth().value()))); |
| 123 m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjust
ContentBoxLogicalWidthForBoxSizing(LayoutUnit(styleToUse.minWidth().value()))); | 123 m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjust
ContentBoxLogicalWidthForBoxSizing(LayoutUnit(styleToUse.minWidth().value()))); |
| 124 } | 124 } |
| 125 | 125 |
| 126 if (styleToUse.maxWidth().isFixed()) { | 126 if (styleToUse.maxWidth().isFixed()) { |
| 127 m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjust
ContentBoxLogicalWidthForBoxSizing(LayoutUnit(styleToUse.maxWidth().value()))); | 127 m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjust
ContentBoxLogicalWidthForBoxSizing(LayoutUnit(styleToUse.maxWidth().value()))); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 157 } | 157 } |
| 158 | 158 |
| 159 String LayoutFileUploadControl::fileTextValue() const | 159 String LayoutFileUploadControl::fileTextValue() const |
| 160 { | 160 { |
| 161 HTMLInputElement* input = toHTMLInputElement(node()); | 161 HTMLInputElement* input = toHTMLInputElement(node()); |
| 162 ASSERT(input->files()); | 162 ASSERT(input->files()); |
| 163 return LayoutTheme::theme().fileListNameForWidth(input->locale(), input->fil
es(), style()->font(), maxFilenameWidth()); | 163 return LayoutTheme::theme().fileListNameForWidth(input->locale(), input->fil
es(), style()->font(), maxFilenameWidth()); |
| 164 } | 164 } |
| 165 | 165 |
| 166 } // namespace blink | 166 } // namespace blink |
| OLD | NEW |