Bug 689501 - Remove invalid assertion with 3d transforms. r=roc
authorMatt Woodrow <mwoodrow@mozilla.com>
Fri, 30 Sep 2011 14:07:04 +1300
changeset 77897 06a077444292
parent 77896 9ef649a80d93
child 77898 a08928f32bce
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersroc
bugs689501
milestone10.0a1
Bug 689501 - Remove invalid assertion with 3d transforms. r=roc
layout/generic/nsFrame.cpp
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1523,19 +1523,16 @@ WrapPreserve3DList(nsIFrame *aFrame, nsD
   nsresult rv = NS_OK;
   nsDisplayList newList;
   while (nsDisplayItem *item = aList->RemoveBottom()) {
     nsIFrame *childFrame = item->GetUnderlyingFrame();
     NS_ASSERTION(childFrame, "All display items to be wrapped must have a frame!");
     if (childFrame->GetParent()->Preserves3DChildren()) {
       switch (item->GetType()) {
         case nsDisplayItem::TYPE_TRANSFORM: {
-          // The child transform frame should always preserve 3d. In the cases where preserve-3d is disabled
-          // such as clipping, this would be wrapped in a clip display object, and we wouldn't reach this point.
-          NS_ASSERTION(childFrame->Preserves3D(), "Child transform frame must preserve 3d!");
           break;
         }
         case nsDisplayItem::TYPE_WRAP_LIST: {
           nsDisplayWrapList *list = static_cast<nsDisplayWrapList*>(item);
           rv = WrapPreserve3DList(aFrame, aBuilder, list->GetList());
           break;
         }
         case nsDisplayItem::TYPE_OPACITY: {