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

Side by Side Diff: Source/web/FrameLoaderClientImpl.cpp

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Back out non-Oilpan experiment + tidy up by adding frame() ref accessors Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 288
289 Frame* FrameLoaderClientImpl::lastChild() const 289 Frame* FrameLoaderClientImpl::lastChild() const
290 { 290 {
291 return toCoreFrame(m_webFrame->lastChild()); 291 return toCoreFrame(m_webFrame->lastChild());
292 } 292 }
293 293
294 void FrameLoaderClientImpl::detachedFromParent() 294 void FrameLoaderClientImpl::detachedFromParent()
295 { 295 {
296 // Alert the client that the frame is being detached. This is the last 296 // Alert the client that the frame is being detached. This is the last
297 // chance we have to communicate with the client. 297 // chance we have to communicate with the client.
298 RefPtr<WebLocalFrameImpl> protector(m_webFrame); 298 RefPtrWillBeRawPtr<WebLocalFrameImpl> protector(m_webFrame);
299 299
300 WebFrameClient* client = m_webFrame->client(); 300 WebFrameClient* client = m_webFrame->client();
301 if (!client) 301 if (!client)
302 return; 302 return;
303 303
304 m_webFrame->willDetachParent(); 304 m_webFrame->willDetachParent();
305 305
306 // Signal that no further communication with WebFrameClient should take 306 // Signal that no further communication with WebFrameClient should take
307 // place at this point since we are no longer associated with the Page. 307 // place at this point since we are no longer associated with the Page.
308 m_webFrame->setClient(0); 308 m_webFrame->setClient(0);
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 return String(); 611 return String();
612 } 612 }
613 613
614 // Called when the FrameLoader goes into a state in which a new page load 614 // Called when the FrameLoader goes into a state in which a new page load
615 // will occur. 615 // will occur.
616 void FrameLoaderClientImpl::transitionToCommittedForNewPage() 616 void FrameLoaderClientImpl::transitionToCommittedForNewPage()
617 { 617 {
618 m_webFrame->createFrameView(); 618 m_webFrame->createFrameView();
619 } 619 }
620 620
621 PassRefPtr<LocalFrame> FrameLoaderClientImpl::createFrame( 621 PassRefPtrWillBeRawPtr<LocalFrame> FrameLoaderClientImpl::createFrame(
622 const KURL& url, 622 const KURL& url,
623 const AtomicString& name, 623 const AtomicString& name,
624 const Referrer& referrer, 624 const Referrer& referrer,
625 HTMLFrameOwnerElement* ownerElement) 625 HTMLFrameOwnerElement* ownerElement)
626 { 626 {
627 FrameLoadRequest frameRequest(m_webFrame->frame()->document(), 627 FrameLoadRequest frameRequest(m_webFrame->frame()->document(),
628 ResourceRequest(url, referrer), name); 628 ResourceRequest(url, referrer), name);
629 return m_webFrame->createChildFrame(frameRequest, ownerElement); 629 return m_webFrame->createChildFrame(frameRequest, ownerElement);
630 } 630 }
631 631
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 m_webFrame->client()->didAbortLoading(m_webFrame); 828 m_webFrame->client()->didAbortLoading(m_webFrame);
829 } 829 }
830 830
831 void FrameLoaderClientImpl::dispatchDidChangeManifest() 831 void FrameLoaderClientImpl::dispatchDidChangeManifest()
832 { 832 {
833 if (m_webFrame->client()) 833 if (m_webFrame->client())
834 m_webFrame->client()->didChangeManifest(m_webFrame); 834 m_webFrame->client()->didChangeManifest(m_webFrame);
835 } 835 }
836 836
837 } // namespace blink 837 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698