| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 9 * rights reserved. | 9 * rights reserved. |
| 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 FrameHost* host, | 263 FrameHost* host, |
| 264 FrameOwner* owner, | 264 FrameOwner* owner, |
| 265 InterfaceProvider* interfaceProvider, | 265 InterfaceProvider* interfaceProvider, |
| 266 InterfaceRegistry* interfaceRegistry) { | 266 InterfaceRegistry* interfaceRegistry) { |
| 267 LocalFrame* frame = new LocalFrame( | 267 LocalFrame* frame = new LocalFrame( |
| 268 client, host, owner, | 268 client, host, owner, |
| 269 interfaceProvider ? interfaceProvider | 269 interfaceProvider ? interfaceProvider |
| 270 : InterfaceProvider::getEmptyInterfaceProvider(), | 270 : InterfaceProvider::getEmptyInterfaceProvider(), |
| 271 interfaceRegistry ? interfaceRegistry | 271 interfaceRegistry ? interfaceRegistry |
| 272 : InterfaceRegistry::getEmptyInterfaceRegistry()); | 272 : InterfaceRegistry::getEmptyInterfaceRegistry()); |
| 273 InspectorInstrumentation::frameAttachedToParent(frame); | 273 probe::frameAttachedToParent(frame); |
| 274 return frame; | 274 return frame; |
| 275 } | 275 } |
| 276 | 276 |
| 277 void LocalFrame::setView(FrameView* view) { | 277 void LocalFrame::setView(FrameView* view) { |
| 278 ASSERT(!m_view || m_view != view); | 278 ASSERT(!m_view || m_view != view); |
| 279 ASSERT(!document() || !document()->isActive()); | 279 ASSERT(!document() || !document()->isActive()); |
| 280 | 280 |
| 281 eventHandler().clear(); | 281 eventHandler().clear(); |
| 282 | 282 |
| 283 m_view = view; | 283 m_view = view; |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 446 | 446 |
| 447 // TODO: Page should take care of updating focus/scrolling instead of Frame. | 447 // TODO: Page should take care of updating focus/scrolling instead of Frame. |
| 448 // TODO: It's unclear as to why this is called more than once, but it is, | 448 // TODO: It's unclear as to why this is called more than once, but it is, |
| 449 // so page() could be null. | 449 // so page() could be null. |
| 450 if (page() && page()->focusController().focusedFrame() == this) | 450 if (page() && page()->focusController().focusedFrame() == this) |
| 451 page()->focusController().setFocusedFrame(nullptr); | 451 page()->focusController().setFocusedFrame(nullptr); |
| 452 | 452 |
| 453 if (page() && page()->scrollingCoordinator() && m_view) | 453 if (page() && page()->scrollingCoordinator() && m_view) |
| 454 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); | 454 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); |
| 455 | 455 |
| 456 InspectorInstrumentation::frameDetachedFromParent(this); | 456 probe::frameDetachedFromParent(this); |
| 457 Frame::detach(type); | 457 Frame::detach(type); |
| 458 | 458 |
| 459 m_supplements.clear(); | 459 m_supplements.clear(); |
| 460 m_frameScheduler.reset(); | 460 m_frameScheduler.reset(); |
| 461 WeakIdentifierMap<LocalFrame>::notifyObjectDestroyed(this); | 461 WeakIdentifierMap<LocalFrame>::notifyObjectDestroyed(this); |
| 462 } | 462 } |
| 463 | 463 |
| 464 bool LocalFrame::prepareForCommit() { | 464 bool LocalFrame::prepareForCommit() { |
| 465 return loader().prepareForCommit(); | 465 return loader().prepareForCommit(); |
| 466 } | 466 } |
| (...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 916 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 916 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 917 m_frame->client()->frameBlameContext()->Enter(); | 917 m_frame->client()->frameBlameContext()->Enter(); |
| 918 } | 918 } |
| 919 | 919 |
| 920 ScopedFrameBlamer::~ScopedFrameBlamer() { | 920 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 921 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 921 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 922 m_frame->client()->frameBlameContext()->Leave(); | 922 m_frame->client()->frameBlameContext()->Leave(); |
| 923 } | 923 } |
| 924 | 924 |
| 925 } // namespace blink | 925 } // namespace blink |
| OLD | NEW |