| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 | 48 |
| 49 FillLayer fillLayers; | 49 FillLayer fillLayers; |
| 50 NinePieceImage ninePieces; | 50 NinePieceImage ninePieces; |
| 51 FloatSize floatSize; | 51 FloatSize floatSize; |
| 52 Length lengths; | 52 Length lengths; |
| 53 | 53 |
| 54 StyleColor styleColors[8]; | 54 StyleColor styleColors[8]; |
| 55 | 55 |
| 56 Vector<String> m_callbackSelectors; | 56 Vector<String> m_callbackSelectors; |
| 57 | 57 |
| 58 Vector<void*> m_paintImages; |
| 59 |
| 58 StyleContentAlignmentData contentAlignmentData[2]; | 60 StyleContentAlignmentData contentAlignmentData[2]; |
| 59 StyleSelfAlignmentData selfAlignmentData[4]; | 61 StyleSelfAlignmentData selfAlignmentData[4]; |
| 60 | 62 |
| 61 unsigned m_bitFields[2]; | 63 unsigned m_bitFields[2]; |
| 62 }; | 64 }; |
| 63 | 65 |
| 64 static_assert(sizeof(StyleRareNonInheritedData) == sizeof(SameSizeStyleRareNonIn
heritedData), "StyleRareNonInheritedData_should_stay_small"); | 66 static_assert(sizeof(StyleRareNonInheritedData) == sizeof(SameSizeStyleRareNonIn
heritedData), "StyleRareNonInheritedData_should_stay_small"); |
| 65 | 67 |
| 66 StyleRareNonInheritedData::StyleRareNonInheritedData() | 68 StyleRareNonInheritedData::StyleRareNonInheritedData() |
| 67 : opacity(ComputedStyle::initialOpacity()) | 69 : opacity(ComputedStyle::initialOpacity()) |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 { | 351 { |
| 350 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); | 352 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); |
| 351 } | 353 } |
| 352 | 354 |
| 353 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit
edData& o) const | 355 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit
edData& o) const |
| 354 { | 356 { |
| 355 return dataEquivalent(m_clipPath, o.m_clipPath); | 357 return dataEquivalent(m_clipPath, o.m_clipPath); |
| 356 } | 358 } |
| 357 | 359 |
| 358 } // namespace blink | 360 } // namespace blink |
| OLD | NEW |