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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 if ((rareNonInheritedData->opacity == 1 && other->rareNonInheritedData->opac
ity < 1) | 573 if ((rareNonInheritedData->opacity == 1 && other->rareNonInheritedData->opac
ity < 1) |
574 || (rareNonInheritedData->opacity < 1 && other->rareNonInheritedData->op
acity == 1)) { | 574 || (rareNonInheritedData->opacity < 1 && other->rareNonInheritedData->op
acity == 1)) { |
575 // FIXME: We would like to use SimplifiedLayout here, but we can't quite
do that yet. | 575 // FIXME: We would like to use SimplifiedLayout here, but we can't quite
do that yet. |
576 // We need to make sure SimplifiedLayout can operate correctly on Render
Inlines (we will need | 576 // We need to make sure SimplifiedLayout can operate correctly on Render
Inlines (we will need |
577 // to add a selfNeedsSimplifiedLayout bit in order to not get confused a
nd taint every line). | 577 // to add a selfNeedsSimplifiedLayout bit in order to not get confused a
nd taint every line). |
578 // In addition we need to solve the floating object issue when layers co
me and go. Right now | 578 // In addition we need to solve the floating object issue when layers co
me and go. Right now |
579 // a full layout is necessary to keep floating object lists sane. | 579 // a full layout is necessary to keep floating object lists sane. |
580 return StyleDifferenceLayout; | 580 return StyleDifferenceLayout; |
581 } | 581 } |
582 | 582 |
583 if (!QuotesData::equals(rareInheritedData->quotes.get(), other->rareInherite
dData->quotes.get())) | |
584 return StyleDifferenceLayout; | |
585 | |
586 #if ENABLE(SVG) | 583 #if ENABLE(SVG) |
587 // SVGRenderStyle::diff() might have returned StyleDifferenceRepaint, eg. if
fill changes. | 584 // SVGRenderStyle::diff() might have returned StyleDifferenceRepaint, eg. if
fill changes. |
588 // If eg. the font-size changed at the same time, we're not allowed to retur
n StyleDifferenceRepaint, | 585 // If eg. the font-size changed at the same time, we're not allowed to retur
n StyleDifferenceRepaint, |
589 // but have to return StyleDifferenceLayout, that's why this if branch come
s after all branches | 586 // but have to return StyleDifferenceLayout, that's why this if branch come
s after all branches |
590 // that are relevant for SVG and might return StyleDifferenceLayout. | 587 // that are relevant for SVG and might return StyleDifferenceLayout. |
591 if (svgChange != StyleDifferenceEqual) | 588 if (svgChange != StyleDifferenceEqual) |
592 return svgChange; | 589 return svgChange; |
593 #endif | 590 #endif |
594 | 591 |
595 // Make sure these left/top/right/bottom checks stay below all layout checks
and above | 592 // Make sure these left/top/right/bottom checks stay below all layout checks
and above |
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1504 // FIXME: inherited contains StyleImage and Font fields that might need to b
e instrumented. | 1501 // FIXME: inherited contains StyleImage and Font fields that might need to b
e instrumented. |
1505 info.addMember(inherited); | 1502 info.addMember(inherited); |
1506 if (m_cachedPseudoStyles) | 1503 if (m_cachedPseudoStyles) |
1507 info.addVectorPtr(m_cachedPseudoStyles.get()); | 1504 info.addVectorPtr(m_cachedPseudoStyles.get()); |
1508 #if ENABLE(SVG) | 1505 #if ENABLE(SVG) |
1509 info.addMember(m_svgStyle); | 1506 info.addMember(m_svgStyle); |
1510 #endif | 1507 #endif |
1511 } | 1508 } |
1512 | 1509 |
1513 } // namespace WebCore | 1510 } // namespace WebCore |
OLD | NEW |