| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. |
| 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 613 | 613 |
| 614 // FIXME: We would like to use SimplifiedLayout for relative positio
ning, but we can't quite do that yet. | 614 // FIXME: We would like to use SimplifiedLayout for relative positio
ning, but we can't quite do that yet. |
| 615 // We need to make sure SimplifiedLayout can operate correctly on Re
nderInlines (we will need | 615 // We need to make sure SimplifiedLayout can operate correctly on Re
nderInlines (we will need |
| 616 // to add a selfNeedsSimplifiedLayout bit in order to not get confus
ed and taint every line). | 616 // to add a selfNeedsSimplifiedLayout bit in order to not get confus
ed and taint every line). |
| 617 return StyleDifferenceLayout; | 617 return StyleDifferenceLayout; |
| 618 } else if (m_box->zIndex() != other->m_box->zIndex() || m_box->hasAutoZI
ndex() != other->m_box->hasAutoZIndex() | 618 } else if (m_box->zIndex() != other->m_box->zIndex() || m_box->hasAutoZI
ndex() != other->m_box->hasAutoZIndex() |
| 619 || visual->clip != other->visual->clip || visual->hasClip != ot
her->visual->hasClip) | 619 || visual->clip != other->visual->clip || visual->hasClip != ot
her->visual->hasClip) |
| 620 return StyleDifferenceRepaintLayer; | 620 return StyleDifferenceRepaintLayer; |
| 621 } | 621 } |
| 622 | 622 |
| 623 #if ENABLE(CSS_COMPOSITING) | |
| 624 if (rareNonInheritedData->m_effectiveBlendMode != other->rareNonInheritedDat
a->m_effectiveBlendMode) | 623 if (rareNonInheritedData->m_effectiveBlendMode != other->rareNonInheritedDat
a->m_effectiveBlendMode) |
| 625 return StyleDifferenceRepaintLayer; | 624 return StyleDifferenceRepaintLayer; |
| 626 #endif | |
| 627 | 625 |
| 628 if (rareNonInheritedData->opacity != other->rareNonInheritedData->opacity) { | 626 if (rareNonInheritedData->opacity != other->rareNonInheritedData->opacity) { |
| 629 // Don't return early here; instead take note of the type of change, | 627 // Don't return early here; instead take note of the type of change, |
| 630 // and deal with it when looking at compositing. | 628 // and deal with it when looking at compositing. |
| 631 changedContextSensitiveProperties |= ContextSensitivePropertyOpacity; | 629 changedContextSensitiveProperties |= ContextSensitivePropertyOpacity; |
| 632 } | 630 } |
| 633 | 631 |
| 634 #if ENABLE(CSS_FILTERS) | 632 #if ENABLE(CSS_FILTERS) |
| 635 if (rareNonInheritedData->m_filter.get() != other->rareNonInheritedData->m_f
ilter.get() | 633 if (rareNonInheritedData->m_filter.get() != other->rareNonInheritedData->m_f
ilter.get() |
| 636 && *rareNonInheritedData->m_filter.get() != *other->rareNonInheritedData
->m_filter.get()) { | 634 && *rareNonInheritedData->m_filter.get() != *other->rareNonInheritedData
->m_filter.get()) { |
| (...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1598 info.addMember(inherited, "inherited"); | 1596 info.addMember(inherited, "inherited"); |
| 1599 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); | 1597 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); |
| 1600 #if ENABLE(SVG) | 1598 #if ENABLE(SVG) |
| 1601 info.addMember(m_svgStyle, "svgStyle"); | 1599 info.addMember(m_svgStyle, "svgStyle"); |
| 1602 #endif | 1600 #endif |
| 1603 info.addMember(inherited_flags, "inherited_flags"); | 1601 info.addMember(inherited_flags, "inherited_flags"); |
| 1604 info.addMember(noninherited_flags, "noninherited_flags"); | 1602 info.addMember(noninherited_flags, "noninherited_flags"); |
| 1605 } | 1603 } |
| 1606 | 1604 |
| 1607 } // namespace WebCore | 1605 } // namespace WebCore |
| OLD | NEW |