| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1578 return; | 1578 return; |
| 1579 } | 1579 } |
| 1580 | 1580 |
| 1581 if ((onlyNeededPositionedMovementLayout() && compositingState() != PaintsInt
oOwnBacking) | 1581 if ((onlyNeededPositionedMovementLayout() && compositingState() != PaintsInt
oOwnBacking) |
| 1582 || (shouldDoFullPaintInvalidationIfSelfPaintingLayer() | 1582 || (shouldDoFullPaintInvalidationIfSelfPaintingLayer() |
| 1583 && hasLayer() | 1583 && hasLayer() |
| 1584 && layer()->isSelfPaintingLayer())) { | 1584 && layer()->isSelfPaintingLayer())) { |
| 1585 setShouldDoFullPaintInvalidationAfterLayout(true, MarkOnlyThis); | 1585 setShouldDoFullPaintInvalidationAfterLayout(true, MarkOnlyThis); |
| 1586 } | 1586 } |
| 1587 | 1587 |
| 1588 if (!invalidatePaintIfNeeded(&newPaintInvalidationContainer, oldPaintInvalid
ationRect, oldPositionFromPaintInvalidationContainer)) | 1588 if (!invalidatePaintIfNeeded(newPaintInvalidationContainer, oldPaintInvalida
tionRect, oldPositionFromPaintInvalidationContainer)) |
| 1589 invalidatePaintForOverflowIfNeeded(); | 1589 invalidatePaintForOverflowIfNeeded(); |
| 1590 | 1590 |
| 1591 // This is for the next invalidatePaintIfNeeded so must be after invalidateP
aintIfNeeded. | 1591 // This is for the next invalidatePaintIfNeeded so must be after invalidateP
aintIfNeeded. |
| 1592 savePreviousBorderBoxSizeIfNeeded(); | 1592 savePreviousBorderBoxSizeIfNeeded(); |
| 1593 | 1593 |
| 1594 // Issue paint invalidations for any scrollbars if there is a scrollable are
a for this renderer. | 1594 // Issue paint invalidations for any scrollbars if there is a scrollable are
a for this renderer. |
| 1595 if (enclosingLayer()) { | 1595 if (enclosingLayer()) { |
| 1596 if (RenderLayerScrollableArea* area = enclosingLayer()->scrollableArea()
) { | 1596 if (RenderLayerScrollableArea* area = enclosingLayer()->scrollableArea()
) { |
| 1597 if (area->hasVerticalBarDamage()) | 1597 if (area->hasVerticalBarDamage()) |
| 1598 invalidatePaintRectangle(area->verticalBarDamage()); | 1598 invalidatePaintRectangle(area->verticalBarDamage()); |
| (...skipping 2437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4036 | 4036 |
| 4037 // Only auto width objects can possibly shrink to avoid floats. | 4037 // Only auto width objects can possibly shrink to avoid floats. |
| 4038 return style()->width().isAuto(); | 4038 return style()->width().isAuto(); |
| 4039 } | 4039 } |
| 4040 | 4040 |
| 4041 bool RenderBox::avoidsFloats() const | 4041 bool RenderBox::avoidsFloats() const |
| 4042 { | 4042 { |
| 4043 return isReplaced() || hasOverflowClip() || isHR() || isLegend() || isWritin
gModeRoot() || isFlexItemIncludingDeprecated(); | 4043 return isReplaced() || hasOverflowClip() || isHR() || isLegend() || isWritin
gModeRoot() || isFlexItemIncludingDeprecated(); |
| 4044 } | 4044 } |
| 4045 | 4045 |
| 4046 InvalidationReason RenderBox::getPaintInvalidationReason(const RenderLayerModelO
bject* paintInvalidationContainer, | 4046 InvalidationReason RenderBox::getPaintInvalidationReason(const RenderLayerModelO
bject& paintInvalidationContainer, |
| 4047 const LayoutRect& oldBounds, const LayoutPoint& oldLocation, const LayoutRec
t& newBounds, const LayoutPoint& newLocation) | 4047 const LayoutRect& oldBounds, const LayoutPoint& oldLocation, const LayoutRec
t& newBounds, const LayoutPoint& newLocation) |
| 4048 { | 4048 { |
| 4049 InvalidationReason invalidationReason = RenderBoxModelObject::getPaintInvali
dationReason(paintInvalidationContainer, oldBounds, oldLocation, newBounds, newL
ocation); | 4049 InvalidationReason invalidationReason = RenderBoxModelObject::getPaintInvali
dationReason(paintInvalidationContainer, oldBounds, oldLocation, newBounds, newL
ocation); |
| 4050 if (invalidationReason != InvalidationNone && invalidationReason != Invalida
tionIncremental) | 4050 if (invalidationReason != InvalidationNone && invalidationReason != Invalida
tionIncremental) |
| 4051 return invalidationReason; | 4051 return invalidationReason; |
| 4052 | 4052 |
| 4053 if (!style()->hasBackground() && !style()->hasBoxDecorations()) | 4053 if (!style()->hasBackground() && !style()->hasBoxDecorations()) |
| 4054 return invalidationReason; | 4054 return invalidationReason; |
| 4055 | 4055 |
| 4056 LayoutSize oldBorderBoxSize; | 4056 LayoutSize oldBorderBoxSize; |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4638 | 4638 |
| 4639 // We need the old border box size only when the box has background or b
ox decorations. | 4639 // We need the old border box size only when the box has background or b
ox decorations. |
| 4640 if (!style()->hasBackground() && !style()->hasBoxDecorations()) | 4640 if (!style()->hasBackground() && !style()->hasBoxDecorations()) |
| 4641 return; | 4641 return; |
| 4642 } | 4642 } |
| 4643 | 4643 |
| 4644 ensureRareData().m_previousBorderBoxSize = size(); | 4644 ensureRareData().m_previousBorderBoxSize = size(); |
| 4645 } | 4645 } |
| 4646 | 4646 |
| 4647 } // namespace WebCore | 4647 } // namespace WebCore |
| OLD | NEW |