| 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 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 || rareInheritedData->m_textOrientation != other.rareInheritedData->
m_textOrientation | 499 || rareInheritedData->m_textOrientation != other.rareInheritedData->
m_textOrientation |
| 500 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz
e | 500 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz
e |
| 501 || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m
_lineBoxContain | 501 || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m
_lineBoxContain |
| 502 || rareInheritedData->listStyleImage != other.rareInheritedData->lis
tStyleImage | 502 || rareInheritedData->listStyleImage != other.rareInheritedData->lis
tStyleImage |
| 503 || rareInheritedData->textStrokeWidth != other.rareInheritedData->te
xtStrokeWidth) | 503 || rareInheritedData->textStrokeWidth != other.rareInheritedData->te
xtStrokeWidth) |
| 504 return StyleDifferenceLayout; | 504 return StyleDifferenceLayout; |
| 505 | 505 |
| 506 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge
t())) | 506 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge
t())) |
| 507 return StyleDifferenceLayout; | 507 return StyleDifferenceLayout; |
| 508 | 508 |
| 509 if (!QuotesData::equals(rareInheritedData->quotes.get(), other.rareInher
itedData->quotes.get())) | 509 if (rareInheritedData->quotes.get() != other.rareInheritedData->quotes.g
et()) |
| 510 return StyleDifferenceLayout; | 510 return StyleDifferenceLayout; |
| 511 } | 511 } |
| 512 | 512 |
| 513 if (visual->m_textAutosizingMultiplier != other.visual->m_textAutosizingMult
iplier) | 513 if (visual->m_textAutosizingMultiplier != other.visual->m_textAutosizingMult
iplier) |
| 514 return StyleDifferenceLayout; | 514 return StyleDifferenceLayout; |
| 515 | 515 |
| 516 if (inherited.get() != other.inherited.get()) { | 516 if (inherited.get() != other.inherited.get()) { |
| 517 if (inherited->line_height != other.inherited->line_height | 517 if (inherited->line_height != other.inherited->line_height |
| 518 || inherited->font != other.inherited->font | 518 || inherited->font != other.inherited->font |
| 519 || inherited->horizontal_border_spacing != other.inherited->horizontal_b
order_spacing | 519 || inherited->horizontal_border_spacing != other.inherited->horizontal_b
order_spacing |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 rareInheritedData.access()->cursorData->append(CursorData(image, hotSpot)); | 690 rareInheritedData.access()->cursorData->append(CursorData(image, hotSpot)); |
| 691 } | 691 } |
| 692 | 692 |
| 693 void RenderStyle::setCursorList(PassRefPtr<CursorList> other) | 693 void RenderStyle::setCursorList(PassRefPtr<CursorList> other) |
| 694 { | 694 { |
| 695 rareInheritedData.access()->cursorData = other; | 695 rareInheritedData.access()->cursorData = other; |
| 696 } | 696 } |
| 697 | 697 |
| 698 void RenderStyle::setQuotes(PassRefPtr<QuotesData> q) | 698 void RenderStyle::setQuotes(PassRefPtr<QuotesData> q) |
| 699 { | 699 { |
| 700 if (QuotesData::equals(rareInheritedData->quotes.get(), q.get())) | 700 if (rareInheritedData->quotes.get() == q.get()) |
| 701 return; | 701 return; |
| 702 rareInheritedData.access()->quotes = q; | 702 rareInheritedData.access()->quotes = q; |
| 703 } | 703 } |
| 704 | 704 |
| 705 void RenderStyle::clearCursorList() | 705 void RenderStyle::clearCursorList() |
| 706 { | 706 { |
| 707 if (rareInheritedData->cursorData) | 707 if (rareInheritedData->cursorData) |
| 708 rareInheritedData.access()->cursorData = nullptr; | 708 rareInheritedData.access()->cursorData = nullptr; |
| 709 } | 709 } |
| 710 | 710 |
| (...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1654 // right | 1654 // right |
| 1655 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1655 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1656 if (radiiSum > rect.height()) | 1656 if (radiiSum > rect.height()) |
| 1657 factor = std::min(rect.height() / radiiSum, factor); | 1657 factor = std::min(rect.height() / radiiSum, factor); |
| 1658 | 1658 |
| 1659 ASSERT(factor <= 1); | 1659 ASSERT(factor <= 1); |
| 1660 return factor; | 1660 return factor; |
| 1661 } | 1661 } |
| 1662 | 1662 |
| 1663 } // namespace WebCore | 1663 } // namespace WebCore |
| OLD | NEW |