| 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 noninherited_flags.verticalAlign = other->noninherited_flags.verticalAlign; | 189 noninherited_flags.verticalAlign = other->noninherited_flags.verticalAlign; |
| 190 noninherited_flags.position = other->noninherited_flags.position; | 190 noninherited_flags.position = other->noninherited_flags.position; |
| 191 noninherited_flags.tableLayout = other->noninherited_flags.tableLayout; | 191 noninherited_flags.tableLayout = other->noninherited_flags.tableLayout; |
| 192 noninherited_flags.unicodeBidi = other->noninherited_flags.unicodeBidi; | 192 noninherited_flags.unicodeBidi = other->noninherited_flags.unicodeBidi; |
| 193 noninherited_flags.pageBreakBefore = other->noninherited_flags.pageBreakBefo
re; | 193 noninherited_flags.pageBreakBefore = other->noninherited_flags.pageBreakBefo
re; |
| 194 noninherited_flags.pageBreakAfter = other->noninherited_flags.pageBreakAfter
; | 194 noninherited_flags.pageBreakAfter = other->noninherited_flags.pageBreakAfter
; |
| 195 noninherited_flags.pageBreakInside = other->noninherited_flags.pageBreakInsi
de; | 195 noninherited_flags.pageBreakInside = other->noninherited_flags.pageBreakInsi
de; |
| 196 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI
nheritance; | 196 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI
nheritance; |
| 197 noninherited_flags.currentColor = other->noninherited_flags.currentColor; | 197 noninherited_flags.currentColor = other->noninherited_flags.currentColor; |
| 198 noninherited_flags.hasViewportUnits = other->noninherited_flags.hasViewportU
nits; | 198 noninherited_flags.hasViewportUnits = other->noninherited_flags.hasViewportU
nits; |
| 199 ASSERT(zoom() == initialZoom()); | |
| 200 } | 199 } |
| 201 | 200 |
| 202 bool RenderStyle::operator==(const RenderStyle& o) const | 201 bool RenderStyle::operator==(const RenderStyle& o) const |
| 203 { | 202 { |
| 204 // compare everything except the pseudoStyle pointer | 203 // compare everything except the pseudoStyle pointer |
| 205 return inherited_flags == o.inherited_flags | 204 return inherited_flags == o.inherited_flags |
| 206 && noninherited_flags == o.noninherited_flags | 205 && noninherited_flags == o.noninherited_flags |
| 207 && m_box == o.m_box | 206 && m_box == o.m_box |
| 208 && visual == o.visual | 207 && visual == o.visual |
| 209 && m_background == o.m_background | 208 && m_background == o.m_background |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 // a full layout is necessary to keep floating object lists sane. | 357 // a full layout is necessary to keep floating object lists sane. |
| 359 return true; | 358 return true; |
| 360 } | 359 } |
| 361 } | 360 } |
| 362 | 361 |
| 363 if (rareInheritedData.get() != other.rareInheritedData.get()) { | 362 if (rareInheritedData.get() != other.rareInheritedData.get()) { |
| 364 if (rareInheritedData->highlight != other.rareInheritedData->highlight | 363 if (rareInheritedData->highlight != other.rareInheritedData->highlight |
| 365 || rareInheritedData->indent != other.rareInheritedData->indent | 364 || rareInheritedData->indent != other.rareInheritedData->indent |
| 366 || rareInheritedData->m_textAlignLast != other.rareInheritedData->m_
textAlignLast | 365 || rareInheritedData->m_textAlignLast != other.rareInheritedData->m_
textAlignLast |
| 367 || rareInheritedData->m_textIndentLine != other.rareInheritedData->m
_textIndentLine | 366 || rareInheritedData->m_textIndentLine != other.rareInheritedData->m
_textIndentLine |
| 368 || rareInheritedData->m_effectiveZoom != other.rareInheritedData->m_
effectiveZoom | |
| 369 || rareInheritedData->wordBreak != other.rareInheritedData->wordBrea
k | 367 || rareInheritedData->wordBreak != other.rareInheritedData->wordBrea
k |
| 370 || rareInheritedData->overflowWrap != other.rareInheritedData->overf
lowWrap | 368 || rareInheritedData->overflowWrap != other.rareInheritedData->overf
lowWrap |
| 371 || rareInheritedData->lineBreak != other.rareInheritedData->lineBrea
k | 369 || rareInheritedData->lineBreak != other.rareInheritedData->lineBrea
k |
| 372 || rareInheritedData->hyphens != other.rareInheritedData->hyphens | 370 || rareInheritedData->hyphens != other.rareInheritedData->hyphens |
| 373 || rareInheritedData->hyphenationLimitBefore != other.rareInheritedD
ata->hyphenationLimitBefore | 371 || rareInheritedData->hyphenationLimitBefore != other.rareInheritedD
ata->hyphenationLimitBefore |
| 374 || rareInheritedData->hyphenationLimitAfter != other.rareInheritedDa
ta->hyphenationLimitAfter | 372 || rareInheritedData->hyphenationLimitAfter != other.rareInheritedDa
ta->hyphenationLimitAfter |
| 375 || rareInheritedData->hyphenationString != other.rareInheritedData->
hyphenationString | 373 || rareInheritedData->hyphenationString != other.rareInheritedData->
hyphenationString |
| 376 || rareInheritedData->locale != other.rareInheritedData->locale | 374 || rareInheritedData->locale != other.rareInheritedData->locale |
| 377 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t
extEmphasisMark | 375 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t
extEmphasisMark |
| 378 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat
a->textEmphasisPosition | 376 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat
a->textEmphasisPosition |
| (...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1318 // right | 1316 // right |
| 1319 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1317 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1320 if (radiiSum > rect.height()) | 1318 if (radiiSum > rect.height()) |
| 1321 factor = std::min(rect.height() / radiiSum, factor); | 1319 factor = std::min(rect.height() / radiiSum, factor); |
| 1322 | 1320 |
| 1323 ASSERT(factor <= 1); | 1321 ASSERT(factor <= 1); |
| 1324 return factor; | 1322 return factor; |
| 1325 } | 1323 } |
| 1326 | 1324 |
| 1327 } // namespace blink | 1325 } // namespace blink |
| OLD | NEW |