| 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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 if (inherited->line_height != other.inherited->line_height | 407 if (inherited->line_height != other.inherited->line_height |
| 408 || inherited->font != other.inherited->font | 408 || inherited->font != other.inherited->font |
| 409 || inherited->horizontal_border_spacing != other.inherited->horizont
al_border_spacing | 409 || inherited->horizontal_border_spacing != other.inherited->horizont
al_border_spacing |
| 410 || inherited->vertical_border_spacing != other.inherited->vertical_b
order_spacing) | 410 || inherited->vertical_border_spacing != other.inherited->vertical_b
order_spacing) |
| 411 return true; | 411 return true; |
| 412 } | 412 } |
| 413 | 413 |
| 414 if (inherited_flags.m_rtlOrdering != other.inherited_flags.m_rtlOrdering | 414 if (inherited_flags.m_rtlOrdering != other.inherited_flags.m_rtlOrdering |
| 415 || inherited_flags._text_align != other.inherited_flags._text_align | 415 || inherited_flags._text_align != other.inherited_flags._text_align |
| 416 || inherited_flags._direction != other.inherited_flags._direction | 416 || inherited_flags._direction != other.inherited_flags._direction |
| 417 || inherited_flags._white_space != other.inherited_flags._white_space | 417 || inherited_flags._white_space != other.inherited_flags._white_space) |
| 418 || inherited_flags.m_writingMode != other.inherited_flags.m_writingMode) | |
| 419 return true; | 418 return true; |
| 420 | 419 |
| 421 if (noninherited_flags.overflowX != other.noninherited_flags.overflowX | 420 if (noninherited_flags.overflowX != other.noninherited_flags.overflowX |
| 422 || noninherited_flags.overflowY != other.noninherited_flags.overflowY | 421 || noninherited_flags.overflowY != other.noninherited_flags.overflowY |
| 423 || noninherited_flags.clear != other.noninherited_flags.clear | 422 || noninherited_flags.clear != other.noninherited_flags.clear |
| 424 || noninherited_flags.unicodeBidi != other.noninherited_flags.unicodeBid
i | 423 || noninherited_flags.unicodeBidi != other.noninherited_flags.unicodeBid
i |
| 425 || noninherited_flags.position != other.noninherited_flags.position | 424 || noninherited_flags.position != other.noninherited_flags.position |
| 426 || noninherited_flags.floating != other.noninherited_flags.floating | 425 || noninherited_flags.floating != other.noninherited_flags.floating |
| 427 || noninherited_flags.originalDisplay != other.noninherited_flags.origin
alDisplay) | 426 || noninherited_flags.originalDisplay != other.noninherited_flags.origin
alDisplay) |
| 428 return true; | 427 return true; |
| (...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1417 // right | 1416 // right |
| 1418 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1417 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1419 if (radiiSum > rect.height()) | 1418 if (radiiSum > rect.height()) |
| 1420 factor = std::min(rect.height() / radiiSum, factor); | 1419 factor = std::min(rect.height() / radiiSum, factor); |
| 1421 | 1420 |
| 1422 ASSERT(factor <= 1); | 1421 ASSERT(factor <= 1); |
| 1423 return factor; | 1422 return factor; |
| 1424 } | 1423 } |
| 1425 | 1424 |
| 1426 } // namespace blink | 1425 } // namespace blink |
| OLD | NEW |