| 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, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
| 14 * | 14 * |
| 15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
| 16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
| 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
| 19 * | 19 * |
| 20 */ | 20 */ |
| 21 | 21 |
| 22 #include "config.h" | 22 #include "config.h" |
| 23 #include "core/rendering/style/StyleRareNonInheritedData.h" | 23 #include "core/rendering/style/StyleRareNonInheritedData.h" |
| 24 | 24 |
| 25 #include "core/css/StyleResolver.h" | 25 #include "core/css/resolver/StyleResolver.h" |
| 26 #include "core/dom/WebCoreMemoryInstrumentation.h" | 26 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 27 #include "core/rendering/RenderCounter.h" | 27 #include "core/rendering/RenderCounter.h" |
| 28 #include "core/rendering/style/ContentData.h" | 28 #include "core/rendering/style/ContentData.h" |
| 29 #include "core/rendering/style/RenderStyle.h" | 29 #include "core/rendering/style/RenderStyle.h" |
| 30 #include "core/rendering/style/ShadowData.h" | 30 #include "core/rendering/style/ShadowData.h" |
| 31 #include "core/rendering/style/StyleFilterData.h" | 31 #include "core/rendering/style/StyleFilterData.h" |
| 32 #include "core/rendering/style/StyleImage.h" | 32 #include "core/rendering/style/StyleImage.h" |
| 33 #include "core/rendering/style/StyleTransformData.h" | 33 #include "core/rendering/style/StyleTransformData.h" |
| 34 #include <wtf/MemoryInstrumentationHashMap.h> | 34 #include <wtf/MemoryInstrumentationHashMap.h> |
| 35 #include <wtf/MemoryInstrumentationVector.h> | 35 #include <wtf/MemoryInstrumentationVector.h> |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 b = b->next(); | 248 b = b->next(); |
| 249 } | 249 } |
| 250 | 250 |
| 251 return !a && !b; | 251 return !a && !b; |
| 252 } | 252 } |
| 253 | 253 |
| 254 bool StyleRareNonInheritedData::counterDataEquivalent(const StyleRareNonInherite
dData& o) const | 254 bool StyleRareNonInheritedData::counterDataEquivalent(const StyleRareNonInherite
dData& o) const |
| 255 { | 255 { |
| 256 if (m_counterDirectives.get() == o.m_counterDirectives.get()) | 256 if (m_counterDirectives.get() == o.m_counterDirectives.get()) |
| 257 return true; | 257 return true; |
| 258 | 258 |
| 259 if (m_counterDirectives && o.m_counterDirectives && *m_counterDirectives ==
*o.m_counterDirectives) | 259 if (m_counterDirectives && o.m_counterDirectives && *m_counterDirectives ==
*o.m_counterDirectives) |
| 260 return true; | 260 return true; |
| 261 | 261 |
| 262 return false; | 262 return false; |
| 263 } | 263 } |
| 264 | 264 |
| 265 bool StyleRareNonInheritedData::shadowDataEquivalent(const StyleRareNonInherited
Data& o) const | 265 bool StyleRareNonInheritedData::shadowDataEquivalent(const StyleRareNonInherited
Data& o) const |
| 266 { | 266 { |
| 267 if ((!m_boxShadow && o.m_boxShadow) || (m_boxShadow && !o.m_boxShadow)) | 267 if ((!m_boxShadow && o.m_boxShadow) || (m_boxShadow && !o.m_boxShadow)) |
| 268 return false; | 268 return false; |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 info.addMember(m_regionThread, "regionThread"); | 323 info.addMember(m_regionThread, "regionThread"); |
| 324 | 324 |
| 325 info.ignoreMember(m_perspectiveOriginX); | 325 info.ignoreMember(m_perspectiveOriginX); |
| 326 info.ignoreMember(m_perspectiveOriginY); | 326 info.ignoreMember(m_perspectiveOriginY); |
| 327 info.ignoreMember(m_pageSize); | 327 info.ignoreMember(m_pageSize); |
| 328 info.ignoreMember(m_shapeMargin); | 328 info.ignoreMember(m_shapeMargin); |
| 329 info.ignoreMember(m_shapePadding); | 329 info.ignoreMember(m_shapePadding); |
| 330 } | 330 } |
| 331 | 331 |
| 332 } // namespace WebCore | 332 } // namespace WebCore |
| OLD | NEW |