| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * Copyright (C) 2003, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2003, 2010 Apple Inc. 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 else | 69 else |
| 70 addHTMLLengthToStyle(style, CSSPropertyWidth, value); | 70 addHTMLLengthToStyle(style, CSSPropertyWidth, value); |
| 71 } else if (name == colorAttr) { | 71 } else if (name == colorAttr) { |
| 72 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyle, C
SSValueSolid); | 72 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyle, C
SSValueSolid); |
| 73 addHTMLColorToStyle(style, CSSPropertyBorderColor, value); | 73 addHTMLColorToStyle(style, CSSPropertyBorderColor, value); |
| 74 addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value); | 74 addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value); |
| 75 } else if (name == noshadeAttr) { | 75 } else if (name == noshadeAttr) { |
| 76 if (!hasAttribute(colorAttr)) { | 76 if (!hasAttribute(colorAttr)) { |
| 77 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyl
e, CSSValueSolid); | 77 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyl
e, CSSValueSolid); |
| 78 | 78 |
| 79 CSSColorValue* darkGrayValue = CSSColorValue::create(Color::darkGray
); | 79 const CSSColorValue& darkGrayValue = *CSSColorValue::create(Color::d
arkGray); |
| 80 style->setProperty(CSSPropertyBorderColor, darkGrayValue); | 80 style->setProperty(CSSPropertyBorderColor, darkGrayValue); |
| 81 style->setProperty(CSSPropertyBackgroundColor, darkGrayValue); | 81 style->setProperty(CSSPropertyBackgroundColor, darkGrayValue); |
| 82 } | 82 } |
| 83 } else if (name == sizeAttr) { | 83 } else if (name == sizeAttr) { |
| 84 StringImpl* si = value.impl(); | 84 StringImpl* si = value.impl(); |
| 85 int size = si->toInt(); | 85 int size = si->toInt(); |
| 86 if (size <= 1) | 86 if (size <= 1) |
| 87 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderBott
omWidth, 0, CSSPrimitiveValue::UnitType::Pixels); | 87 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderBott
omWidth, 0, CSSPrimitiveValue::UnitType::Pixels); |
| 88 else | 88 else |
| 89 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, si
ze - 2, CSSPrimitiveValue::UnitType::Pixels); | 89 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, si
ze - 2, CSSPrimitiveValue::UnitType::Pixels); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 toHTMLSelectElement(insertionPoint)->hrInsertedOrRemoved(*this); | 121 toHTMLSelectElement(insertionPoint)->hrInsertedOrRemoved(*this); |
| 122 } else if (isHTMLOptGroupElement(*insertionPoint)) { | 122 } else if (isHTMLOptGroupElement(*insertionPoint)) { |
| 123 Node* parent = insertionPoint->parentNode(); | 123 Node* parent = insertionPoint->parentNode(); |
| 124 if (isHTMLSelectElement(parent)) | 124 if (isHTMLSelectElement(parent)) |
| 125 toHTMLSelectElement(parent)->hrInsertedOrRemoved(*this); | 125 toHTMLSelectElement(parent)->hrInsertedOrRemoved(*this); |
| 126 } | 126 } |
| 127 HTMLElement::removedFrom(insertionPoint); | 127 HTMLElement::removedFrom(insertionPoint); |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace blink | 130 } // namespace blink |
| OLD | NEW |