| 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 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 if (surround->padding != other.surround->padding) | 693 if (surround->padding != other.surround->padding) |
| 694 return true; | 694 return true; |
| 695 } | 695 } |
| 696 | 696 |
| 697 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 697 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
| 698 if (rareNonInheritedData->m_alignContent != other.rareNonInheritedData->
m_alignContent | 698 if (rareNonInheritedData->m_alignContent != other.rareNonInheritedData->
m_alignContent |
| 699 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems | 699 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems |
| 700 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf | 700 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf |
| 701 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent | 701 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent |
| 702 || rareNonInheritedData->m_justifyItems != other.rareNonInheritedDat
a->m_justifyItems | 702 || rareNonInheritedData->m_justifyItems != other.rareNonInheritedDat
a->m_justifyItems |
| 703 || rareNonInheritedData->m_justifySelf != other.rareNonInheritedData
->m_justifySelf) | 703 || rareNonInheritedData->m_justifySelf != other.rareNonInheritedData
->m_justifySelf |
| 704 || rareNonInheritedData->m_contain != other.rareNonInheritedData->m_
contain) |
| 704 return true; | 705 return true; |
| 705 | 706 |
| 706 if (!RuntimeEnabledFeatures::cssBoxReflectFilterEnabled() && !rareNonInh
eritedData->reflectionDataEquivalent(*other.rareNonInheritedData.get())) | 707 if (!RuntimeEnabledFeatures::cssBoxReflectFilterEnabled() && !rareNonInh
eritedData->reflectionDataEquivalent(*other.rareNonInheritedData.get())) |
| 707 return true; | 708 return true; |
| 708 } | 709 } |
| 709 | 710 |
| 710 return false; | 711 return false; |
| 711 } | 712 } |
| 712 | 713 |
| 713 bool ComputedStyle::diffNeedsPaintInvalidationSubtree(const ComputedStyle& other
) const | 714 bool ComputedStyle::diffNeedsPaintInvalidationSubtree(const ComputedStyle& other
) const |
| (...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1873 if (value < 0) | 1874 if (value < 0) |
| 1874 fvalue -= 0.5f; | 1875 fvalue -= 0.5f; |
| 1875 else | 1876 else |
| 1876 fvalue += 0.5f; | 1877 fvalue += 0.5f; |
| 1877 } | 1878 } |
| 1878 | 1879 |
| 1879 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 1880 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 1880 } | 1881 } |
| 1881 | 1882 |
| 1882 } // namespace blink | 1883 } // namespace blink |
| OLD | NEW |