| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2011. 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 } | 72 } |
| 73 | 73 |
| 74 String SVGColor::customCSSText() const | 74 String SVGColor::customCSSText() const |
| 75 { | 75 { |
| 76 switch (m_colorType) { | 76 switch (m_colorType) { |
| 77 case SVG_COLORTYPE_UNKNOWN: | 77 case SVG_COLORTYPE_UNKNOWN: |
| 78 return String(); | 78 return String(); |
| 79 case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: | 79 case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: |
| 80 case SVG_COLORTYPE_RGBCOLOR: | 80 case SVG_COLORTYPE_RGBCOLOR: |
| 81 // FIXME: No ICC color support. | 81 // FIXME: No ICC color support. |
| 82 return m_color.serialized(); | 82 return m_color.serializedAsCSSComponentValue(); |
| 83 case SVG_COLORTYPE_CURRENTCOLOR: | 83 case SVG_COLORTYPE_CURRENTCOLOR: |
| 84 if (m_color.isValid()) | 84 if (m_color.isValid()) |
| 85 return m_color.serialized(); | 85 return m_color.serializedAsCSSComponentValue(); |
| 86 return "currentColor"; | 86 return "currentColor"; |
| 87 } | 87 } |
| 88 | 88 |
| 89 ASSERT_NOT_REACHED(); | 89 ASSERT_NOT_REACHED(); |
| 90 return String(); | 90 return String(); |
| 91 } | 91 } |
| 92 | 92 |
| 93 SVGColor::SVGColor(ClassType classType, const SVGColor& cloneFrom) | 93 SVGColor::SVGColor(ClassType classType, const SVGColor& cloneFrom) |
| 94 : CSSValue(classType, /*isCSSOMSafe*/ true) | 94 : CSSValue(classType, /*isCSSOMSafe*/ true) |
| 95 , m_color(cloneFrom.m_color) | 95 , m_color(cloneFrom.m_color) |
| 96 , m_colorType(cloneFrom.m_colorType) | 96 , m_colorType(cloneFrom.m_colorType) |
| 97 { | 97 { |
| 98 } | 98 } |
| 99 | 99 |
| 100 PassRefPtr<SVGColor> SVGColor::cloneForCSSOM() const | 100 PassRefPtr<SVGColor> SVGColor::cloneForCSSOM() const |
| 101 { | 101 { |
| 102 return adoptRef(new SVGColor(SVGColorClass, *this)); | 102 return adoptRef(new SVGColor(SVGColorClass, *this)); |
| 103 } | 103 } |
| 104 | 104 |
| 105 bool SVGColor::equals(const SVGColor& other) const | 105 bool SVGColor::equals(const SVGColor& other) const |
| 106 { | 106 { |
| 107 return m_colorType == other.m_colorType && m_color == other.m_color; | 107 return m_colorType == other.m_colorType && m_color == other.m_color; |
| 108 } | 108 } |
| 109 | 109 |
| 110 } | 110 } |
| OLD | NEW |