| 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 return tree().parent()->isRemoteFrame(); | 143 return tree().parent()->isRemoteFrame(); |
| 144 } | 144 } |
| 145 | 145 |
| 146 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const | 146 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const |
| 147 { | 147 { |
| 148 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : nu
llptr; | 148 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : nu
llptr; |
| 149 } | 149 } |
| 150 | 150 |
| 151 static ChromeClient& emptyChromeClient() | 151 static ChromeClient& emptyChromeClient() |
| 152 { | 152 { |
| 153 DEFINE_STATIC_LOCAL(EmptyChromeClient, client, ()); | 153 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<EmptyChromeClient>, client, (Empt
yChromeClient::create())); |
| 154 return client; | 154 return *client; |
| 155 } | 155 } |
| 156 | 156 |
| 157 ChromeClient& Frame::chromeClient() const | 157 ChromeClient& Frame::chromeClient() const |
| 158 { | 158 { |
| 159 if (Page* page = this->page()) | 159 if (Page* page = this->page()) |
| 160 return page->chromeClient(); | 160 return page->chromeClient(); |
| 161 return emptyChromeClient(); | 161 return emptyChromeClient(); |
| 162 } | 162 } |
| 163 | 163 |
| 164 void Frame::finishSwapFrom(Frame* old) | 164 void Frame::finishSwapFrom(Frame* old) |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 | 307 |
| 308 if (m_owner) { | 308 if (m_owner) { |
| 309 if (m_owner->isLocal()) | 309 if (m_owner->isLocal()) |
| 310 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); | 310 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); |
| 311 } else { | 311 } else { |
| 312 page()->setMainFrame(this); | 312 page()->setMainFrame(this); |
| 313 } | 313 } |
| 314 } | 314 } |
| 315 | 315 |
| 316 } // namespace blink | 316 } // namespace blink |
| OLD | NEW |