Title: [126661] branches/chromium/1229/Source/WebCore/rendering/RenderBlock.cpp
- Revision
- 126661
- Author
- [email protected]
- Date
- 2012-08-24 17:32:10 -0700 (Fri, 24 Aug 2012)
Log Message
Merge 125353
BUG=134324
Review URL: https://chromiumcodereview.appspot.com/10868091
Modified Paths
Diff
Modified: branches/chromium/1229/Source/WebCore/rendering/RenderBlock.cpp (126660 => 126661)
--- branches/chromium/1229/Source/WebCore/rendering/RenderBlock.cpp 2012-08-25 00:31:30 UTC (rev 126660)
+++ branches/chromium/1229/Source/WebCore/rendering/RenderBlock.cpp 2012-08-25 00:32:10 UTC (rev 126661)
@@ -3631,7 +3631,12 @@
HashSet<RenderBlock*>::iterator end = containerSet->end();
for (HashSet<RenderBlock*>::iterator it = containerSet->begin(); it != end; ++it) {
RenderBlock* container = *it;
- ASSERT(descendant->isDescendantOf(container));
+
+ // FIXME: Disabling this assert temporarily until we fix the layout
+ // bugs associated with positioned objects not properly cleared from
+ // their ancestor chain before being moved. See webkit bug 93766.
+ // ASSERT(descendant->isDescendantOf(container));
+
TrackedRendererListHashSet* descendantSet = descendantsMap->get(container);
ASSERT(descendantSet);
if (!descendantSet)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
