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 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
501 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge t())) | 501 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge t())) |
502 return true; | 502 return true; |
503 | 503 |
504 if (!rareInheritedData->quotesDataEquivalent(*other.rareInheritedData.ge t())) | 504 if (!rareInheritedData->quotesDataEquivalent(*other.rareInheritedData.ge t())) |
505 return true; | 505 return true; |
506 } | 506 } |
507 | 507 |
508 if (inherited->textAutosizingMultiplier != other.inherited->textAutosizingMu ltiplier) | 508 if (inherited->textAutosizingMultiplier != other.inherited->textAutosizingMu ltiplier) |
509 return true; | 509 return true; |
510 | 510 |
511 if (inherited->font.loadingCustomFonts() && !other.inherited->font.loadingCu stomFonts()) | |
512 return true; | |
rune
2014/12/04 12:54:17
This catches the case going from loading to not lo
rune
2014/12/05 00:21:39
Done.
| |
513 | |
511 if (inherited.get() != other.inherited.get()) { | 514 if (inherited.get() != other.inherited.get()) { |
512 if (inherited->line_height != other.inherited->line_height | 515 if (inherited->line_height != other.inherited->line_height |
513 || inherited->font != other.inherited->font | 516 || inherited->font != other.inherited->font |
514 || inherited->horizontal_border_spacing != other.inherited->horizont al_border_spacing | 517 || inherited->horizontal_border_spacing != other.inherited->horizont al_border_spacing |
515 || inherited->vertical_border_spacing != other.inherited->vertical_b order_spacing) | 518 || inherited->vertical_border_spacing != other.inherited->vertical_b order_spacing) |
516 return true; | 519 return true; |
517 } | 520 } |
518 | 521 |
519 if (inherited_flags._box_direction != other.inherited_flags._box_direction | 522 if (inherited_flags._box_direction != other.inherited_flags._box_direction |
520 || inherited_flags.m_rtlOrdering != other.inherited_flags.m_rtlOrdering | 523 || inherited_flags.m_rtlOrdering != other.inherited_flags.m_rtlOrdering |
(...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1659 horizontal || includeLogicalRightEdge); | 1662 horizontal || includeLogicalRightEdge); |
1660 | 1663 |
1661 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1664 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
1662 visitedDependentColor(CSSPropertyBorderLeftColor), | 1665 visitedDependentColor(CSSPropertyBorderLeftColor), |
1663 borderLeftStyle(), | 1666 borderLeftStyle(), |
1664 borderLeftIsTransparent(), | 1667 borderLeftIsTransparent(), |
1665 !horizontal || includeLogicalLeftEdge); | 1668 !horizontal || includeLogicalLeftEdge); |
1666 } | 1669 } |
1667 | 1670 |
1668 } // namespace blink | 1671 } // namespace blink |
OLD | NEW |