Changeset 109443 in webkit

Timestamp:

Mar 1, 2012, 3:17:52 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 109369
BUG=116224
Review URL: ​https://chromiumcodereview.appspot.com/9570045

Location:

branches/chromium/963

Files:

• LayoutTests/fast/frames/url-selected-crash-expected.txt (copied) (copied from trunk/LayoutTests/fast/frames/url-selected-crash-expected.txt )
• LayoutTests/fast/frames/url-selected-crash.html (copied) (copied from trunk/LayoutTests/fast/frames/url-selected-crash.html )
• Source/WebCore/loader/FrameLoader.cpp (modified) (2 diffs)

branches/chromium/963/Source/WebCore/loader/FrameLoader.cpp

@@ -253 +253 @@
 void FrameLoader::changeLocation(SecurityOrigin* securityOrigin, const KURL& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool refresh)
 {
-    RefPtr<Frame> protect(m_frame);
     urlSelected(FrameLoadRequest(securityOrigin, ResourceRequest(url, referrer, refresh ? ReloadIgnoringCacheData : UseProtocolCachePolicy), "_self"),
         0, lockHistory, lockBackForwardList, MaybeSendReferrer, ReplaceDocumentIfJavaScriptURL);
@@ -270 +269 @@
     ASSERT(!m_suppressOpenerInNewFrame);
 
+    RefPtr<Frame> protect(m_frame);
     FrameLoadRequest frameRequest(passedRequest);