Chromium Code Reviews| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 return m_image->isLoaded(); | 76 return m_image->isLoaded(); |
| 77 } | 77 } |
| 78 | 78 |
| 79 bool StyleFetchedImage::errorOccurred() const | 79 bool StyleFetchedImage::errorOccurred() const |
| 80 { | 80 { |
| 81 return m_image->errorOccurred(); | 81 return m_image->errorOccurred(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 LayoutSize StyleFetchedImage::imageSize(const LayoutObject* layoutObject, float multiplier) const | 84 LayoutSize StyleFetchedImage::imageSize(const LayoutObject* layoutObject, float multiplier) const |
| 85 { | 85 { |
| 86 return m_image->imageSizeForLayoutObject(layoutObject, multiplier); | 86 RespectImageOrientationEnum shouldRespectImageOrientation = |
| 87 layoutObject ? layoutObject->shouldRespectImageOrientation() : DoNotResp ectImageOrientation; | |
| 88 return m_image->imageSize(shouldRespectImageOrientation, multiplier); | |
|
Yoav Weiss
2015/11/24 10:29:07
Here too, no need to repeat the same logic
davve
2015/11/24 12:49:13
If I had such a function, yes. (again)
| |
| 87 } | 89 } |
| 88 | 90 |
| 89 bool StyleFetchedImage::imageHasRelativeWidth() const | 91 bool StyleFetchedImage::imageHasRelativeWidth() const |
| 90 { | 92 { |
| 91 return m_image->imageHasRelativeWidth(); | 93 return m_image->imageHasRelativeWidth(); |
| 92 } | 94 } |
| 93 | 95 |
| 94 bool StyleFetchedImage::imageHasRelativeHeight() const | 96 bool StyleFetchedImage::imageHasRelativeHeight() const |
| 95 { | 97 { |
| 96 return m_image->imageHasRelativeHeight(); | 98 return m_image->imageHasRelativeHeight(); |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 137 return m_image->currentFrameKnownToBeOpaque(layoutObject); | 139 return m_image->currentFrameKnownToBeOpaque(layoutObject); |
| 138 } | 140 } |
| 139 | 141 |
| 140 DEFINE_TRACE(StyleFetchedImage) | 142 DEFINE_TRACE(StyleFetchedImage) |
| 141 { | 143 { |
| 142 visitor->trace(m_document); | 144 visitor->trace(m_document); |
| 143 StyleImage::trace(visitor); | 145 StyleImage::trace(visitor); |
| 144 } | 146 } |
| 145 | 147 |
| 146 } | 148 } |
| OLD | NEW |