| 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 || rareInheritedData->hyphenationLimitAfter != other.rareInheritedDa
ta->hyphenationLimitAfter | 373 || rareInheritedData->hyphenationLimitAfter != other.rareInheritedDa
ta->hyphenationLimitAfter |
| 374 || rareInheritedData->hyphenationString != other.rareInheritedData->
hyphenationString | 374 || rareInheritedData->hyphenationString != other.rareInheritedData->
hyphenationString |
| 375 || rareInheritedData->locale != other.rareInheritedData->locale | 375 || rareInheritedData->locale != other.rareInheritedData->locale |
| 376 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t
extEmphasisMark | 376 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t
extEmphasisMark |
| 377 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat
a->textEmphasisPosition | 377 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat
a->textEmphasisPosition |
| 378 || rareInheritedData->textEmphasisCustomMark != other.rareInheritedD
ata->textEmphasisCustomMark | 378 || rareInheritedData->textEmphasisCustomMark != other.rareInheritedD
ata->textEmphasisCustomMark |
| 379 || rareInheritedData->m_textJustify != other.rareInheritedData->m_te
xtJustify | 379 || rareInheritedData->m_textJustify != other.rareInheritedData->m_te
xtJustify |
| 380 || rareInheritedData->m_textOrientation != other.rareInheritedData->
m_textOrientation | 380 || rareInheritedData->m_textOrientation != other.rareInheritedData->
m_textOrientation |
| 381 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz
e | 381 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz
e |
| 382 || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m
_lineBoxContain | 382 || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m
_lineBoxContain |
| 383 || rareInheritedData->listStyleImage != other.rareInheritedData->lis
tStyleImage | |
| 384 || rareInheritedData->textStrokeWidth != other.rareInheritedData->te
xtStrokeWidth) | 383 || rareInheritedData->textStrokeWidth != other.rareInheritedData->te
xtStrokeWidth) |
| 385 return true; | 384 return true; |
| 386 | 385 |
| 387 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge
t())) | 386 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge
t())) |
| 388 return true; | 387 return true; |
| 389 | 388 |
| 390 if (!rareInheritedData->quotesDataEquivalent(*other.rareInheritedData.ge
t())) | 389 if (!rareInheritedData->quotesDataEquivalent(*other.rareInheritedData.ge
t())) |
| 391 return true; | 390 return true; |
| 392 } | 391 } |
| 393 | 392 |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 IntSize(valueForLength(border.topLeft().width(), size.width()), | 539 IntSize(valueForLength(border.topLeft().width(), size.width()), |
| 541 valueForLength(border.topLeft().height(), size.height())), | 540 valueForLength(border.topLeft().height(), size.height())), |
| 542 IntSize(valueForLength(border.topRight().width(), size.width()), | 541 IntSize(valueForLength(border.topRight().width(), size.width()), |
| 543 valueForLength(border.topRight().height(), size.height())), | 542 valueForLength(border.topRight().height(), size.height())), |
| 544 IntSize(valueForLength(border.bottomLeft().width(), size.width()), | 543 IntSize(valueForLength(border.bottomLeft().width(), size.width()), |
| 545 valueForLength(border.bottomLeft().height(), size.height())), | 544 valueForLength(border.bottomLeft().height(), size.height())), |
| 546 IntSize(valueForLength(border.bottomRight().width(), size.width()), | 545 IntSize(valueForLength(border.bottomRight().width(), size.width()), |
| 547 valueForLength(border.bottomRight().height(), size.height()))); | 546 valueForLength(border.bottomRight().height(), size.height()))); |
| 548 } | 547 } |
| 549 | 548 |
| 550 StyleImage* RenderStyle::listStyleImage() const { return rareInheritedData->list
StyleImage.get(); } | |
| 551 void RenderStyle::setListStyleImage(PassRefPtr<StyleImage> v) | |
| 552 { | |
| 553 if (rareInheritedData->listStyleImage != v) | |
| 554 rareInheritedData.access()->listStyleImage = v; | |
| 555 } | |
| 556 | |
| 557 Color RenderStyle::color() const { return inherited->color; } | 549 Color RenderStyle::color() const { return inherited->color; } |
| 558 void RenderStyle::setColor(const Color& v) { SET_VAR(inherited, color, v); } | 550 void RenderStyle::setColor(const Color& v) { SET_VAR(inherited, color, v); } |
| 559 | 551 |
| 560 short RenderStyle::horizontalBorderSpacing() const { return inherited->horizonta
l_border_spacing; } | 552 short RenderStyle::horizontalBorderSpacing() const { return inherited->horizonta
l_border_spacing; } |
| 561 short RenderStyle::verticalBorderSpacing() const { return inherited->vertical_bo
rder_spacing; } | 553 short RenderStyle::verticalBorderSpacing() const { return inherited->vertical_bo
rder_spacing; } |
| 562 void RenderStyle::setHorizontalBorderSpacing(short v) { SET_VAR(inherited, horiz
ontal_border_spacing, v); } | 554 void RenderStyle::setHorizontalBorderSpacing(short v) { SET_VAR(inherited, horiz
ontal_border_spacing, v); } |
| 563 void RenderStyle::setVerticalBorderSpacing(short v) { SET_VAR(inherited, vertica
l_border_spacing, v); } | 555 void RenderStyle::setVerticalBorderSpacing(short v) { SET_VAR(inherited, vertica
l_border_spacing, v); } |
| 564 | 556 |
| 565 RoundedRect RenderStyle::getRoundedBorderFor(const LayoutRect& borderRect, bool
includeLogicalLeftEdge, bool includeLogicalRightEdge) const | 557 RoundedRect RenderStyle::getRoundedBorderFor(const LayoutRect& borderRect, bool
includeLogicalLeftEdge, bool includeLogicalRightEdge) const |
| 566 { | 558 { |
| (...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 // right | 1160 // right |
| 1169 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1161 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1170 if (radiiSum > rect.height()) | 1162 if (radiiSum > rect.height()) |
| 1171 factor = std::min(rect.height() / radiiSum, factor); | 1163 factor = std::min(rect.height() / radiiSum, factor); |
| 1172 | 1164 |
| 1173 ASSERT(factor <= 1); | 1165 ASSERT(factor <= 1); |
| 1174 return factor; | 1166 return factor; |
| 1175 } | 1167 } |
| 1176 | 1168 |
| 1177 } // namespace blink | 1169 } // namespace blink |
| OLD | NEW |