Changeset 109369 in webkit

Timestamp:

Mar 1, 2012, 10:57:14 AM (15 years ago)

Author:

tsepez@chromium.org

Message:

Move m_frame protector from FrameLoader::changeLocation to FrameLoader::urlSelected
​https://bugs.webkit.org/show_bug.cgi?id=79882

Reviewed by Adam Barth.

Source/WebCore:

Test: fast/frames/url-selected-crash.html

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::changeLocation):
(WebCore::FrameLoader::urlSelected):

LayoutTests:

• fast/frames/url-selected-crash-expected.txt: Added.
• fast/frames/url-selected-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/url-selected-crash-expected.txt (added)
• LayoutTests/fast/frames/url-selected-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-01  Tom Sepez  <tsepez@chromium.org>
+
+        Move m_frame protector from FrameLoader::changeLocation to FrameLoader::urlSelected
+        https://bugs.webkit.org/show_bug.cgi?id=79882
+
+        Reviewed by Adam Barth.
+
+        * fast/frames/url-selected-crash-expected.txt: Added.
+        * fast/frames/url-selected-crash.html: Added.
+
 2012-03-01  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Tom Sepez  <tsepez@chromium.org>
+
+        Move m_frame protector from FrameLoader::changeLocation to FrameLoader::urlSelected
+        https://bugs.webkit.org/show_bug.cgi?id=79882
+
+        Reviewed by Adam Barth.
+
+        Test: fast/frames/url-selected-crash.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::changeLocation):
+        (WebCore::FrameLoader::urlSelected):
+
 2012-03-01  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -252 +252 @@
 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);
@@ -269 +268 @@
     ASSERT(!m_suppressOpenerInNewFrame);
 
+    RefPtr<Frame> protect(m_frame);
     FrameLoadRequest frameRequest(passedRequest);