Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1111)

Side by Side Diff: Source/core/layout/style/StyleRareNonInheritedData.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/layout/style/StyleRareNonInheritedData.h" 23 #include "core/layout/style/StyleRareNonInheritedData.h"
24 24
25 #include "core/layout/style/ContentData.h" 25 #include "core/layout/style/ContentData.h"
26 #include "core/layout/style/DataEquivalency.h" 26 #include "core/layout/style/DataEquivalency.h"
27 #include "core/layout/style/LayoutStyle.h" 27 #include "core/layout/style/ComputedStyle.h"
28 #include "core/layout/style/ShadowList.h" 28 #include "core/layout/style/ShadowList.h"
29 #include "core/layout/style/StyleFilterData.h" 29 #include "core/layout/style/StyleFilterData.h"
30 #include "core/layout/style/StyleTransformData.h" 30 #include "core/layout/style/StyleTransformData.h"
31 #include "core/layout/svg/ReferenceFilterBuilder.h" 31 #include "core/layout/svg/ReferenceFilterBuilder.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 StyleRareNonInheritedData::StyleRareNonInheritedData() 35 StyleRareNonInheritedData::StyleRareNonInheritedData()
36 : opacity(LayoutStyle::initialOpacity()) 36 : opacity(ComputedStyle::initialOpacity())
37 , m_perspective(LayoutStyle::initialPerspective()) 37 , m_perspective(ComputedStyle::initialPerspective())
38 , m_perspectiveOrigin(LayoutStyle::initialPerspectiveOrigin()) 38 , m_perspectiveOrigin(ComputedStyle::initialPerspectiveOrigin())
39 , lineClamp(LayoutStyle::initialLineClamp()) 39 , lineClamp(ComputedStyle::initialLineClamp())
40 , m_draggableRegionMode(DraggableRegionNone) 40 , m_draggableRegionMode(DraggableRegionNone)
41 , m_mask(MaskFillLayer, true) 41 , m_mask(MaskFillLayer, true)
42 , m_pageSize() 42 , m_pageSize()
43 , m_shapeOutside(LayoutStyle::initialShapeOutside()) 43 , m_shapeOutside(ComputedStyle::initialShapeOutside())
44 , m_shapeMargin(LayoutStyle::initialShapeMargin()) 44 , m_shapeMargin(ComputedStyle::initialShapeMargin())
45 , m_shapeImageThreshold(LayoutStyle::initialShapeImageThreshold()) 45 , m_shapeImageThreshold(ComputedStyle::initialShapeImageThreshold())
46 , m_clipPath(LayoutStyle::initialClipPath()) 46 , m_clipPath(ComputedStyle::initialClipPath())
47 , m_textDecorationColor(StyleColor::currentColor()) 47 , m_textDecorationColor(StyleColor::currentColor())
48 , m_visitedLinkTextDecorationColor(StyleColor::currentColor()) 48 , m_visitedLinkTextDecorationColor(StyleColor::currentColor())
49 , m_visitedLinkBackgroundColor(LayoutStyle::initialBackgroundColor()) 49 , m_visitedLinkBackgroundColor(ComputedStyle::initialBackgroundColor())
50 , m_visitedLinkOutlineColor(StyleColor::currentColor()) 50 , m_visitedLinkOutlineColor(StyleColor::currentColor())
51 , m_visitedLinkBorderLeftColor(StyleColor::currentColor()) 51 , m_visitedLinkBorderLeftColor(StyleColor::currentColor())
52 , m_visitedLinkBorderRightColor(StyleColor::currentColor()) 52 , m_visitedLinkBorderRightColor(StyleColor::currentColor())
53 , m_visitedLinkBorderTopColor(StyleColor::currentColor()) 53 , m_visitedLinkBorderTopColor(StyleColor::currentColor())
54 , m_visitedLinkBorderBottomColor(StyleColor::currentColor()) 54 , m_visitedLinkBorderBottomColor(StyleColor::currentColor())
55 , m_order(LayoutStyle::initialOrder()) 55 , m_order(ComputedStyle::initialOrder())
56 , m_objectPosition(LayoutStyle::initialObjectPosition()) 56 , m_objectPosition(ComputedStyle::initialObjectPosition())
57 , m_pageSizeType(PAGE_SIZE_AUTO) 57 , m_pageSizeType(PAGE_SIZE_AUTO)
58 , m_transformStyle3D(LayoutStyle::initialTransformStyle3D()) 58 , m_transformStyle3D(ComputedStyle::initialTransformStyle3D())
59 , m_backfaceVisibility(LayoutStyle::initialBackfaceVisibility()) 59 , m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility())
60 , m_alignContent(LayoutStyle::initialAlignContent()) 60 , m_alignContent(ComputedStyle::initialAlignContent())
61 , m_alignContentDistribution(LayoutStyle::initialAlignContentDistribution()) 61 , m_alignContentDistribution(ComputedStyle::initialAlignContentDistribution( ))
62 , m_alignContentOverflowAlignment(LayoutStyle::initialAlignContentOverflowAl ignment()) 62 , m_alignContentOverflowAlignment(ComputedStyle::initialAlignContentOverflow Alignment())
63 , m_alignItems(LayoutStyle::initialAlignItems()) 63 , m_alignItems(ComputedStyle::initialAlignItems())
64 , m_alignItemsOverflowAlignment(LayoutStyle::initialAlignItemsOverflowAlignm ent()) 64 , m_alignItemsOverflowAlignment(ComputedStyle::initialAlignItemsOverflowAlig nment())
65 , m_alignSelf(LayoutStyle::initialAlignSelf()) 65 , m_alignSelf(ComputedStyle::initialAlignSelf())
66 , m_alignSelfOverflowAlignment(LayoutStyle::initialAlignSelfOverflowAlignmen t()) 66 , m_alignSelfOverflowAlignment(ComputedStyle::initialAlignSelfOverflowAlignm ent())
67 , m_justifyContent(LayoutStyle::initialJustifyContent()) 67 , m_justifyContent(ComputedStyle::initialJustifyContent())
68 , m_justifyContentDistribution(LayoutStyle::initialJustifyContentDistributio n()) 68 , m_justifyContentDistribution(ComputedStyle::initialJustifyContentDistribut ion())
69 , m_justifyContentOverflowAlignment(LayoutStyle::initialJustifyContentOverfl owAlignment()) 69 , m_justifyContentOverflowAlignment(ComputedStyle::initialJustifyContentOver flowAlignment())
70 , userDrag(LayoutStyle::initialUserDrag()) 70 , userDrag(ComputedStyle::initialUserDrag())
71 , textOverflow(LayoutStyle::initialTextOverflow()) 71 , textOverflow(ComputedStyle::initialTextOverflow())
72 , marginBeforeCollapse(MCOLLAPSE) 72 , marginBeforeCollapse(MCOLLAPSE)
73 , marginAfterCollapse(MCOLLAPSE) 73 , marginAfterCollapse(MCOLLAPSE)
74 , m_appearance(LayoutStyle::initialAppearance()) 74 , m_appearance(ComputedStyle::initialAppearance())
75 , m_textCombine(LayoutStyle::initialTextCombine()) 75 , m_textCombine(ComputedStyle::initialTextCombine())
76 , m_textDecorationStyle(LayoutStyle::initialTextDecorationStyle()) 76 , m_textDecorationStyle(ComputedStyle::initialTextDecorationStyle())
77 , m_wrapFlow(LayoutStyle::initialWrapFlow()) 77 , m_wrapFlow(ComputedStyle::initialWrapFlow())
78 , m_wrapThrough(LayoutStyle::initialWrapThrough()) 78 , m_wrapThrough(ComputedStyle::initialWrapThrough())
79 , m_hasCurrentOpacityAnimation(false) 79 , m_hasCurrentOpacityAnimation(false)
80 , m_hasCurrentTransformAnimation(false) 80 , m_hasCurrentTransformAnimation(false)
81 , m_hasCurrentFilterAnimation(false) 81 , m_hasCurrentFilterAnimation(false)
82 , m_runningOpacityAnimationOnCompositor(false) 82 , m_runningOpacityAnimationOnCompositor(false)
83 , m_runningTransformAnimationOnCompositor(false) 83 , m_runningTransformAnimationOnCompositor(false)
84 , m_runningFilterAnimationOnCompositor(false) 84 , m_runningFilterAnimationOnCompositor(false)
85 , m_effectiveBlendMode(LayoutStyle::initialBlendMode()) 85 , m_effectiveBlendMode(ComputedStyle::initialBlendMode())
86 , m_touchAction(LayoutStyle::initialTouchAction()) 86 , m_touchAction(ComputedStyle::initialTouchAction())
87 , m_objectFit(LayoutStyle::initialObjectFit()) 87 , m_objectFit(ComputedStyle::initialObjectFit())
88 , m_isolation(LayoutStyle::initialIsolation()) 88 , m_isolation(ComputedStyle::initialIsolation())
89 , m_justifyItems(LayoutStyle::initialJustifyItems()) 89 , m_justifyItems(ComputedStyle::initialJustifyItems())
90 , m_justifyItemsOverflowAlignment(LayoutStyle::initialJustifyItemsOverflowAl ignment()) 90 , m_justifyItemsOverflowAlignment(ComputedStyle::initialJustifyItemsOverflow Alignment())
91 , m_justifyItemsPositionType(LayoutStyle::initialJustifyItemsPositionType()) 91 , m_justifyItemsPositionType(ComputedStyle::initialJustifyItemsPositionType( ))
92 , m_justifySelf(LayoutStyle::initialJustifySelf()) 92 , m_justifySelf(ComputedStyle::initialJustifySelf())
93 , m_justifySelfOverflowAlignment(LayoutStyle::initialJustifySelfOverflowAlig nment()) 93 , m_justifySelfOverflowAlignment(ComputedStyle::initialJustifySelfOverflowAl ignment())
94 , m_scrollBehavior(LayoutStyle::initialScrollBehavior()) 94 , m_scrollBehavior(ComputedStyle::initialScrollBehavior())
95 , m_scrollBlocksOn(LayoutStyle::initialScrollBlocksOn()) 95 , m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn())
96 , m_requiresAcceleratedCompositingForExternalReasons(false) 96 , m_requiresAcceleratedCompositingForExternalReasons(false)
97 , m_hasInlineTransform(false) 97 , m_hasInlineTransform(false)
98 , m_resize(LayoutStyle::initialResize()) 98 , m_resize(ComputedStyle::initialResize())
99 { 99 {
100 m_maskBoxImage.setMaskDefaults(); 100 m_maskBoxImage.setMaskDefaults();
101 } 101 }
102 102
103 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 103 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
104 : RefCounted<StyleRareNonInheritedData>() 104 : RefCounted<StyleRareNonInheritedData>()
105 , opacity(o.opacity) 105 , opacity(o.opacity)
106 , m_perspective(o.m_perspective) 106 , m_perspective(o.m_perspective)
107 , m_perspectiveOrigin(o.m_perspectiveOrigin) 107 , m_perspectiveOrigin(o.m_perspectiveOrigin)
108 , lineClamp(o.lineClamp) 108 , lineClamp(o.lineClamp)
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 { 325 {
326 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); 326 return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
327 } 327 }
328 328
329 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const 329 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const
330 { 330 {
331 return dataEquivalent(m_clipPath, o.m_clipPath); 331 return dataEquivalent(m_clipPath, o.m_clipPath);
332 } 332 }
333 333
334 } // namespace blink 334 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/style/StyleRareNonInheritedData.h ('k') | Source/core/layout/style/StyleTransformData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698