| 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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 460 || rareNonInheritedData->m_maskBoxImage != other.rareNonInheritedDat
a->m_maskBoxImage) | 460 || rareNonInheritedData->m_maskBoxImage != other.rareNonInheritedDat
a->m_maskBoxImage) |
| 461 return true; | 461 return true; |
| 462 } | 462 } |
| 463 | 463 |
| 464 return false; | 464 return false; |
| 465 } | 465 } |
| 466 | 466 |
| 467 bool RenderStyle::diffNeedsPaintInvalidationObject(const RenderStyle& other) con
st | 467 bool RenderStyle::diffNeedsPaintInvalidationObject(const RenderStyle& other) con
st |
| 468 { | 468 { |
| 469 if (inherited_flags._visibility != other.inherited_flags._visibility | 469 if (inherited_flags._visibility != other.inherited_flags._visibility |
| 470 || inherited_flags.m_printColorAdjust != other.inherited_flags.m_printCo
lorAdjust | |
| 471 || !surround->border.visuallyEqual(other.surround->border) | 470 || !surround->border.visuallyEqual(other.surround->border) |
| 472 || !m_background->visuallyEqual(*other.m_background)) | 471 || !m_background->visuallyEqual(*other.m_background)) |
| 473 return true; | 472 return true; |
| 474 | 473 |
| 475 if (rareInheritedData.get() != other.rareInheritedData.get()) { | 474 if (rareInheritedData.get() != other.rareInheritedData.get()) { |
| 476 if (rareInheritedData->userModify != other.rareInheritedData->userModify | 475 if (rareInheritedData->userModify != other.rareInheritedData->userModify |
| 477 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect | 476 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect |
| 478 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) | 477 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) |
| 479 return true; | 478 return true; |
| 480 } | 479 } |
| (...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1265 // right | 1264 // right |
| 1266 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1265 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1267 if (radiiSum > rect.height()) | 1266 if (radiiSum > rect.height()) |
| 1268 factor = std::min(rect.height() / radiiSum, factor); | 1267 factor = std::min(rect.height() / radiiSum, factor); |
| 1269 | 1268 |
| 1270 ASSERT(factor <= 1); | 1269 ASSERT(factor <= 1); |
| 1271 return factor; | 1270 return factor; |
| 1272 } | 1271 } |
| 1273 | 1272 |
| 1274 } // namespace blink | 1273 } // namespace blink |
| OLD | NEW |