| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 if (m_fixedSize) { | 51 if (m_fixedSize) { |
| 52 LayoutSize fixedSize(m_imageGeneratorValue->fixedSize(layoutObject)); | 52 LayoutSize fixedSize(m_imageGeneratorValue->fixedSize(layoutObject)); |
| 53 if (multiplier == 1.0f) | 53 if (multiplier == 1.0f) |
| 54 return fixedSize; | 54 return fixedSize; |
| 55 | 55 |
| 56 LayoutUnit width = fixedSize.width() * multiplier; | 56 LayoutUnit width = fixedSize.width() * multiplier; |
| 57 LayoutUnit height = fixedSize.height() * multiplier; | 57 LayoutUnit height = fixedSize.height() * multiplier; |
| 58 | 58 |
| 59 // Don't let images that have a width/height >= 1 shrink below 1 when zo
omed. | 59 // Don't let images that have a width/height >= 1 shrink below 1 when zo
omed. |
| 60 if (fixedSize.width() > 0) | 60 if (fixedSize.width() > 0) |
| 61 width = max<LayoutUnit>(1, width); | 61 width = max(LayoutUnit(1), width); |
| 62 | 62 |
| 63 if (fixedSize.height() > 0) | 63 if (fixedSize.height() > 0) |
| 64 height = max<LayoutUnit>(1, height); | 64 height = max(LayoutUnit(1), height); |
| 65 | 65 |
| 66 return LayoutSize(width, height); | 66 return LayoutSize(width, height); |
| 67 } | 67 } |
| 68 | 68 |
| 69 return LayoutSize(); | 69 return LayoutSize(); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void StyleGeneratedImage::computeIntrinsicDimensions(const LayoutObject* layoutO
bject, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRati
o) | 72 void StyleGeneratedImage::computeIntrinsicDimensions(const LayoutObject* layoutO
bject, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRati
o) |
| 73 { | 73 { |
| 74 // At a zoom level of 1 the image is guaranteed to have an integer size. | 74 // At a zoom level of 1 the image is guaranteed to have an integer size. |
| (...skipping 23 matching lines...) Expand all Loading... |
| 98 return m_imageGeneratorValue->knownToBeOpaque(layoutObject); | 98 return m_imageGeneratorValue->knownToBeOpaque(layoutObject); |
| 99 } | 99 } |
| 100 | 100 |
| 101 DEFINE_TRACE(StyleGeneratedImage) | 101 DEFINE_TRACE(StyleGeneratedImage) |
| 102 { | 102 { |
| 103 visitor->trace(m_imageGeneratorValue); | 103 visitor->trace(m_imageGeneratorValue); |
| 104 StyleImage::trace(visitor); | 104 StyleImage::trace(visitor); |
| 105 } | 105 } |
| 106 | 106 |
| 107 } // namespace blink | 107 } // namespace blink |
| OLD | NEW |