Merge 97088 - Exiting fullscreen shouldn't crash if the element that was fullscreened had associa...

Source/WebCore/rendering/RenderFullScreen.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 106 matching lines @@
         fullscreenRenderer->addChild(object);
     }
     document->setFullScreenRenderer(fullscreenRenderer);
     if (fullscreenRenderer->placeholder())
         return fullscreenRenderer->placeholder();
     return fullscreenRenderer;
 }
 
 void RenderFullScreen::unwrapRenderer()
 {
-    RenderObject* wrappedRenderer = firstChild();
-    if (wrappedRenderer) {
-        wrappedRenderer->remove();
-        RenderObject* holder = placeholder() ? placeholder() : this;
-        RenderObject* parent = holder->parent();
-        if (parent)
-            parent->addChild(wrappedRenderer, holder);
+    RenderObject* holder = placeholder() ? placeholder() : this;
+    RenderObject* parent = holder->parent();
+    if (parent) {
+        RenderObject* child = firstChild();
+        while (child) {
+            RenderObject* nextChild = child->nextSibling();
+            child->remove();
+            parent->addChild(child, holder);
+            child = nextChild;
+        }
     }
     remove();
     document()->setFullScreenRenderer(0);
 }
 
 void RenderFullScreen::setPlaceholder(RenderBlock* placeholder)
 {
     m_placeholder = placeholder;
 }
 
@@ skipping 10 matching lines @@
         if (parent()) {
             parent()->addChild(m_placeholder, this);
             remove();
         }
         m_placeholder->addChild(this);
     } else
         m_placeholder->setStyle(style);
 }
 
 #endif