Chromium Code Reviews| 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 22 matching lines...) Expand all Loading... | |
| 33 StyleRareNonInheritedData::StyleRareNonInheritedData() | 33 StyleRareNonInheritedData::StyleRareNonInheritedData() |
| 34 : opacity(RenderStyle::initialOpacity()) | 34 : opacity(RenderStyle::initialOpacity()) |
| 35 , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator()) | 35 , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator()) |
| 36 , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator()) | 36 , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator()) |
| 37 , m_perspective(RenderStyle::initialPerspective()) | 37 , m_perspective(RenderStyle::initialPerspective()) |
| 38 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX()) | 38 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX()) |
| 39 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY()) | 39 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY()) |
| 40 , lineClamp(RenderStyle::initialLineClamp()) | 40 , lineClamp(RenderStyle::initialLineClamp()) |
| 41 , m_draggableRegionMode(DraggableRegionNone) | 41 , m_draggableRegionMode(DraggableRegionNone) |
| 42 , m_mask(FillLayer(MaskFillLayer)) | 42 , m_mask(FillLayer(MaskFillLayer)) |
| 43 , m_navigation() | |
|
esprehn
2013/08/08 03:39:40
leave these off, the default constructor does it f
Krzysztof Olczyk
2013/12/04 13:56:50
Done.
| |
| 43 , m_pageSize() | 44 , m_pageSize() |
| 44 , m_shapeInside(RenderStyle::initialShapeInside()) | 45 , m_shapeInside(RenderStyle::initialShapeInside()) |
| 45 , m_shapeOutside(RenderStyle::initialShapeOutside()) | 46 , m_shapeOutside(RenderStyle::initialShapeOutside()) |
| 46 , m_shapeMargin(RenderStyle::initialShapeMargin()) | 47 , m_shapeMargin(RenderStyle::initialShapeMargin()) |
| 47 , m_shapePadding(RenderStyle::initialShapePadding()) | 48 , m_shapePadding(RenderStyle::initialShapePadding()) |
| 48 , m_clipPath(RenderStyle::initialClipPath()) | 49 , m_clipPath(RenderStyle::initialClipPath()) |
| 49 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor()) | 50 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor()) |
| 50 , m_order(RenderStyle::initialOrder()) | 51 , m_order(RenderStyle::initialOrder()) |
| 51 , m_flowThread(RenderStyle::initialFlowThread()) | 52 , m_flowThread(RenderStyle::initialFlowThread()) |
| 52 , m_regionThread(RenderStyle::initialRegionThread()) | 53 , m_regionThread(RenderStyle::initialRegionThread()) |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 98 , m_grid(o.m_grid) | 99 , m_grid(o.m_grid) |
| 99 , m_gridItem(o.m_gridItem) | 100 , m_gridItem(o.m_gridItem) |
| 100 , m_content(o.m_content ? o.m_content->clone() : nullptr) | 101 , m_content(o.m_content ? o.m_content->clone() : nullptr) |
| 101 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr) | 102 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr) |
| 102 , m_boxShadow(cloneShadow(o.m_boxShadow)) | 103 , m_boxShadow(cloneShadow(o.m_boxShadow)) |
| 103 , m_boxReflect(o.m_boxReflect) | 104 , m_boxReflect(o.m_boxReflect) |
| 104 , m_animations(o.m_animations ? adoptPtr(new CSSAnimationDataList(*o.m_anima tions)) : nullptr) | 105 , m_animations(o.m_animations ? adoptPtr(new CSSAnimationDataList(*o.m_anima tions)) : nullptr) |
| 105 , m_transitions(o.m_transitions ? adoptPtr(new CSSAnimationDataList(*o.m_tra nsitions)) : nullptr) | 106 , m_transitions(o.m_transitions ? adoptPtr(new CSSAnimationDataList(*o.m_tra nsitions)) : nullptr) |
| 106 , m_mask(o.m_mask) | 107 , m_mask(o.m_mask) |
| 107 , m_maskBoxImage(o.m_maskBoxImage) | 108 , m_maskBoxImage(o.m_maskBoxImage) |
| 109 , m_navigation(o.m_navigation) | |
| 108 , m_pageSize(o.m_pageSize) | 110 , m_pageSize(o.m_pageSize) |
| 109 , m_shapeInside(o.m_shapeInside) | 111 , m_shapeInside(o.m_shapeInside) |
| 110 , m_shapeOutside(o.m_shapeOutside) | 112 , m_shapeOutside(o.m_shapeOutside) |
| 111 , m_shapeMargin(o.m_shapeMargin) | 113 , m_shapeMargin(o.m_shapeMargin) |
| 112 , m_shapePadding(o.m_shapePadding) | 114 , m_shapePadding(o.m_shapePadding) |
| 113 , m_clipPath(o.m_clipPath) | 115 , m_clipPath(o.m_clipPath) |
| 114 , m_textDecorationColor(o.m_textDecorationColor) | 116 , m_textDecorationColor(o.m_textDecorationColor) |
| 115 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor) | 117 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor) |
| 116 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor) | 118 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor) |
| 117 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor) | 119 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor) |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 173 && m_grid == o.m_grid | 175 && m_grid == o.m_grid |
| 174 && m_gridItem == o.m_gridItem | 176 && m_gridItem == o.m_gridItem |
| 175 && contentDataEquivalent(o) | 177 && contentDataEquivalent(o) |
| 176 && counterDataEquivalent(o) | 178 && counterDataEquivalent(o) |
| 177 && shadowDataEquivalent(o) | 179 && shadowDataEquivalent(o) |
| 178 && reflectionDataEquivalent(o) | 180 && reflectionDataEquivalent(o) |
| 179 && animationDataEquivalent(o) | 181 && animationDataEquivalent(o) |
| 180 && transitionDataEquivalent(o) | 182 && transitionDataEquivalent(o) |
| 181 && m_mask == o.m_mask | 183 && m_mask == o.m_mask |
| 182 && m_maskBoxImage == o.m_maskBoxImage | 184 && m_maskBoxImage == o.m_maskBoxImage |
| 185 && m_navigation == o.m_navigation | |
| 183 && m_pageSize == o.m_pageSize | 186 && m_pageSize == o.m_pageSize |
| 184 && m_shapeInside == o.m_shapeInside | 187 && m_shapeInside == o.m_shapeInside |
| 185 && m_shapeOutside == o.m_shapeOutside | 188 && m_shapeOutside == o.m_shapeOutside |
| 186 && m_shapeMargin == o.m_shapeMargin | 189 && m_shapeMargin == o.m_shapeMargin |
| 187 && m_shapePadding == o.m_shapePadding | 190 && m_shapePadding == o.m_shapePadding |
| 188 && m_clipPath == o.m_clipPath | 191 && m_clipPath == o.m_clipPath |
| 189 && m_textDecorationColor == o.m_textDecorationColor | 192 && m_textDecorationColor == o.m_textDecorationColor |
| 190 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r | 193 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r |
| 191 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor | 194 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor |
| 192 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor | 195 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 279 bool StyleRareNonInheritedData::transitionDataEquivalent(const StyleRareNonInher itedData& o) const | 282 bool StyleRareNonInheritedData::transitionDataEquivalent(const StyleRareNonInher itedData& o) const |
| 280 { | 283 { |
| 281 if ((!m_transitions && o.m_transitions) || (m_transitions && !o.m_transition s)) | 284 if ((!m_transitions && o.m_transitions) || (m_transitions && !o.m_transition s)) |
| 282 return false; | 285 return false; |
| 283 if (m_transitions && o.m_transitions && (*m_transitions != *o.m_transitions) ) | 286 if (m_transitions && o.m_transitions && (*m_transitions != *o.m_transitions) ) |
| 284 return false; | 287 return false; |
| 285 return true; | 288 return true; |
| 286 } | 289 } |
| 287 | 290 |
| 288 } // namespace WebCore | 291 } // namespace WebCore |
| OLD | NEW |