| 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 | 181 |
| 182 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
onst | 182 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
onst |
| 183 { | 183 { |
| 184 return opacity == o.opacity | 184 return opacity == o.opacity |
| 185 && m_aspectRatioDenominator == o.m_aspectRatioDenominator | 185 && m_aspectRatioDenominator == o.m_aspectRatioDenominator |
| 186 && m_aspectRatioNumerator == o.m_aspectRatioNumerator | 186 && m_aspectRatioNumerator == o.m_aspectRatioNumerator |
| 187 && m_perspective == o.m_perspective | 187 && m_perspective == o.m_perspective |
| 188 && m_perspectiveOriginX == o.m_perspectiveOriginX | 188 && m_perspectiveOriginX == o.m_perspectiveOriginX |
| 189 && m_perspectiveOriginY == o.m_perspectiveOriginY | 189 && m_perspectiveOriginY == o.m_perspectiveOriginY |
| 190 && lineClamp == o.lineClamp | 190 && lineClamp == o.lineClamp |
| 191 #if ENABLE(DASHBOARD_SUPPORT) | |
| 192 && m_dashboardRegions == o.m_dashboardRegions | |
| 193 #endif | |
| 194 #if ENABLE(DRAGGABLE_REGION) | 191 #if ENABLE(DRAGGABLE_REGION) |
| 195 && m_draggableRegionMode == o.m_draggableRegionMode | 192 && m_draggableRegionMode == o.m_draggableRegionMode |
| 196 #endif | 193 #endif |
| 197 && m_deprecatedFlexibleBox == o.m_deprecatedFlexibleBox | 194 && m_deprecatedFlexibleBox == o.m_deprecatedFlexibleBox |
| 198 && m_flexibleBox == o.m_flexibleBox | 195 && m_flexibleBox == o.m_flexibleBox |
| 199 && m_marquee == o.m_marquee | 196 && m_marquee == o.m_marquee |
| 200 && m_multiCol == o.m_multiCol | 197 && m_multiCol == o.m_multiCol |
| 201 && m_transform == o.m_transform | 198 && m_transform == o.m_transform |
| 202 #if ENABLE(CSS_FILTERS) | 199 #if ENABLE(CSS_FILTERS) |
| 203 && m_filter == o.m_filter | 200 && m_filter == o.m_filter |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 if ((!m_transitions && o.m_transitions) || (m_transitions && !o.m_transition
s)) | 317 if ((!m_transitions && o.m_transitions) || (m_transitions && !o.m_transition
s)) |
| 321 return false; | 318 return false; |
| 322 if (m_transitions && o.m_transitions && (*m_transitions != *o.m_transitions)
) | 319 if (m_transitions && o.m_transitions && (*m_transitions != *o.m_transitions)
) |
| 323 return false; | 320 return false; |
| 324 return true; | 321 return true; |
| 325 } | 322 } |
| 326 | 323 |
| 327 void StyleRareNonInheritedData::reportMemoryUsage(MemoryObjectInfo* memoryObject
Info) const | 324 void StyleRareNonInheritedData::reportMemoryUsage(MemoryObjectInfo* memoryObject
Info) const |
| 328 { | 325 { |
| 329 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); | 326 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
| 330 #if ENABLE(DASHBOARD_SUPPORT) | |
| 331 info.addMember(m_dashboardRegions, "dashboardRegions"); | |
| 332 #endif | |
| 333 info.addMember(m_deprecatedFlexibleBox, "deprecatedFlexibleBox"); | 327 info.addMember(m_deprecatedFlexibleBox, "deprecatedFlexibleBox"); |
| 334 info.addMember(m_flexibleBox, "flexibleBox"); | 328 info.addMember(m_flexibleBox, "flexibleBox"); |
| 335 info.addMember(m_marquee, "marquee"); | 329 info.addMember(m_marquee, "marquee"); |
| 336 info.addMember(m_multiCol, "multiCol"); | 330 info.addMember(m_multiCol, "multiCol"); |
| 337 info.addMember(m_transform, "transform"); | 331 info.addMember(m_transform, "transform"); |
| 338 #if ENABLE(CSS_FILTERS) | 332 #if ENABLE(CSS_FILTERS) |
| 339 info.addMember(m_filter, "filter"); | 333 info.addMember(m_filter, "filter"); |
| 340 #endif | 334 #endif |
| 341 info.addMember(m_grid, "grid"); | 335 info.addMember(m_grid, "grid"); |
| 342 info.addMember(m_gridItem, "gridItem"); | 336 info.addMember(m_gridItem, "gridItem"); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 353 info.addMember(m_regionThread, "regionThread"); | 347 info.addMember(m_regionThread, "regionThread"); |
| 354 | 348 |
| 355 info.ignoreMember(m_perspectiveOriginX); | 349 info.ignoreMember(m_perspectiveOriginX); |
| 356 info.ignoreMember(m_perspectiveOriginY); | 350 info.ignoreMember(m_perspectiveOriginY); |
| 357 info.ignoreMember(m_pageSize); | 351 info.ignoreMember(m_pageSize); |
| 358 info.ignoreMember(m_shapeMargin); | 352 info.ignoreMember(m_shapeMargin); |
| 359 info.ignoreMember(m_shapePadding); | 353 info.ignoreMember(m_shapePadding); |
| 360 } | 354 } |
| 361 | 355 |
| 362 } // namespace WebCore | 356 } // namespace WebCore |
| OLD | NEW |