| 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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 || inherited_flags._text_transform != other.inherited_flags._text_transf
orm | 536 || inherited_flags._text_transform != other.inherited_flags._text_transf
orm |
| 537 || inherited_flags._direction != other.inherited_flags._direction | 537 || inherited_flags._direction != other.inherited_flags._direction |
| 538 || inherited_flags._white_space != other.inherited_flags._white_space | 538 || inherited_flags._white_space != other.inherited_flags._white_space |
| 539 || inherited_flags.m_writingMode != other.inherited_flags.m_writingMode) | 539 || inherited_flags.m_writingMode != other.inherited_flags.m_writingMode) |
| 540 return true; | 540 return true; |
| 541 | 541 |
| 542 if (noninherited_flags.overflowX != other.noninherited_flags.overflowX | 542 if (noninherited_flags.overflowX != other.noninherited_flags.overflowX |
| 543 || noninherited_flags.overflowY != other.noninherited_flags.overflowY | 543 || noninherited_flags.overflowY != other.noninherited_flags.overflowY |
| 544 || noninherited_flags.clear != other.noninherited_flags.clear | 544 || noninherited_flags.clear != other.noninherited_flags.clear |
| 545 || noninherited_flags.unicodeBidi != other.noninherited_flags.unicodeBid
i | 545 || noninherited_flags.unicodeBidi != other.noninherited_flags.unicodeBid
i |
| 546 || noninherited_flags.position != other.noninherited_flags.position | |
| 547 || noninherited_flags.floating != other.noninherited_flags.floating | 546 || noninherited_flags.floating != other.noninherited_flags.floating |
| 548 || noninherited_flags.originalDisplay != other.noninherited_flags.origin
alDisplay) | 547 || noninherited_flags.originalDisplay != other.noninherited_flags.origin
alDisplay) |
| 549 return true; | 548 return true; |
| 550 | 549 |
| 551 if (noninherited_flags.effectiveDisplay >= FIRST_TABLE_DISPLAY && noninherit
ed_flags.effectiveDisplay <= LAST_TABLE_DISPLAY) { | 550 if (noninherited_flags.effectiveDisplay >= FIRST_TABLE_DISPLAY && noninherit
ed_flags.effectiveDisplay <= LAST_TABLE_DISPLAY) { |
| 552 if (inherited_flags._border_collapse != other.inherited_flags._border_co
llapse | 551 if (inherited_flags._border_collapse != other.inherited_flags._border_co
llapse |
| 553 || inherited_flags._empty_cells != other.inherited_flags._empty_cell
s | 552 || inherited_flags._empty_cells != other.inherited_flags._empty_cell
s |
| 554 || inherited_flags._caption_side != other.inherited_flags._caption_s
ide | 553 || inherited_flags._caption_side != other.inherited_flags._caption_s
ide |
| 555 || noninherited_flags.tableLayout != other.noninherited_flags.tableL
ayout) | 554 || noninherited_flags.tableLayout != other.noninherited_flags.tableL
ayout) |
| 556 return true; | 555 return true; |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 || m_box->maxHeight() != other.m_box->maxHeight()) | 596 || m_box->maxHeight() != other.m_box->maxHeight()) |
| 598 return true; | 597 return true; |
| 599 | 598 |
| 600 if (m_box->verticalAlign() != other.m_box->verticalAlign()) | 599 if (m_box->verticalAlign() != other.m_box->verticalAlign()) |
| 601 return true; | 600 return true; |
| 602 | 601 |
| 603 if (m_box->boxSizing() != other.m_box->boxSizing()) | 602 if (m_box->boxSizing() != other.m_box->boxSizing()) |
| 604 return true; | 603 return true; |
| 605 } | 604 } |
| 606 | 605 |
| 607 if (noninherited_flags.verticalAlign != other.noninherited_flags.verticalAli
gn) | 606 if (noninherited_flags.verticalAlign != other.noninherited_flags.verticalAli
gn |
| 607 || noninherited_flags.position != other.noninherited_flags.position) |
| 608 return true; | 608 return true; |
| 609 | 609 |
| 610 if (surround.get() != other.surround.get()) { | 610 if (surround.get() != other.surround.get()) { |
| 611 if (surround->margin != other.surround->margin) | 611 if (surround->margin != other.surround->margin) |
| 612 return true; | 612 return true; |
| 613 | 613 |
| 614 if (surround->padding != other.surround->padding) | 614 if (surround->padding != other.surround->padding) |
| 615 return true; | 615 return true; |
| 616 } | 616 } |
| 617 | 617 |
| (...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1695 // right | 1695 // right |
| 1696 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1696 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1697 if (radiiSum > rect.height()) | 1697 if (radiiSum > rect.height()) |
| 1698 factor = std::min(rect.height() / radiiSum, factor); | 1698 factor = std::min(rect.height() / radiiSum, factor); |
| 1699 | 1699 |
| 1700 ASSERT(factor <= 1); | 1700 ASSERT(factor <= 1); |
| 1701 return factor; | 1701 return factor; |
| 1702 } | 1702 } |
| 1703 | 1703 |
| 1704 } // namespace blink | 1704 } // namespace blink |
| OLD | NEW |