| 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 19 matching lines...) Expand all Loading... |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "core/frame/Frame.h" | 31 #include "core/frame/Frame.h" |
| 32 | 32 |
| 33 #include "core/dom/DocumentType.h" | 33 #include "core/dom/DocumentType.h" |
| 34 #include "core/events/Event.h" | 34 #include "core/events/Event.h" |
| 35 #include "core/frame/LocalDOMWindow.h" | 35 #include "core/frame/LocalDOMWindow.h" |
| 36 #include "core/frame/FrameHost.h" | 36 #include "core/frame/FrameHost.h" |
| 37 #include "core/frame/Settings.h" | 37 #include "core/frame/Settings.h" |
| 38 #include "core/html/HTMLFrameElementBase.h" | 38 #include "core/html/HTMLFrameElementBase.h" |
| 39 #include "core/inspector/InspectorInstrumentation.h" | 39 #include "core/inspector/InspectorInstrumentation.h" |
| 40 #include "core/layout/LayoutPart.h" |
| 40 #include "core/loader/EmptyClients.h" | 41 #include "core/loader/EmptyClients.h" |
| 41 #include "core/loader/FrameLoaderClient.h" | 42 #include "core/loader/FrameLoaderClient.h" |
| 42 #include "core/page/Chrome.h" | 43 #include "core/page/Chrome.h" |
| 43 #include "core/page/ChromeClient.h" | 44 #include "core/page/ChromeClient.h" |
| 44 #include "core/page/EventHandler.h" | 45 #include "core/page/EventHandler.h" |
| 45 #include "core/page/FocusController.h" | 46 #include "core/page/FocusController.h" |
| 46 #include "core/page/Page.h" | 47 #include "core/page/Page.h" |
| 47 #include "core/rendering/RenderPart.h" | |
| 48 #include "wtf/PassOwnPtr.h" | 48 #include "wtf/PassOwnPtr.h" |
| 49 #include "wtf/RefCountedLeakCounter.h" | 49 #include "wtf/RefCountedLeakCounter.h" |
| 50 | 50 |
| 51 namespace blink { | 51 namespace blink { |
| 52 | 52 |
| 53 using namespace HTMLNames; | 53 using namespace HTMLNames; |
| 54 | 54 |
| 55 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, frameCounter, ("Frame")); | 55 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, frameCounter, ("Frame")); |
| 56 | 56 |
| 57 Frame::~Frame() | 57 Frame::~Frame() |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 | 239 |
| 240 while (ancestorFrame) { | 240 while (ancestorFrame) { |
| 241 if (!ancestorFrame->securityContext()->securityOrigin()->canAccess(secur
ityContext()->securityOrigin())) | 241 if (!ancestorFrame->securityContext()->securityOrigin()->canAccess(secur
ityContext()->securityOrigin())) |
| 242 return currentFrame; | 242 return currentFrame; |
| 243 currentFrame = ancestorFrame; | 243 currentFrame = ancestorFrame; |
| 244 ancestorFrame = ancestorFrame->tree().parent(); | 244 ancestorFrame = ancestorFrame->tree().parent(); |
| 245 } | 245 } |
| 246 return nullptr; | 246 return nullptr; |
| 247 } | 247 } |
| 248 | 248 |
| 249 RenderPart* Frame::ownerRenderer() const | 249 LayoutPart* Frame::ownerRenderer() const |
| 250 { | 250 { |
| 251 if (!deprecatedLocalOwner()) | 251 if (!deprecatedLocalOwner()) |
| 252 return nullptr; | 252 return nullptr; |
| 253 LayoutObject* object = deprecatedLocalOwner()->renderer(); | 253 LayoutObject* object = deprecatedLocalOwner()->renderer(); |
| 254 if (!object) | 254 if (!object) |
| 255 return nullptr; | 255 return nullptr; |
| 256 // FIXME: If <object> is ever fixed to disassociate itself from frames | 256 // FIXME: If <object> is ever fixed to disassociate itself from frames |
| 257 // that it has started but canceled, then this can turn into an ASSERT | 257 // that it has started but canceled, then this can turn into an ASSERT |
| 258 // since ownerElement() would be 0 when the load is canceled. | 258 // since ownerElement() would be 0 when the load is canceled. |
| 259 // https://bugs.webkit.org/show_bug.cgi?id=18585 | 259 // https://bugs.webkit.org/show_bug.cgi?id=18585 |
| 260 if (!object->isRenderPart()) | 260 if (!object->isLayoutPart()) |
| 261 return nullptr; | 261 return nullptr; |
| 262 return toRenderPart(object); | 262 return toLayoutPart(object); |
| 263 } | 263 } |
| 264 | 264 |
| 265 Settings* Frame::settings() const | 265 Settings* Frame::settings() const |
| 266 { | 266 { |
| 267 if (m_host) | 267 if (m_host) |
| 268 return &m_host->settings(); | 268 return &m_host->settings(); |
| 269 return nullptr; | 269 return nullptr; |
| 270 } | 270 } |
| 271 | 271 |
| 272 Frame::Frame(FrameClient* client, FrameHost* host, FrameOwner* owner) | 272 Frame::Frame(FrameClient* client, FrameHost* host, FrameOwner* owner) |
| (...skipping 11 matching lines...) Expand all Loading... |
| 284 | 284 |
| 285 if (m_owner) { | 285 if (m_owner) { |
| 286 if (m_owner->isLocal()) | 286 if (m_owner->isLocal()) |
| 287 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); | 287 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); |
| 288 } else { | 288 } else { |
| 289 page()->setMainFrame(this); | 289 page()->setMainFrame(this); |
| 290 } | 290 } |
| 291 } | 291 } |
| 292 | 292 |
| 293 } // namespace blink | 293 } // namespace blink |
| OLD | NEW |