Merge 98935

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 107 matching lines @@
     }
     document->setFullScreenRenderer(fullscreenRenderer);
     if (fullscreenRenderer->placeholder())
         return fullscreenRenderer->placeholder();
     return fullscreenRenderer;
 }
 
 void RenderFullScreen::unwrapRenderer()
 {
     RenderObject* holder = placeholder() ? placeholder() : this;
-    RenderObject* parent = holder->parent();
-    if (parent) {
-        RenderObject* child = firstChild();
-        while (child) {
-            RenderObject* nextChild = child->nextSibling();
+    if (holder->parent()) {
+        RenderObject* child;
+        while ((child = firstChild())) {
             child->remove();
-            parent->addChild(child, holder);
-            child = nextChild;
+            holder->parent()->addChild(child, holder);
         }
     }
     remove();
     document()->setFullScreenRenderer(0);
 }
 
 void RenderFullScreen::setPlaceholder(RenderBlock* placeholder)
 {
     m_placeholder = placeholder;
 }
@@ skipping 11 matching lines @@
         if (parent()) {
             parent()->addChild(m_placeholder, this);
             remove();
         }
         m_placeholder->addChild(this);
     } else
         m_placeholder->setStyle(style);
 }
 
 #endif