Chromium Code Reviews| 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 reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 402 | 402 |
| 403 const StylePropertySet* HTMLTableElement::additionalPresentationAttributeStyle() | 403 const StylePropertySet* HTMLTableElement::additionalPresentationAttributeStyle() |
| 404 { | 404 { |
| 405 if (m_frameAttr) | 405 if (m_frameAttr) |
| 406 return nullptr; | 406 return nullptr; |
| 407 | 407 |
| 408 if (!m_borderAttr && !m_borderColorAttr) { | 408 if (!m_borderAttr && !m_borderColorAttr) { |
| 409 // Setting the border to 'hidden' allows it to win over any border | 409 // Setting the border to 'hidden' allows it to win over any border |
| 410 // set on the table's cells during border-conflict resolution. | 410 // set on the table's cells during border-conflict resolution. |
| 411 if (m_rulesAttr != UnsetRules) { | 411 if (m_rulesAttr != UnsetRules) { |
| 412 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, solidBorderSt yle, (createBorderStyle(CSSValueHidden))); | 412 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, hiddenBorderS tyle, (createBorderStyle(CSSValueHidden))); |
|
tkent
2014/12/10 02:34:58
This change is not related to the topic of this CL
| |
| 413 return solidBorderStyle; | 413 return hiddenBorderStyle; |
| 414 } | 414 } |
| 415 return nullptr; | 415 return nullptr; |
| 416 } | 416 } |
| 417 | 417 |
| 418 if (m_borderColorAttr) { | 418 if (m_borderColorAttr) { |
| 419 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, solidBorderStyle, (createBorderStyle(CSSValueSolid))); | 419 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, solidBorderStyle, (createBorderStyle(CSSValueSolid))); |
| 420 return solidBorderStyle; | 420 return solidBorderStyle; |
| 421 } | 421 } |
| 422 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, outsetBorderStyle, (c reateBorderStyle(CSSValueOutset))); | 422 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(StylePropertySet, outsetBorderStyle, (c reateBorderStyle(CSSValueOutset))); |
| 423 return outsetBorderStyle; | 423 return outsetBorderStyle; |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 558 return getAttribute(summaryAttr); | 558 return getAttribute(summaryAttr); |
| 559 } | 559 } |
| 560 | 560 |
| 561 void HTMLTableElement::trace(Visitor* visitor) | 561 void HTMLTableElement::trace(Visitor* visitor) |
| 562 { | 562 { |
| 563 visitor->trace(m_sharedCellStyle); | 563 visitor->trace(m_sharedCellStyle); |
| 564 HTMLElement::trace(visitor); | 564 HTMLElement::trace(visitor); |
| 565 } | 565 } |
| 566 | 566 |
| 567 } | 567 } |
| OLD | NEW |