| 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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 // layout change instead of forced full paint invalidation. | 631 // layout change instead of forced full paint invalidation. |
| 632 | 632 |
| 633 if (m_surround.get() != other.m_surround.get()) { | 633 if (m_surround.get() != other.m_surround.get()) { |
| 634 // If our border widths change, then we need to layout. Other changes to | 634 // If our border widths change, then we need to layout. Other changes to |
| 635 // borders only necessitate a paint invalidation. | 635 // borders only necessitate a paint invalidation. |
| 636 if (borderLeftWidth() != other.borderLeftWidth() || | 636 if (borderLeftWidth() != other.borderLeftWidth() || |
| 637 borderTopWidth() != other.borderTopWidth() || | 637 borderTopWidth() != other.borderTopWidth() || |
| 638 borderBottomWidth() != other.borderBottomWidth() || | 638 borderBottomWidth() != other.borderBottomWidth() || |
| 639 borderRightWidth() != other.borderRightWidth()) | 639 borderRightWidth() != other.borderRightWidth()) |
| 640 return true; | 640 return true; |
| 641 |
| 642 if (m_surround->padding != other.m_surround->padding) |
| 643 return true; |
| 641 } | 644 } |
| 642 | 645 |
| 643 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { | 646 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { |
| 644 if (m_rareNonInheritedData->m_appearance != | 647 if (m_rareNonInheritedData->m_appearance != |
| 645 other.m_rareNonInheritedData->m_appearance || | 648 other.m_rareNonInheritedData->m_appearance || |
| 646 m_rareNonInheritedData->marginBeforeCollapse != | 649 m_rareNonInheritedData->marginBeforeCollapse != |
| 647 other.m_rareNonInheritedData->marginBeforeCollapse || | 650 other.m_rareNonInheritedData->marginBeforeCollapse || |
| 648 m_rareNonInheritedData->marginAfterCollapse != | 651 m_rareNonInheritedData->marginAfterCollapse != |
| 649 other.m_rareNonInheritedData->marginAfterCollapse || | 652 other.m_rareNonInheritedData->marginAfterCollapse || |
| 650 m_rareNonInheritedData->lineClamp != | 653 m_rareNonInheritedData->lineClamp != |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 875 | 878 |
| 876 if (m_box->boxSizing() != other.m_box->boxSizing()) | 879 if (m_box->boxSizing() != other.m_box->boxSizing()) |
| 877 return true; | 880 return true; |
| 878 } | 881 } |
| 879 | 882 |
| 880 if (m_nonInheritedData.m_verticalAlign != | 883 if (m_nonInheritedData.m_verticalAlign != |
| 881 other.m_nonInheritedData.m_verticalAlign || | 884 other.m_nonInheritedData.m_verticalAlign || |
| 882 position() != other.position()) | 885 position() != other.position()) |
| 883 return true; | 886 return true; |
| 884 | 887 |
| 885 if (m_surround.get() != other.m_surround.get()) { | |
| 886 if (m_surround->padding != other.m_surround->padding) | |
| 887 return true; | |
| 888 } | |
| 889 | |
| 890 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { | 888 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { |
| 891 if (m_rareNonInheritedData->m_alignContent != | 889 if (m_rareNonInheritedData->m_alignContent != |
| 892 other.m_rareNonInheritedData->m_alignContent || | 890 other.m_rareNonInheritedData->m_alignContent || |
| 893 m_rareNonInheritedData->m_alignItems != | 891 m_rareNonInheritedData->m_alignItems != |
| 894 other.m_rareNonInheritedData->m_alignItems || | 892 other.m_rareNonInheritedData->m_alignItems || |
| 895 m_rareNonInheritedData->m_alignSelf != | 893 m_rareNonInheritedData->m_alignSelf != |
| 896 other.m_rareNonInheritedData->m_alignSelf || | 894 other.m_rareNonInheritedData->m_alignSelf || |
| 897 m_rareNonInheritedData->m_justifyContent != | 895 m_rareNonInheritedData->m_justifyContent != |
| 898 other.m_rareNonInheritedData->m_justifyContent || | 896 other.m_rareNonInheritedData->m_justifyContent || |
| 899 m_rareNonInheritedData->m_justifyItems != | 897 m_rareNonInheritedData->m_justifyItems != |
| (...skipping 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2471 if (value < 0) | 2469 if (value < 0) |
| 2472 fvalue -= 0.5f; | 2470 fvalue -= 0.5f; |
| 2473 else | 2471 else |
| 2474 fvalue += 0.5f; | 2472 fvalue += 0.5f; |
| 2475 } | 2473 } |
| 2476 | 2474 |
| 2477 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2475 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 2478 } | 2476 } |
| 2479 | 2477 |
| 2480 } // namespace blink | 2478 } // namespace blink |
| OLD | NEW |