| 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 currentFrame = ancestorFrame; | 245 currentFrame = ancestorFrame; |
| 246 ancestorFrame = ancestorFrame->tree().parent(); | 246 ancestorFrame = ancestorFrame->tree().parent(); |
| 247 } | 247 } |
| 248 return nullptr; | 248 return nullptr; |
| 249 } | 249 } |
| 250 | 250 |
| 251 RenderPart* Frame::ownerRenderer() const | 251 RenderPart* Frame::ownerRenderer() const |
| 252 { | 252 { |
| 253 if (!deprecatedLocalOwner()) | 253 if (!deprecatedLocalOwner()) |
| 254 return nullptr; | 254 return nullptr; |
| 255 RenderObject* object = deprecatedLocalOwner()->renderer(); | 255 LayoutObject* object = deprecatedLocalOwner()->renderer(); |
| 256 if (!object) | 256 if (!object) |
| 257 return nullptr; | 257 return nullptr; |
| 258 // FIXME: If <object> is ever fixed to disassociate itself from frames | 258 // FIXME: If <object> is ever fixed to disassociate itself from frames |
| 259 // that it has started but canceled, then this can turn into an ASSERT | 259 // that it has started but canceled, then this can turn into an ASSERT |
| 260 // since ownerElement() would be 0 when the load is canceled. | 260 // since ownerElement() would be 0 when the load is canceled. |
| 261 // https://bugs.webkit.org/show_bug.cgi?id=18585 | 261 // https://bugs.webkit.org/show_bug.cgi?id=18585 |
| 262 if (!object->isRenderPart()) | 262 if (!object->isRenderPart()) |
| 263 return nullptr; | 263 return nullptr; |
| 264 return toRenderPart(object); | 264 return toRenderPart(object); |
| 265 } | 265 } |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 | 301 |
| 302 if (m_owner) { | 302 if (m_owner) { |
| 303 if (m_owner->isLocal()) | 303 if (m_owner->isLocal()) |
| 304 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); | 304 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); |
| 305 } else { | 305 } else { |
| 306 page()->setMainFrame(this); | 306 page()->setMainFrame(this); |
| 307 } | 307 } |
| 308 } | 308 } |
| 309 | 309 |
| 310 } // namespace blink | 310 } // namespace blink |
| OLD | NEW |