| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. | 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 return generateCSSString(first()->cssText(), second()->cssText(), m_iden
ticalValuesPolicy); | 55 return generateCSSString(first()->cssText(), second()->cssText(), m_iden
ticalValuesPolicy); |
| 56 } | 56 } |
| 57 | 57 |
| 58 bool equals(const Pair& other) const | 58 bool equals(const Pair& other) const |
| 59 { | 59 { |
| 60 return compareCSSValuePtr(m_first, other.m_first) | 60 return compareCSSValuePtr(m_first, other.m_first) |
| 61 && compareCSSValuePtr(m_second, other.m_second) | 61 && compareCSSValuePtr(m_second, other.m_second) |
| 62 && m_identicalValuesPolicy == other.m_identicalValuesPolicy; | 62 && m_identicalValuesPolicy == other.m_identicalValuesPolicy; |
| 63 } | 63 } |
| 64 | 64 |
| 65 void trace(Visitor*); | |
| 66 | |
| 67 private: | 65 private: |
| 68 Pair() | 66 Pair() |
| 69 : m_first(nullptr) | 67 : m_first(nullptr) |
| 70 , m_second(nullptr) | 68 , m_second(nullptr) |
| 71 , m_identicalValuesPolicy(DropIdenticalValues) { } | 69 , m_identicalValuesPolicy(DropIdenticalValues) { } |
| 72 | 70 |
| 73 Pair(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> seco
nd, IdenticalValuesPolicy identicalValuesPolicy) | 71 Pair(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> seco
nd, IdenticalValuesPolicy identicalValuesPolicy) |
| 74 : m_first(first) | 72 : m_first(first) |
| 75 , m_second(second) | 73 , m_second(second) |
| 76 , m_identicalValuesPolicy(identicalValuesPolicy) { } | 74 , m_identicalValuesPolicy(identicalValuesPolicy) { } |
| 77 | 75 |
| 78 static String generateCSSString(const String& first, const String& second, I
denticalValuesPolicy identicalValuesPolicy) | 76 static String generateCSSString(const String& first, const String& second, I
denticalValuesPolicy identicalValuesPolicy) |
| 79 { | 77 { |
| 80 if (identicalValuesPolicy == DropIdenticalValues && first == second) | 78 if (identicalValuesPolicy == DropIdenticalValues && first == second) |
| 81 return first; | 79 return first; |
| 82 return first + ' ' + second; | 80 return first + ' ' + second; |
| 83 } | 81 } |
| 84 | 82 |
| 85 RefPtr<CSSPrimitiveValue> m_first; | 83 RefPtr<CSSPrimitiveValue> m_first; |
| 86 RefPtr<CSSPrimitiveValue> m_second; | 84 RefPtr<CSSPrimitiveValue> m_second; |
| 87 IdenticalValuesPolicy m_identicalValuesPolicy; | 85 IdenticalValuesPolicy m_identicalValuesPolicy; |
| 88 }; | 86 }; |
| 89 | 87 |
| 90 } // namespace | 88 } // namespace |
| 91 | 89 |
| 92 #endif | 90 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
