Changeset 147477 in webkit
- Timestamp:
- Apr 2, 2013 11:36:40 AM (11 years ago)
- Location:
- trunk/Source/Platform
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/Platform/ChangeLog
r147163 r147477 1 2013-04-02 Dana Jansens <danakj@chromium.org> 2 3 [chromium] Initialize all fields in WebFilterOperation 4 https://bugs.webkit.org/show_bug.cgi?id=113807 5 6 Reviewed by James Robinson. 7 8 * chromium/public/WebFilterOperation.h: 9 (WebKit::WebFilterOperation::WebFilterOperation): 10 * chromium/src/WebFilterOperation.cpp: 11 (WebKit::WebFilterOperation::WebFilterOperation): 12 1 13 2013-03-28 Tien-Ren Chen <trchen@chromium.org> 2 14 -
trunk/Source/Platform/chromium/public/WebFilterOperation.h
r146013 r147477 159 159 160 160 WebFilterOperation(FilterType type, float amount) 161 { 162 WEBKIT_ASSERT(type != FilterTypeDropShadow && type != FilterTypeColorMatrix); 163 m_type = type; 164 m_amount = amount; 165 m_dropShadowColor = 0; 161 : m_type(type) 162 , m_amount(amount) 163 , m_dropShadowOffset(0, 0) 164 , m_dropShadowColor(0) 165 , m_zoomInset(0) 166 { 167 WEBKIT_ASSERT(m_type != FilterTypeDropShadow && m_type != FilterTypeColorMatrix); 168 memset(m_matrix, 0, sizeof(m_matrix)); 166 169 } 167 170 168 171 WebFilterOperation(FilterType type, WebPoint offset, float stdDeviation, WebColor color) 169 { 170 WEBKIT_ASSERT(type == FilterTypeDropShadow); 171 m_type = type; 172 m_amount = stdDeviation; 173 m_dropShadowOffset = offset; 174 m_dropShadowColor = color; 172 : m_type(type) 173 , m_amount(stdDeviation) 174 , m_dropShadowOffset(offset) 175 , m_dropShadowColor(color) 176 , m_zoomInset(0) 177 { 178 WEBKIT_ASSERT(m_type == FilterTypeDropShadow); 179 memset(m_matrix, 0, sizeof(m_matrix)); 175 180 } 176 181 … … 178 183 179 184 WebFilterOperation(FilterType type, float amount, int inset) 180 { 181 WEBKIT_ASSERT(type == FilterTypeZoom); 182 m_type = type; 183 m_amount = amount; 184 m_zoomInset = inset; 185 : m_type(type) 186 , m_amount(amount) 187 , m_dropShadowOffset(0, 0) 188 , m_dropShadowColor(0) 189 , m_zoomInset(inset) 190 { 191 WEBKIT_ASSERT(m_type == FilterTypeZoom); 192 memset(m_matrix, 0, sizeof(m_matrix)); 185 193 } 186 194 }; -
trunk/Source/Platform/chromium/src/WebFilterOperation.cpp
r124392 r147477 46 46 47 47 WebFilterOperation::WebFilterOperation(FilterType type, SkScalar matrix[20]) 48 : m_type(type) 49 , m_amount(0) 50 , m_dropShadowOffset(0, 0) 51 , m_dropShadowColor(0) 52 , m_zoomInset(0) 48 53 { 49 WEBKIT_ASSERT(type == FilterTypeColorMatrix); 50 m_type = type; 54 WEBKIT_ASSERT(m_type == FilterTypeColorMatrix); 51 55 memcpy(m_matrix, matrix, sizeof(m_matrix)); 52 56 }
Note: See TracChangeset
for help on using the changeset viewer.