Merge 67659

WebCore/html/HTMLFrameOwnerElement.cpp

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 34 matching lines @@
     // HTMLObjectElement and HTMLEmbedElement may return arbitrary renderers
     // when using fallback content.
     if (!renderer() || !renderer()->isRenderPart())
         return 0;
     return toRenderPart(renderer());
 }
 
 void HTMLFrameOwnerElement::willRemove()
 {
     if (Frame* frame = contentFrame()) {
+        RefPtr<Frame> protect(frame);
+        frame->loader()->frameDetached();
         frame->disconnectOwnerElement();
-        frame->loader()->frameDetached();
     }
 
     HTMLElement::willRemove();
 }
 
 HTMLFrameOwnerElement::~HTMLFrameOwnerElement()
 {
     if (m_contentFrame)
         m_contentFrame->disconnectOwnerElement();
 }
@@ skipping 25 matching lines @@
     Document* doc = contentDocument();
     if (doc && doc->isSVGDocument())
         return static_cast<SVGDocument*>(doc);
     // Spec: http://www.w3.org/TR/SVG/struct.html#InterfaceGetSVGDocument
     ec = NOT_SUPPORTED_ERR;
     return 0;
 }
 #endif
 
 } // namespace WebCore