| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 RenderBox::styleDidChange(diff, oldStyle); | 68 RenderBox::styleDidChange(diff, oldStyle); |
| 69 | 69 |
| 70 bool hadStyle = (oldStyle != 0); | 70 bool hadStyle = (oldStyle != 0); |
| 71 float oldZoom = hadStyle ? oldStyle->effectiveZoom() : RenderStyle::initialZ
oom(); | 71 float oldZoom = hadStyle ? oldStyle->effectiveZoom() : RenderStyle::initialZ
oom(); |
| 72 if (style() && style()->effectiveZoom() != oldZoom) | 72 if (style() && style()->effectiveZoom() != oldZoom) |
| 73 intrinsicSizeChanged(); | 73 intrinsicSizeChanged(); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void RenderReplaced::layout() | 76 void RenderReplaced::layout() |
| 77 { | 77 { |
| 78 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 79 ASSERT(needsLayout()); | 78 ASSERT(needsLayout()); |
| 80 | 79 |
| 81 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); | 80 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); |
| 82 | 81 |
| 83 setHeight(minimumReplacedHeight()); | 82 setHeight(minimumReplacedHeight()); |
| 84 | 83 |
| 85 updateLogicalWidth(); | 84 updateLogicalWidth(); |
| 86 updateLogicalHeight(); | 85 updateLogicalHeight(); |
| 87 | 86 |
| 88 m_overflow.clear(); | 87 m_overflow.clear(); |
| (...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 610 | 609 |
| 611 if (style()) { | 610 if (style()) { |
| 612 if (v) | 611 if (v) |
| 613 r.inflate(style()->outlineSize()); | 612 r.inflate(style()->outlineSize()); |
| 614 } | 613 } |
| 615 computeRectForRepaint(repaintContainer, r); | 614 computeRectForRepaint(repaintContainer, r); |
| 616 return r; | 615 return r; |
| 617 } | 616 } |
| 618 | 617 |
| 619 } | 618 } |
| OLD | NEW |