| 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 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 849 (borderLeftStyle() == BorderStyleHidden && | 849 (borderLeftStyle() == BorderStyleHidden && |
| 850 other.borderLeftStyle() == BorderStyleNone) || | 850 other.borderLeftStyle() == BorderStyleNone) || |
| 851 (borderLeftStyle() == BorderStyleNone && | 851 (borderLeftStyle() == BorderStyleNone && |
| 852 other.borderLeftStyle() == BorderStyleHidden) || | 852 other.borderLeftStyle() == BorderStyleHidden) || |
| 853 (borderRightStyle() == BorderStyleHidden && | 853 (borderRightStyle() == BorderStyleHidden && |
| 854 other.borderRightStyle() == BorderStyleNone) || | 854 other.borderRightStyle() == BorderStyleNone) || |
| 855 (borderRightStyle() == BorderStyleNone && | 855 (borderRightStyle() == BorderStyleNone && |
| 856 other.borderRightStyle() == BorderStyleHidden))) | 856 other.borderRightStyle() == BorderStyleHidden))) |
| 857 return true; | 857 return true; |
| 858 } else if (display() == EDisplay::ListItem) { | 858 } else if (display() == EDisplay::ListItem) { |
| 859 if (m_inheritedData.m_listStyleType != | 859 if (listStyleType() != other.listStyleType() || |
| 860 other.m_inheritedData.m_listStyleType || | |
| 861 listStylePosition() != other.listStylePosition()) | 860 listStylePosition() != other.listStylePosition()) |
| 862 return true; | 861 return true; |
| 863 } | 862 } |
| 864 | 863 |
| 865 if ((visibility() == EVisibility::Collapse) != | 864 if ((visibility() == EVisibility::Collapse) != |
| 866 (other.visibility() == EVisibility::Collapse)) | 865 (other.visibility() == EVisibility::Collapse)) |
| 867 return true; | 866 return true; |
| 868 | 867 |
| 869 if (hasPseudoStyle(PseudoIdScrollbar) != | 868 if (hasPseudoStyle(PseudoIdScrollbar) != |
| 870 other.hasPseudoStyle(PseudoIdScrollbar)) | 869 other.hasPseudoStyle(PseudoIdScrollbar)) |
| (...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2464 if (value < 0) | 2463 if (value < 0) |
| 2465 fvalue -= 0.5f; | 2464 fvalue -= 0.5f; |
| 2466 else | 2465 else |
| 2467 fvalue += 0.5f; | 2466 fvalue += 0.5f; |
| 2468 } | 2467 } |
| 2469 | 2468 |
| 2470 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2469 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 2471 } | 2470 } |
| 2472 | 2471 |
| 2473 } // namespace blink | 2472 } // namespace blink |
| OLD | NEW |