Merge 106818

Source/WebCore/loader/SubframeLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 226 matching lines @@
     Frame* frame = ownerElement->contentFrame();
     if (frame)
         frame->navigationScheduler()->scheduleLocationChange(m_frame->document()->securityOrigin(), url.string(), m_frame->loader()->outgoingReferrer(), lockHistory, lockBackForwardList);
     else
         frame = loadSubframe(ownerElement, url, frameName, m_frame->loader()->outgoingReferrer());
     return frame;
 }
 
 Frame* SubframeLoader::loadSubframe(HTMLFrameOwnerElement* ownerElement, const KURL& url, const String& name, const String& referrer)
 {
+    RefPtr<Frame> protect(m_frame);
+
     bool allowsScrolling = true;
     int marginWidth = -1;
     int marginHeight = -1;
     if (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag)) {
         HTMLFrameElementBase* o = static_cast<HTMLFrameElementBase*>(ownerElement);
         allowsScrolling = o->scrollingMode() != ScrollbarAlwaysOff;
         marginWidth = o->marginWidth();
         marginHeight = o->marginHeight();
     }
 
@@ skipping 120 matching lines @@
     return true;
 }
 
 KURL SubframeLoader::completeURL(const String& url) const
 {
     ASSERT(m_frame->document());
     return m_frame->document()->completeURL(url);
 }
 
 } // namespace WebCore