Index: Source/core/html/HTMLTableElement.cpp |
diff --git a/Source/core/html/HTMLTableElement.cpp b/Source/core/html/HTMLTableElement.cpp |
index a24666b62b9b04e07f3e656117a0bcd57ed07298..2be99a71389800c948481fc3a9dfaabf32e42b64 100644 |
--- a/Source/core/html/HTMLTableElement.cpp |
+++ b/Source/core/html/HTMLTableElement.cpp |
@@ -346,7 +346,6 @@ void HTMLTableElement::collectStyleForPresentationAttribute(const QualifiedName& |
bool borderBottom; |
bool borderLeft; |
if (getBordersFromFrameAttributeValue(value, borderTop, borderRight, borderBottom, borderLeft)) { |
- addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderWidth, CSSValueThin); |
Julien - ping for review
2014/08/05 19:22:43
I would rather fix the whole logic to avoid having
|
addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderTopStyle, borderTop ? CSSValueSolid : CSSValueHidden); |
addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderBottomStyle, borderBottom ? CSSValueSolid : CSSValueHidden); |
addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderLeftStyle, borderLeft ? CSSValueSolid : CSSValueHidden); |
@@ -420,8 +419,10 @@ static PassRefPtrWillBeRawPtr<StylePropertySet> createBorderStyle(CSSValueID val |
const StylePropertySet* HTMLTableElement::additionalPresentationAttributeStyle() |
{ |
- if (m_frameAttr) |
- return 0; |
+ if (m_frameAttr) { |
+ if (!equalIgnoringCase(getAttribute(frameAttr), "border") && !equalIgnoringCase(getAttribute(frameAttr), "box")) |
+ return 0; |
+ } |
if (!m_borderAttr && !m_borderColorAttr) { |
// Setting the border to 'hidden' allows it to win over any border |