Changeset 47126 in webkit
- Timestamp:
- Aug 12, 2009 11:23:00 AM (15 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r47118 r47126 1 2009-08-12 Peter Kasting <pkasting@google.com> 2 3 Reviewed by Dave Levin. 4 5 https://bugs.webkit.org/show_bug.cgi?id=27933 6 Build fix after r47099. 7 8 * platform/graphics/skia/ImageBufferSkia.cpp: 9 (WebCore::getImageData): 10 (WebCore::putImageData): 11 1 12 2009-08-08 Yong Li <yong.li@torchmobile.com> 2 13 -
trunk/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
r47099 r47126 123 123 const IntSize& size) 124 124 { 125 ASSERT(context());126 127 125 RefPtr<ImageData> result = ImageData::create(rect.width(), rect.height()); 128 126 unsigned char* data = result->data()->data()->data(); 129 127 130 128 if (rect.x() < 0 || rect.y() < 0 || 131 (rect.x() + rect.width()) > m_size.width() ||132 (rect.y() + rect.height()) > m_size.height())129 (rect.x() + rect.width()) > size.width() || 130 (rect.y() + rect.height()) > size.height()) 133 131 memset(data, 0, result->data()->length()); 134 132 … … 140 138 } 141 139 int endX = rect.x() + rect.width(); 142 if (endX > m_size.width())143 endX = m_size.width();140 if (endX > size.width()) 141 endX = size.width(); 144 142 int numColumns = endX - originX; 145 143 … … 151 149 } 152 150 int endY = rect.y() + rect.height(); 153 if (endY > m_size.height())154 endY = m_size.height();151 if (endY > size.height()) 152 endY = size.height(); 155 153 int numRows = endY - originY; 156 154 … … 198 196 int destX = destPoint.x() + sourceRect.x(); 199 197 ASSERT(destX >= 0); 200 ASSERT(destX < m_size.width());198 ASSERT(destX < size.width()); 201 199 ASSERT(originX >= 0); 202 200 ASSERT(originX < sourceRect.right()); 203 201 204 202 int endX = destPoint.x() + sourceRect.right(); 205 ASSERT(endX <= m_size.width());203 ASSERT(endX <= size.width()); 206 204 207 205 int numColumns = endX - destX; … … 210 208 int destY = destPoint.y() + sourceRect.y(); 211 209 ASSERT(destY >= 0); 212 ASSERT(destY < m_size.height());210 ASSERT(destY < size.height()); 213 211 ASSERT(originY >= 0); 214 212 ASSERT(originY < sourceRect.bottom()); 215 213 216 214 int endY = destPoint.y() + sourceRect.bottom(); 217 ASSERT(endY <= m_size.height());215 ASSERT(endY <= size.height()); 218 216 int numRows = endY - destY; 219 217
Note: See TracChangeset
for help on using the changeset viewer.