Merge 125353

Source/WebCore/rendering/RenderBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 3613 matching lines @@
     if (!descendantsMap)
         return;
     
     HashSet<RenderBlock*>* containerSet = containerMap->take(descendant);
     if (!containerSet)
         return;
     
     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)
             continue;
         ASSERT(descendantSet->contains(descendant));
         descendantSet->remove(descendant);
         if (descendantSet->isEmpty()) {
             descendantsMap->remove(container);
             delete descendantSet;
         }
@@ skipping 3828 matching lines @@
 }
 
 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::FloatingObject* floatingObject)
 {
     return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->frameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floatingObject->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnappedMaxY());
 }
 
 #endif
 
 } // namespace WebCore