Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(642)

Side by Side Diff: Source/core/html/HTMLHRElement.cpp

Issue 1303173007: Oilpan: Unship Oilpan from CSSValues Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLFontElement.cpp ('k') | Source/core/html/HTMLTableElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 else 68 else
69 addHTMLLengthToStyle(style, CSSPropertyWidth, value); 69 addHTMLLengthToStyle(style, CSSPropertyWidth, value);
70 } else if (name == colorAttr) { 70 } else if (name == colorAttr) {
71 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyle, C SSValueSolid); 71 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyle, C SSValueSolid);
72 addHTMLColorToStyle(style, CSSPropertyBorderColor, value); 72 addHTMLColorToStyle(style, CSSPropertyBorderColor, value);
73 addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value); 73 addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value);
74 } else if (name == noshadeAttr) { 74 } else if (name == noshadeAttr) {
75 if (!hasAttribute(colorAttr)) { 75 if (!hasAttribute(colorAttr)) {
76 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyl e, CSSValueSolid); 76 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyl e, CSSValueSolid);
77 77
78 RefPtrWillBeRawPtr<CSSPrimitiveValue> darkGrayValue = cssValuePool() .createColorValue(Color::darkGray); 78 RefPtr<CSSPrimitiveValue> darkGrayValue = cssValuePool().createColor Value(Color::darkGray);
79 style->setProperty(CSSPropertyBorderColor, darkGrayValue); 79 style->setProperty(CSSPropertyBorderColor, darkGrayValue);
80 style->setProperty(CSSPropertyBackgroundColor, darkGrayValue); 80 style->setProperty(CSSPropertyBackgroundColor, darkGrayValue);
81 } 81 }
82 } else if (name == sizeAttr) { 82 } else if (name == sizeAttr) {
83 StringImpl* si = value.impl(); 83 StringImpl* si = value.impl();
84 int size = si->toInt(); 84 int size = si->toInt();
85 if (size <= 1) 85 if (size <= 1)
86 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderBott omWidth, 0, CSSPrimitiveValue::UnitType::Pixels); 86 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderBott omWidth, 0, CSSPrimitiveValue::UnitType::Pixels);
87 else 87 else
88 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, si ze - 2, CSSPrimitiveValue::UnitType::Pixels); 88 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, si ze - 2, CSSPrimitiveValue::UnitType::Pixels);
89 } else { 89 } else {
90 HTMLElement::collectStyleForPresentationAttribute(name, value, style); 90 HTMLElement::collectStyleForPresentationAttribute(name, value, style);
91 } 91 }
92 } 92 }
93 93
94 } 94 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFontElement.cpp ('k') | Source/core/html/HTMLTableElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698