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 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
417 if (surround->margin != other->surround->margin) | 417 if (surround->margin != other->surround->margin) |
418 return StyleDifferenceLayout; | 418 return StyleDifferenceLayout; |
419 | 419 |
420 if (surround->padding != other->surround->padding) | 420 if (surround->padding != other->surround->padding) |
421 return StyleDifferenceLayout; | 421 return StyleDifferenceLayout; |
422 | 422 |
423 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) { | 423 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) { |
424 if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m
_appearance | 424 if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m
_appearance |
425 || rareNonInheritedData->marginBeforeCollapse != other->rareNonInher
itedData->marginBeforeCollapse | 425 || rareNonInheritedData->marginBeforeCollapse != other->rareNonInher
itedData->marginBeforeCollapse |
426 || rareNonInheritedData->marginAfterCollapse != other->rareNonInheri
tedData->marginAfterCollapse | 426 || rareNonInheritedData->marginAfterCollapse != other->rareNonInheri
tedData->marginAfterCollapse |
427 || rareNonInheritedData->lineClamp != other->rareNonInheritedData->l
ineClamp | |
428 || rareNonInheritedData->textOverflow != other->rareNonInheritedData
->textOverflow) | 427 || rareNonInheritedData->textOverflow != other->rareNonInheritedData
->textOverflow) |
429 return StyleDifferenceLayout; | 428 return StyleDifferenceLayout; |
430 | 429 |
431 if (rareNonInheritedData->m_regionFragment != other->rareNonInheritedDat
a->m_regionFragment) | 430 if (rareNonInheritedData->m_regionFragment != other->rareNonInheritedDat
a->m_regionFragment) |
432 return StyleDifferenceLayout; | 431 return StyleDifferenceLayout; |
433 | 432 |
434 if (rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->m_w
rapFlow | 433 if (rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->m_w
rapFlow |
435 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat
a->m_wrapThrough | 434 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat
a->m_wrapThrough |
436 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat
a->m_shapeMargin | 435 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat
a->m_shapeMargin |
437 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa
ta->m_shapePadding) | 436 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa
ta->m_shapePadding) |
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1631 surround.access()->border.m_image.setOutset(outset); | 1630 surround.access()->border.m_image.setOutset(outset); |
1632 } | 1631 } |
1633 | 1632 |
1634 ShapeValue* RenderStyle::initialShapeInside() | 1633 ShapeValue* RenderStyle::initialShapeInside() |
1635 { | 1634 { |
1636 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu
tsideValue())); | 1635 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu
tsideValue())); |
1637 return sOutsideValue.get(); | 1636 return sOutsideValue.get(); |
1638 } | 1637 } |
1639 | 1638 |
1640 } // namespace WebCore | 1639 } // namespace WebCore |
OLD | NEW |