Changeset 147597 in webkit
- Timestamp:
- Apr 3, 2013 5:05:54 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r147594 r147597 1 2013-04-03 Hans Muller <hmuller@adobe.com> 2 3 [CSS Exclusions] Removed ExclusionShape dead code 4 https://bugs.webkit.org/show_bug.cgi?id=113904 5 6 Reviewed by Dirk Schulze. 7 8 No new tests, just removing dead code. 9 10 * rendering/ExclusionShape.cpp: 11 (WebCore::ExclusionShape::createExclusionShape): 12 * rendering/ExclusionShape.h: 13 (ExclusionShape): 14 1 15 2013-04-03 Otto Derek Cheung <otcheung@rim.com> 2 16 -
trunk/Source/WebCore/rendering/ExclusionShape.cpp
r146938 r147597 117 117 118 118 exclusionShape = createExclusionRectangle(logicalBounds, physicalSizeToLogical(cornerRadii, writingMode)); 119 exclusionShape->m_boundingBox = logicalBounds;120 119 break; 121 120 } … … 129 128 130 129 exclusionShape = createExclusionCircle(logicalCenter, radius); 131 exclusionShape->m_boundingBox = FloatRect(logicalCenter.x() - radius, logicalCenter.y() - radius, radius * 2, radius * 2);132 130 break; 133 131 } … … 143 141 144 142 exclusionShape = createExclusionEllipse(logicalCenter, logicalRadii); 145 exclusionShape->m_boundingBox = FloatRect(logicalCenter - logicalRadii, logicalRadii + logicalRadii);146 143 break; 147 144 } … … 152 149 size_t valuesSize = values.size(); 153 150 ASSERT(!(valuesSize % 2)); 154 FloatRect boundingBox;155 151 Vector<FloatPoint>* vertices = new Vector<FloatPoint>(valuesSize / 2); 156 152 for (unsigned i = 0; i < valuesSize; i += 2) { … … 159 155 floatValueForLength(values.at(i + 1), boxHeight)); 160 156 (*vertices)[i / 2] = physicalPointToLogical(vertex, logicalBoxHeight, writingMode); 161 if (!i)162 boundingBox.setLocation(vertex);163 else164 boundingBox.extend(vertex);165 157 } 158 166 159 exclusionShape = createExclusionPolygon(adoptPtr(vertices), polygon->windRule()); 167 exclusionShape->m_boundingBox = boundingBox;168 160 break; 169 161 } -
trunk/Source/WebCore/rendering/ExclusionShape.h
r147384 r147597 77 77 float m_logicalBoxWidth; 78 78 float m_logicalBoxHeight; 79 FloatRect m_boundingBox;80 79 float m_margin; 81 80 float m_padding;
Note: See TracChangeset
for help on using the changeset viewer.