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 | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
4 * reserved. | 4 * reserved. |
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
835 other.m_nonInheritedData.m_unicodeBidi || | 835 other.m_nonInheritedData.m_unicodeBidi || |
836 floating() != other.floating() || | 836 floating() != other.floating() || |
837 m_nonInheritedData.m_originalDisplay != | 837 m_nonInheritedData.m_originalDisplay != |
838 other.m_nonInheritedData.m_originalDisplay) | 838 other.m_nonInheritedData.m_originalDisplay) |
839 return true; | 839 return true; |
840 | 840 |
841 if (isDisplayTableType(display())) { | 841 if (isDisplayTableType(display())) { |
842 if (m_inheritedData.m_borderCollapse != | 842 if (m_inheritedData.m_borderCollapse != |
843 other.m_inheritedData.m_borderCollapse || | 843 other.m_inheritedData.m_borderCollapse || |
844 emptyCells() != other.emptyCells() || | 844 emptyCells() != other.emptyCells() || |
845 m_inheritedData.m_captionSide != other.m_inheritedData.m_captionSide || | 845 captionSide() != other.captionSide() || |
846 m_nonInheritedData.m_tableLayout != | 846 m_nonInheritedData.m_tableLayout != |
847 other.m_nonInheritedData.m_tableLayout) | 847 other.m_nonInheritedData.m_tableLayout) |
848 return true; | 848 return true; |
849 | 849 |
850 // In the collapsing border model, 'hidden' suppresses other borders, while | 850 // In the collapsing border model, 'hidden' suppresses other borders, while |
851 // 'none' does not, so these style differences can be width differences. | 851 // 'none' does not, so these style differences can be width differences. |
852 if (m_inheritedData.m_borderCollapse && | 852 if (m_inheritedData.m_borderCollapse && |
853 ((borderTopStyle() == BorderStyleHidden && | 853 ((borderTopStyle() == BorderStyleHidden && |
854 other.borderTopStyle() == BorderStyleNone) || | 854 other.borderTopStyle() == BorderStyleNone) || |
855 (borderTopStyle() == BorderStyleNone && | 855 (borderTopStyle() == BorderStyleNone && |
(...skipping 1590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2446 if (value < 0) | 2446 if (value < 0) |
2447 fvalue -= 0.5f; | 2447 fvalue -= 0.5f; |
2448 else | 2448 else |
2449 fvalue += 0.5f; | 2449 fvalue += 0.5f; |
2450 } | 2450 } |
2451 | 2451 |
2452 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2452 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
2453 } | 2453 } |
2454 | 2454 |
2455 } // namespace blink | 2455 } // namespace blink |
OLD | NEW |