Changeset 96594 in webkit
- Timestamp:
- Oct 4, 2011 8:13:45 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r96593 r96594 1 2011-10-04 Andreas Kling <kling@webkit.org> 2 3 Shrink StyleRareNonInheritedData. 4 https://bugs.webkit.org/show_bug.cgi?id=69331 5 6 Reviewed by Antti Koivisto. 7 8 Rearrange the members and move all small types into the bitfield. 9 This shrinks StyleRareNonInheritedData by two CPU words, reducing memory 10 consumption by 140 kB (on 64-bit) when loading the full HTML5 spec. 11 12 * rendering/style/StyleRareNonInheritedData.cpp: 13 (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): 14 * rendering/style/StyleRareNonInheritedData.h: 15 1 16 2011-10-04 Vsevolod Vlasov <vsevik@chromium.org> 2 17 -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
r96142 r96594 37 37 : lineClamp(RenderStyle::initialLineClamp()) 38 38 , opacity(RenderStyle::initialOpacity()) 39 , m_mask(FillLayer(MaskFillLayer)) 40 , m_perspective(RenderStyle::initialPerspective()) 41 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX()) 42 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY()) 43 , m_pageSize() 44 , m_wrapShape(RenderStyle::initialWrapShape()) 45 , m_flowThread(RenderStyle::initialFlowThread()) 46 , m_regionThread(RenderStyle::initialRegionThread()) 47 , m_regionIndex(RenderStyle::initialRegionIndex()) 48 , m_regionOverflow(RenderStyle::initialRegionOverflow()) 49 , m_regionBreakAfter(RenderStyle::initialPageBreak()) 50 , m_regionBreakBefore(RenderStyle::initialPageBreak()) 51 , m_regionBreakInside(RenderStyle::initialPageBreak()) 52 , m_pageSizeType(PAGE_SIZE_AUTO) 53 , m_transformStyle3D(RenderStyle::initialTransformStyle3D()) 54 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility()) 39 55 , userDrag(RenderStyle::initialUserDrag()) 40 56 , textOverflow(RenderStyle::initialTextOverflow()) … … 45 61 , m_borderFit(RenderStyle::initialBorderFit()) 46 62 , m_textCombine(RenderStyle::initialTextCombine()) 63 #if USE(ACCELERATED_COMPOSITING) 64 , m_runningAcceleratedAnimation(false) 65 #endif 47 66 , m_counterIncrement(0) 48 67 , m_counterReset(0) 49 #if USE(ACCELERATED_COMPOSITING)50 , m_runningAcceleratedAnimation(false)51 #endif52 , m_mask(FillLayer(MaskFillLayer))53 , m_transformStyle3D(RenderStyle::initialTransformStyle3D())54 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())55 , m_perspective(RenderStyle::initialPerspective())56 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX())57 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY())58 , m_pageSize()59 , m_pageSizeType(PAGE_SIZE_AUTO)60 , m_flowThread(RenderStyle::initialFlowThread())61 , m_regionThread(RenderStyle::initialRegionThread())62 , m_regionIndex(RenderStyle::initialRegionIndex())63 , m_regionOverflow(RenderStyle::initialRegionOverflow())64 , m_wrapShape(RenderStyle::initialWrapShape())65 , m_regionBreakAfter(RenderStyle::initialPageBreak())66 , m_regionBreakBefore(RenderStyle::initialPageBreak())67 , m_regionBreakInside(RenderStyle::initialPageBreak())68 68 { 69 69 m_maskBoxImage.setMaskDefaults(); … … 86 86 , m_content(o.m_content ? o.m_content->clone() : nullptr) 87 87 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr) 88 , m_boxShadow(o.m_boxShadow ? adoptPtr(new ShadowData(*o.m_boxShadow)) : nullptr) 89 , m_boxReflect(o.m_boxReflect) 90 , m_animations(o.m_animations ? adoptPtr(new AnimationList(*o.m_animations)) : nullptr) 91 , m_transitions(o.m_transitions ? adoptPtr(new AnimationList(*o.m_transitions)) : nullptr) 92 , m_mask(o.m_mask) 93 , m_maskBoxImage(o.m_maskBoxImage) 94 , m_perspective(o.m_perspective) 95 , m_perspectiveOriginX(o.m_perspectiveOriginX) 96 , m_perspectiveOriginY(o.m_perspectiveOriginY) 97 , m_pageSize(o.m_pageSize) 98 , m_wrapShape(o.m_wrapShape) 99 , m_flowThread(o.m_flowThread) 100 , m_regionThread(o.m_regionThread) 101 , m_regionIndex(o.m_regionIndex) 102 , m_regionOverflow(o.m_regionOverflow) 103 , m_regionBreakAfter(o.m_regionBreakAfter) 104 , m_regionBreakBefore(o.m_regionBreakBefore) 105 , m_regionBreakInside(o.m_regionBreakInside) 106 , m_pageSizeType(o.m_pageSizeType) 107 , m_transformStyle3D(o.m_transformStyle3D) 108 , m_backfaceVisibility(o.m_backfaceVisibility) 88 109 , userDrag(o.userDrag) 89 110 , textOverflow(o.textOverflow) … … 94 115 , m_borderFit(o.m_borderFit) 95 116 , m_textCombine(o.m_textCombine) 117 #if USE(ACCELERATED_COMPOSITING) 118 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) 119 #endif 96 120 , m_counterIncrement(o.m_counterIncrement) 97 121 , m_counterReset(o.m_counterReset) 98 #if USE(ACCELERATED_COMPOSITING)99 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)100 #endif101 , m_boxShadow(o.m_boxShadow ? adoptPtr(new ShadowData(*o.m_boxShadow)) : nullptr)102 , m_boxReflect(o.m_boxReflect)103 , m_animations(o.m_animations ? adoptPtr(new AnimationList(*o.m_animations)) : nullptr)104 , m_transitions(o.m_transitions ? adoptPtr(new AnimationList(*o.m_transitions)) : nullptr)105 , m_mask(o.m_mask)106 , m_maskBoxImage(o.m_maskBoxImage)107 , m_transformStyle3D(o.m_transformStyle3D)108 , m_backfaceVisibility(o.m_backfaceVisibility)109 , m_perspective(o.m_perspective)110 , m_perspectiveOriginX(o.m_perspectiveOriginX)111 , m_perspectiveOriginY(o.m_perspectiveOriginY)112 , m_pageSize(o.m_pageSize)113 , m_pageSizeType(o.m_pageSizeType)114 , m_flowThread(o.m_flowThread)115 , m_regionThread(o.m_regionThread)116 , m_regionIndex(o.m_regionIndex)117 , m_regionOverflow(o.m_regionOverflow)118 , m_wrapShape(o.m_wrapShape)119 , m_regionBreakAfter(o.m_regionBreakAfter)120 , m_regionBreakBefore(o.m_regionBreakBefore)121 , m_regionBreakInside(o.m_regionBreakInside)122 122 { 123 123 } -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
r96142 r96594 109 109 OwnPtr<CounterDirectiveMap> m_counterDirectives; 110 110 111 unsigned userDrag : 2; // EUserDrag112 unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."113 unsigned marginBeforeCollapse : 2; // EMarginCollapse114 unsigned marginAfterCollapse : 2; // EMarginCollapse115 unsigned matchNearestMailBlockquoteColor : 1; // EMatchNearestMailBlockquoteColor, FIXME: This property needs to be eliminated. It should never have been added.116 unsigned m_appearance : 6; // EAppearance117 unsigned m_borderFit : 1; // EBorderFit118 unsigned m_textCombine : 1; // CSS3 text-combine properties119 120 short m_counterIncrement;121 short m_counterReset;122 123 #if USE(ACCELERATED_COMPOSITING)124 bool m_runningAcceleratedAnimation : 1;125 #endif126 111 OwnPtr<ShadowData> m_boxShadow; // For box-shadow decorations. 127 112 … … 134 119 NinePieceImage m_maskBoxImage; 135 120 136 ETransformStyle3D m_transformStyle3D;137 EBackfaceVisibility m_backfaceVisibility;138 121 float m_perspective; 139 122 Length m_perspectiveOriginX; … … 141 124 142 125 LengthSize m_pageSize; 143 PageSizeType m_pageSizeType; 126 127 RefPtr<CSSWrapShape> m_wrapShape; 144 128 145 129 AtomicString m_flowThread; 146 130 AtomicString m_regionThread; 147 131 int m_regionIndex; 148 RegionOverflow m_regionOverflow; 149 150 RefPtr<CSSWrapShape> m_wrapShape; 132 RegionOverflow m_regionOverflow : 1; 151 133 152 134 unsigned m_regionBreakAfter : 2; // EPageBreak 153 135 unsigned m_regionBreakBefore : 2; // EPageBreak 154 136 unsigned m_regionBreakInside : 2; // EPageBreak 137 138 PageSizeType m_pageSizeType : 2; 139 ETransformStyle3D m_transformStyle3D : 1; 140 EBackfaceVisibility m_backfaceVisibility : 1; 141 142 unsigned userDrag : 2; // EUserDrag 143 unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..." 144 unsigned marginBeforeCollapse : 2; // EMarginCollapse 145 unsigned marginAfterCollapse : 2; // EMarginCollapse 146 unsigned matchNearestMailBlockquoteColor : 1; // EMatchNearestMailBlockquoteColor, FIXME: This property needs to be eliminated. It should never have been added. 147 unsigned m_appearance : 6; // EAppearance 148 unsigned m_borderFit : 1; // EBorderFit 149 unsigned m_textCombine : 1; // CSS3 text-combine properties 150 151 #if USE(ACCELERATED_COMPOSITING) 152 bool m_runningAcceleratedAnimation : 1; 153 #endif 154 155 short m_counterIncrement; 156 short m_counterReset; 155 157 156 158 private:
Note: See TracChangeset
for help on using the changeset viewer.