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 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
727 if (m_inheritedData.m_borderCollapse | 727 if (m_inheritedData.m_borderCollapse |
728 && ((borderTopStyle() == BorderStyleHidden && other.borderTopStyle()
== BorderStyleNone) | 728 && ((borderTopStyle() == BorderStyleHidden && other.borderTopStyle()
== BorderStyleNone) |
729 || (borderTopStyle() == BorderStyleNone && other.borderTopStyle(
) == BorderStyleHidden) | 729 || (borderTopStyle() == BorderStyleNone && other.borderTopStyle(
) == BorderStyleHidden) |
730 || (borderBottomStyle() == BorderStyleHidden && other.borderBott
omStyle() == BorderStyleNone) | 730 || (borderBottomStyle() == BorderStyleHidden && other.borderBott
omStyle() == BorderStyleNone) |
731 || (borderBottomStyle() == BorderStyleNone && other.borderBottom
Style() == BorderStyleHidden) | 731 || (borderBottomStyle() == BorderStyleNone && other.borderBottom
Style() == BorderStyleHidden) |
732 || (borderLeftStyle() == BorderStyleHidden && other.borderLeftSt
yle() == BorderStyleNone) | 732 || (borderLeftStyle() == BorderStyleHidden && other.borderLeftSt
yle() == BorderStyleNone) |
733 || (borderLeftStyle() == BorderStyleNone && other.borderLeftStyl
e() == BorderStyleHidden) | 733 || (borderLeftStyle() == BorderStyleNone && other.borderLeftStyl
e() == BorderStyleHidden) |
734 || (borderRightStyle() == BorderStyleHidden && other.borderRight
Style() == BorderStyleNone) | 734 || (borderRightStyle() == BorderStyleHidden && other.borderRight
Style() == BorderStyleNone) |
735 || (borderRightStyle() == BorderStyleNone && other.borderRightSt
yle() == BorderStyleHidden))) | 735 || (borderRightStyle() == BorderStyleNone && other.borderRightSt
yle() == BorderStyleHidden))) |
736 return true; | 736 return true; |
737 } else if (m_nonInheritedData.m_effectiveDisplay == LIST_ITEM) { | 737 } else if (display() == EDisplay::ListItem) { |
738 if (m_inheritedData.m_listStyleType != other.m_inheritedData.m_listStyle
Type | 738 if (m_inheritedData.m_listStyleType != other.m_inheritedData.m_listStyle
Type |
739 || m_inheritedData.m_listStylePosition != other.m_inheritedData.m_li
stStylePosition) | 739 || m_inheritedData.m_listStylePosition != other.m_inheritedData.m_li
stStylePosition) |
740 return true; | 740 return true; |
741 } | 741 } |
742 | 742 |
743 if ((visibility() == EVisibility::Collapse) != (other.visibility() == EVisib
ility::Collapse)) | 743 if ((visibility() == EVisibility::Collapse) != (other.visibility() == EVisib
ility::Collapse)) |
744 return true; | 744 return true; |
745 | 745 |
746 if (hasPseudoStyle(PseudoIdScrollbar) != other.hasPseudoStyle(PseudoIdScroll
bar)) | 746 if (hasPseudoStyle(PseudoIdScrollbar) != other.hasPseudoStyle(PseudoIdScroll
bar)) |
747 return true; | 747 return true; |
(...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2053 if (value < 0) | 2053 if (value < 0) |
2054 fvalue -= 0.5f; | 2054 fvalue -= 0.5f; |
2055 else | 2055 else |
2056 fvalue += 0.5f; | 2056 fvalue += 0.5f; |
2057 } | 2057 } |
2058 | 2058 |
2059 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2059 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
2060 } | 2060 } |
2061 | 2061 |
2062 } // namespace blink | 2062 } // namespace blink |
OLD | NEW |