| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) | 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) |
| 3 * (C) 1997 Torben Weis (weis@kde.org) | 3 * (C) 1997 Torben Weis (weis@kde.org) |
| 4 * (C) 1998 Waldo Bastian (bastian@kde.org) | 4 * (C) 1998 Waldo Bastian (bastian@kde.org) |
| 5 * (C) 1999 Lars Knoll (knoll@kde.org) | 5 * (C) 1999 Lars Knoll (knoll@kde.org) |
| 6 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 6 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011 Apple Inc. All rights
reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011 Apple Inc. All rights |
| 8 * reserved. |
| 8 * | 9 * |
| 9 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 11 * modify it under the terms of the GNU Library General Public |
| 11 * License as published by the Free Software Foundation; either | 12 * License as published by the Free Software Foundation; either |
| 12 * version 2 of the License, or (at your option) any later version. | 13 * version 2 of the License, or (at your option) any later version. |
| 13 * | 14 * |
| 14 * This library is distributed in the hope that it will be useful, | 15 * This library is distributed in the hope that it will be useful, |
| 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 17 * Library General Public License for more details. | 18 * Library General Public License for more details. |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 if (equalIgnoringCase(value, "center")) { | 333 if (equalIgnoringCase(value, "center")) { |
| 333 addPropertyToPresentationAttributeStyle( | 334 addPropertyToPresentationAttributeStyle( |
| 334 style, CSSPropertyWebkitMarginStart, CSSValueAuto); | 335 style, CSSPropertyWebkitMarginStart, CSSValueAuto); |
| 335 addPropertyToPresentationAttributeStyle( | 336 addPropertyToPresentationAttributeStyle( |
| 336 style, CSSPropertyWebkitMarginEnd, CSSValueAuto); | 337 style, CSSPropertyWebkitMarginEnd, CSSValueAuto); |
| 337 } else { | 338 } else { |
| 338 addPropertyToPresentationAttributeStyle(style, CSSPropertyFloat, value); | 339 addPropertyToPresentationAttributeStyle(style, CSSPropertyFloat, value); |
| 339 } | 340 } |
| 340 } | 341 } |
| 341 } else if (name == rulesAttr) { | 342 } else if (name == rulesAttr) { |
| 342 // The presence of a valid rules attribute causes border collapsing to be en
abled. | 343 // The presence of a valid rules attribute causes border collapsing to be |
| 344 // enabled. |
| 343 if (m_rulesAttr != UnsetRules) | 345 if (m_rulesAttr != UnsetRules) |
| 344 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderCollapse, | 346 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderCollapse, |
| 345 CSSValueCollapse); | 347 CSSValueCollapse); |
| 346 } else if (name == frameAttr) { | 348 } else if (name == frameAttr) { |
| 347 bool borderTop; | 349 bool borderTop; |
| 348 bool borderRight; | 350 bool borderRight; |
| 349 bool borderBottom; | 351 bool borderBottom; |
| 350 bool borderLeft; | 352 bool borderLeft; |
| 351 if (getBordersFromFrameAttributeValue(value, borderTop, borderRight, | 353 if (getBordersFromFrameAttributeValue(value, borderTop, borderRight, |
| 352 borderBottom, borderLeft)) { | 354 borderBottom, borderLeft)) { |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 break; | 518 break; |
| 517 case InsetBorders: | 519 case InsetBorders: |
| 518 style->setProperty( | 520 style->setProperty( |
| 519 CSSPropertyBorderWidth, | 521 CSSPropertyBorderWidth, |
| 520 *CSSPrimitiveValue::create(1, CSSPrimitiveValue::UnitType::Pixels)); | 522 *CSSPrimitiveValue::create(1, CSSPrimitiveValue::UnitType::Pixels)); |
| 521 style->setProperty(CSSPropertyBorderStyle, | 523 style->setProperty(CSSPropertyBorderStyle, |
| 522 *CSSIdentifierValue::create(CSSValueInset)); | 524 *CSSIdentifierValue::create(CSSValueInset)); |
| 523 style->setProperty(CSSPropertyBorderColor, *CSSInheritedValue::create()); | 525 style->setProperty(CSSPropertyBorderColor, *CSSInheritedValue::create()); |
| 524 break; | 526 break; |
| 525 case NoBorders: | 527 case NoBorders: |
| 526 // If 'rules=none' then allow any borders set at cell level to take effect
. | 528 // If 'rules=none' then allow any borders set at cell level to take |
| 529 // effect. |
| 527 break; | 530 break; |
| 528 } | 531 } |
| 529 | 532 |
| 530 if (m_padding) | 533 if (m_padding) |
| 531 style->setProperty(CSSPropertyPadding, | 534 style->setProperty(CSSPropertyPadding, |
| 532 *CSSPrimitiveValue::create( | 535 *CSSPrimitiveValue::create( |
| 533 m_padding, CSSPrimitiveValue::UnitType::Pixels)); | 536 m_padding, CSSPrimitiveValue::UnitType::Pixels)); |
| 534 | 537 |
| 535 return style; | 538 return style; |
| 536 } | 539 } |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 600 const AtomicString& HTMLTableElement::summary() const { | 603 const AtomicString& HTMLTableElement::summary() const { |
| 601 return getAttribute(summaryAttr); | 604 return getAttribute(summaryAttr); |
| 602 } | 605 } |
| 603 | 606 |
| 604 DEFINE_TRACE(HTMLTableElement) { | 607 DEFINE_TRACE(HTMLTableElement) { |
| 605 visitor->trace(m_sharedCellStyle); | 608 visitor->trace(m_sharedCellStyle); |
| 606 HTMLElement::trace(visitor); | 609 HTMLElement::trace(visitor); |
| 607 } | 610 } |
| 608 | 611 |
| 609 } // namespace blink | 612 } // namespace blink |
| OLD | NEW |