OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org) | 3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org) |
4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. | 4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. |
5 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. | 5 * Copyright (C) Research In Motion Limited 2011-2012. 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 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 { | 238 { |
239 if (style()->logicalHeight().isAuto()) | 239 if (style()->logicalHeight().isAuto()) |
240 return false; | 240 return false; |
241 | 241 |
242 if (style()->logicalHeight().isSpecified()) { | 242 if (style()->logicalHeight().isSpecified()) { |
243 if (hasAutoHeightOrContainingBlockWithAutoHeight()) | 243 if (hasAutoHeightOrContainingBlockWithAutoHeight()) |
244 return false; | 244 return false; |
245 return true; | 245 return true; |
246 } | 246 } |
247 | 247 |
| 248 if (style()->logicalHeight().isIntrinsic()) |
| 249 return true; |
| 250 |
248 return false; | 251 return false; |
249 } | 252 } |
250 | 253 |
251 static inline bool rendererHasAspectRatio(const RenderObject* renderer) | 254 static inline bool rendererHasAspectRatio(const RenderObject* renderer) |
252 { | 255 { |
253 ASSERT(renderer); | 256 ASSERT(renderer); |
254 return renderer->isImage() || renderer->isCanvas() || renderer->isVideo(); | 257 return renderer->isImage() || renderer->isCanvas() || renderer->isVideo(); |
255 } | 258 } |
256 | 259 |
257 void RenderReplaced::computeAspectRatioInformationForRenderBox(RenderBox* conten
tRenderer, FloatSize& constrainedSize, double& intrinsicRatio, bool& isPercentag
eIntrinsicSize) const | 260 void RenderReplaced::computeAspectRatioInformationForRenderBox(RenderBox* conten
tRenderer, FloatSize& constrainedSize, double& intrinsicRatio, bool& isPercentag
eIntrinsicSize) const |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 return r; | 576 return r; |
574 } | 577 } |
575 | 578 |
576 void RenderReplaced::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | 579 void RenderReplaced::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
577 { | 580 { |
578 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering)
; | 581 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering)
; |
579 RenderBox::reportMemoryUsage(memoryObjectInfo); | 582 RenderBox::reportMemoryUsage(memoryObjectInfo); |
580 } | 583 } |
581 | 584 |
582 } | 585 } |
OLD | NEW |