Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: Source/WebCore/loader/SubframeLoader.cpp

Issue 9371034: Merge 106818 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/frames/subframe-load-crash-main-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/SubframeLoader.cpp
===================================================================
--- Source/WebCore/loader/SubframeLoader.cpp (revision 107315)
+++ Source/WebCore/loader/SubframeLoader.cpp (working copy)
@@ -244,6 +244,8 @@
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;
« no previous file with comments | « LayoutTests/fast/frames/subframe-load-crash-main-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698