| 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 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1038 } | 1038 } |
| 1039 | 1039 |
| 1040 void ComputedStyle::updatePropertySpecificDifferences( | 1040 void ComputedStyle::updatePropertySpecificDifferences( |
| 1041 const ComputedStyle& other, | 1041 const ComputedStyle& other, |
| 1042 StyleDifference& diff) const { | 1042 StyleDifference& diff) const { |
| 1043 if (m_box->zIndex() != other.m_box->zIndex() || | 1043 if (m_box->zIndex() != other.m_box->zIndex() || |
| 1044 isStackingContext() != other.isStackingContext()) | 1044 isStackingContext() != other.isStackingContext()) |
| 1045 diff.setZIndexChanged(); | 1045 diff.setZIndexChanged(); |
| 1046 | 1046 |
| 1047 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { | 1047 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { |
| 1048 if (!transformDataEquivalent(other)) | 1048 if (!transformDataEquivalent(other) || |
| 1049 m_rareNonInheritedData->m_perspective != |
| 1050 other.m_rareNonInheritedData->m_perspective || |
| 1051 m_rareNonInheritedData->m_perspectiveOrigin != |
| 1052 other.m_rareNonInheritedData->m_perspectiveOrigin) |
| 1049 diff.setTransformChanged(); | 1053 diff.setTransformChanged(); |
| 1050 | 1054 |
| 1051 if (m_rareNonInheritedData->opacity != | 1055 if (m_rareNonInheritedData->opacity != |
| 1052 other.m_rareNonInheritedData->opacity) | 1056 other.m_rareNonInheritedData->opacity) |
| 1053 diff.setOpacityChanged(); | 1057 diff.setOpacityChanged(); |
| 1054 | 1058 |
| 1055 if (m_rareNonInheritedData->m_filter != | 1059 if (m_rareNonInheritedData->m_filter != |
| 1056 other.m_rareNonInheritedData->m_filter) | 1060 other.m_rareNonInheritedData->m_filter) |
| 1057 diff.setFilterChanged(); | 1061 diff.setFilterChanged(); |
| 1058 | 1062 |
| (...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2460 if (value < 0) | 2464 if (value < 0) |
| 2461 fvalue -= 0.5f; | 2465 fvalue -= 0.5f; |
| 2462 else | 2466 else |
| 2463 fvalue += 0.5f; | 2467 fvalue += 0.5f; |
| 2464 } | 2468 } |
| 2465 | 2469 |
| 2466 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2470 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 2467 } | 2471 } |
| 2468 | 2472 |
| 2469 } // namespace blink | 2473 } // namespace blink |
| OLD | NEW |