| 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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 return true; | 321 return true; |
| 322 } | 322 } |
| 323 | 323 |
| 324 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 324 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
| 325 if (rareNonInheritedData->marginBeforeCollapse != other.rareNonInherited
Data->marginBeforeCollapse | 325 if (rareNonInheritedData->marginBeforeCollapse != other.rareNonInherited
Data->marginBeforeCollapse |
| 326 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit
edData->marginAfterCollapse | 326 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit
edData->marginAfterCollapse |
| 327 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li
neClamp | 327 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li
neClamp |
| 328 || rareNonInheritedData->textOverflow != other.rareNonInheritedData-
>textOverflow | 328 || rareNonInheritedData->textOverflow != other.rareNonInheritedData-
>textOverflow |
| 329 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m
_wrapFlow | 329 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m
_wrapFlow |
| 330 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData
->m_wrapThrough | 330 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData
->m_wrapThrough |
| 331 || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData
->m_shapeMargin | |
| 332 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or
der | 331 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or
der |
| 333 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat
a->m_alignContent | 332 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat
a->m_alignContent |
| 334 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems | 333 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems |
| 335 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf | 334 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf |
| 336 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent | 335 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent |
| 337 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData-
>hasFilters()) | 336 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData-
>hasFilters()) |
| 338 return true; | 337 return true; |
| 339 | 338 |
| 340 if (rareNonInheritedData->m_flexibleBox.get() != other.rareNonInheritedD
ata->m_flexibleBox.get() | 339 if (rareNonInheritedData->m_flexibleBox.get() != other.rareNonInheritedD
ata->m_flexibleBox.get() |
| 341 && *rareNonInheritedData->m_flexibleBox.get() != *other.rareNonInher
itedData->m_flexibleBox.get()) | 340 && *rareNonInheritedData->m_flexibleBox.get() != *other.rareNonInher
itedData->m_flexibleBox.get()) |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 if (rareInheritedData->userModify != other.rareInheritedData->userModify | 488 if (rareInheritedData->userModify != other.rareInheritedData->userModify |
| 490 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect | 489 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect |
| 491 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) | 490 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) |
| 492 return true; | 491 return true; |
| 493 } | 492 } |
| 494 | 493 |
| 495 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 494 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
| 496 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr
ag | 495 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr
ag |
| 497 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->
m_objectFit | 496 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->
m_objectFit |
| 498 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD
ata->m_objectPosition | 497 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD
ata->m_objectPosition |
| 499 || !dataEquivalent(rareNonInheritedData->m_shapeOutside, other.rareN
onInheritedData->m_shapeOutside) | |
| 500 || !dataEquivalent(rareNonInheritedData->m_clipPath, other.rareNonIn
heritedData->m_clipPath)) | 498 || !dataEquivalent(rareNonInheritedData->m_clipPath, other.rareNonIn
heritedData->m_clipPath)) |
| 501 return true; | 499 return true; |
| 502 } | 500 } |
| 503 | 501 |
| 504 return false; | 502 return false; |
| 505 } | 503 } |
| 506 | 504 |
| 507 void RenderStyle::updatePropertySpecificDifferences(const RenderStyle& other, St
yleDifference& diff) const | 505 void RenderStyle::updatePropertySpecificDifferences(const RenderStyle& other, St
yleDifference& diff) const |
| 508 { | 506 { |
| 509 // StyleAdjuster has ensured that zIndex is non-auto only if it's applicable
. | 507 // StyleAdjuster has ensured that zIndex is non-auto only if it's applicable
. |
| (...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1377 // right | 1375 // right |
| 1378 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1376 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1379 if (radiiSum > rect.height()) | 1377 if (radiiSum > rect.height()) |
| 1380 factor = std::min(rect.height() / radiiSum, factor); | 1378 factor = std::min(rect.height() / radiiSum, factor); |
| 1381 | 1379 |
| 1382 ASSERT(factor <= 1); | 1380 ASSERT(factor <= 1); |
| 1383 return factor; | 1381 return factor; |
| 1384 } | 1382 } |
| 1385 | 1383 |
| 1386 } // namespace blink | 1384 } // namespace blink |
| OLD | NEW |