OLD | NEW |
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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
259 } | 259 } |
260 | 260 |
261 void FrameLoaderClientImpl::detachedFromParent() | 261 void FrameLoaderClientImpl::detachedFromParent() |
262 { | 262 { |
263 // Close down the proxy. The purpose of this change is to make the | 263 // Close down the proxy. The purpose of this change is to make the |
264 // call to ScriptController::clearWindowShell a no-op when called from | 264 // call to ScriptController::clearWindowShell a no-op when called from |
265 // Frame::pageDestroyed. Without this change, this call to clearWindowShell | 265 // Frame::pageDestroyed. Without this change, this call to clearWindowShell |
266 // will cause a crash. If you remove/modify this, just ensure that you can | 266 // will cause a crash. If you remove/modify this, just ensure that you can |
267 // go to a page and then navigate to a new page without getting any asserts | 267 // go to a page and then navigate to a new page without getting any asserts |
268 // or crashes. | 268 // or crashes. |
269 m_webFrame->frame()->script()->clearForClose(); | 269 m_webFrame->frame()->script().clearForClose(); |
270 | 270 |
271 // Alert the client that the frame is being detached. This is the last | 271 // Alert the client that the frame is being detached. This is the last |
272 // chance we have to communicate with the client. | 272 // chance we have to communicate with the client. |
273 if (m_webFrame->client()) | 273 if (m_webFrame->client()) |
274 m_webFrame->client()->frameDetached(m_webFrame); | 274 m_webFrame->client()->frameDetached(m_webFrame); |
275 | 275 |
276 // Stop communicating with the WebFrameClient at this point since we are no | 276 // Stop communicating with the WebFrameClient at this point since we are no |
277 // longer associated with the Page. | 277 // longer associated with the Page. |
278 m_webFrame->setClient(0); | 278 m_webFrame->setClient(0); |
279 } | 279 } |
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
767 return adoptPtr(m_webFrame->client()->createServiceWorkerProvider(m_webFrame
, client.leakPtr())); | 767 return adoptPtr(m_webFrame->client()->createServiceWorkerProvider(m_webFrame
, client.leakPtr())); |
768 } | 768 } |
769 | 769 |
770 void FrameLoaderClientImpl::didStopAllLoaders() | 770 void FrameLoaderClientImpl::didStopAllLoaders() |
771 { | 771 { |
772 if (m_webFrame->client()) | 772 if (m_webFrame->client()) |
773 m_webFrame->client()->didAbortLoading(m_webFrame); | 773 m_webFrame->client()->didAbortLoading(m_webFrame); |
774 } | 774 } |
775 | 775 |
776 } // namespace WebKit | 776 } // namespace WebKit |
OLD | NEW |