Changeset 138974 in webkit
- Timestamp:
- Jan 7, 2013 11:52:02 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r138972 r138974 1 2013-01-07 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r137632. 4 http://trac.webkit.org/changeset/137632 5 https://bugs.webkit.org/show_bug.cgi?id=106237 6 7 Caused major security regressions on ClusterFuzz (Requested by 8 inferno-sec on #webkit). 9 10 * mathml/mo-stretch-crash-expected.txt: Removed. 11 * mathml/mo-stretch-crash.html: Removed. 12 1 13 2013-01-07 Dimitri Glazkov <dglazkov@chromium.org> 2 14 -
trunk/Source/WebCore/ChangeLog
r138966 r138974 1 2013-01-07 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r137632. 4 http://trac.webkit.org/changeset/137632 5 https://bugs.webkit.org/show_bug.cgi?id=106237 6 7 Caused major security regressions on ClusterFuzz (Requested by 8 inferno-sec on #webkit). 9 10 * rendering/RenderBlock.cpp: 11 (WebCore::RenderBlock::startDelayUpdateScrollInfo): 12 (WebCore::RenderBlock::finishDelayUpdateScrollInfo): 13 1 14 2013-01-07 Victor Carbune <victor@rosedu.org> 2 15 -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r138899 r138974 1287 1287 void RenderBlock::startDelayUpdateScrollInfo() 1288 1288 { 1289 if ( !gDelayedUpdateScrollInfoSet) {1290 ASSERT(!gDelay UpdateScrollInfo);1289 if (gDelayUpdateScrollInfo == 0) { 1290 ASSERT(!gDelayedUpdateScrollInfoSet); 1291 1291 gDelayedUpdateScrollInfoSet = new DelayedUpdateScrollInfoSet; 1292 1292 } … … 1302 1302 ASSERT(gDelayedUpdateScrollInfoSet); 1303 1303 1304 Vector<RenderBlock*> infoSet; 1305 while (gDelayedUpdateScrollInfoSet && gDelayedUpdateScrollInfoSet->size()) { 1306 copyToVector(*gDelayedUpdateScrollInfoSet, infoSet); 1307 for (Vector<RenderBlock*>::iterator it = infoSet.begin(); it != infoSet.end(); ++it) { 1308 RenderBlock* block = *it; 1309 // |block| may have been destroyed at this point, but then it will have been removed from gDelayedUpdateScrollInfoSet. 1310 if (gDelayedUpdateScrollInfoSet && gDelayedUpdateScrollInfoSet->contains(block)) { 1311 gDelayedUpdateScrollInfoSet->remove(block); 1312 if (block->hasOverflowClip()) 1313 block->layer()->updateScrollInfoAfterLayout(); 1314 } 1304 OwnPtr<DelayedUpdateScrollInfoSet> infoSet(adoptPtr(gDelayedUpdateScrollInfoSet)); 1305 gDelayedUpdateScrollInfoSet = 0; 1306 1307 for (DelayedUpdateScrollInfoSet::iterator it = infoSet->begin(); it != infoSet->end(); ++it) { 1308 RenderBlock* block = *it; 1309 if (block->hasOverflowClip()) { 1310 block->layer()->updateScrollInfoAfterLayout(); 1315 1311 } 1316 1312 } 1317 delete gDelayedUpdateScrollInfoSet;1318 gDelayedUpdateScrollInfoSet = 0;1319 ASSERT(!gDelayUpdateScrollInfo);1320 1313 } 1321 1314 }
Note: See TracChangeset
for help on using the changeset viewer.