| 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 r
ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
| 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 if (ownerLayoutObject()) { | 178 if (ownerLayoutObject()) { |
| 179 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); | 179 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); |
| 180 ASSERT(owner); | 180 ASSERT(owner); |
| 181 // FIXME: OOPI might lead to us temporarily lying to a frame and telling
it | 181 // FIXME: OOPI might lead to us temporarily lying to a frame and telling
it |
| 182 // that it's owned by a FrameOwner that knows nothing about it. If we're | 182 // that it's owned by a FrameOwner that knows nothing about it. If we're |
| 183 // lying to this frame, don't let it clobber the existing widget. | 183 // lying to this frame, don't let it clobber the existing widget. |
| 184 if (owner->contentFrame() == this) | 184 if (owner->contentFrame() == this) |
| 185 owner->setWidget(frameView); | 185 owner->setWidget(frameView); |
| 186 } | 186 } |
| 187 | 187 |
| 188 if (HTMLFrameOwnerElement* owner = deprecatedLocalOwner()) | 188 if (owner()) |
| 189 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf
f); | 189 view()->setCanHaveScrollbars(owner()->scrollingMode() != ScrollbarAlways
Off); |
| 190 } | 190 } |
| 191 | 191 |
| 192 LocalFrame::~LocalFrame() | 192 LocalFrame::~LocalFrame() |
| 193 { | 193 { |
| 194 // Verify that the FrameView has been cleared as part of detaching | 194 // Verify that the FrameView has been cleared as part of detaching |
| 195 // the frame owner. | 195 // the frame owner. |
| 196 ASSERT(!m_view); | 196 ASSERT(!m_view); |
| 197 #if !ENABLE(OILPAN) | 197 #if !ENABLE(OILPAN) |
| 198 // Oilpan: see setDOMWindow() comment why it is acceptable not to | 198 // Oilpan: see setDOMWindow() comment why it is acceptable not to |
| 199 // explicitly call setDOMWindow() here. | 199 // explicitly call setDOMWindow() here. |
| (...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 854 { | 854 { |
| 855 if (isLocalRoot()) | 855 if (isLocalRoot()) |
| 856 m_instrumentingAgents = InstrumentingAgents::create(); | 856 m_instrumentingAgents = InstrumentingAgents::create(); |
| 857 else | 857 else |
| 858 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 858 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 859 } | 859 } |
| 860 | 860 |
| 861 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); | 861 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); |
| 862 | 862 |
| 863 } // namespace blink | 863 } // namespace blink |
| OLD | NEW |