| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2  * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 
| 3  *           (C) 1999 Antti Koivisto (koivisto@kde.org) | 3  *           (C) 1999 Antti Koivisto (koivisto@kde.org) | 
| 4  *           (C) 2000 Simon Hausmann (hausmann@kde.org) | 4  *           (C) 2000 Simon Hausmann (hausmann@kde.org) | 
| 5  *           (C) 2001 Dirk Mueller (mueller@kde.org) | 5  *           (C) 2001 Dirk Mueller (mueller@kde.org) | 
| 6  * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. | 6  * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. | 
| 7  * | 7  * | 
| 8  * This library is free software; you can redistribute it and/or | 8  * This library is free software; you can redistribute it and/or | 
| 9  * modify it under the terms of the GNU Library General Public | 9  * modify it under the terms of the GNU Library General Public | 
| 10  * License as published by the Free Software Foundation; either | 10  * License as published by the Free Software Foundation; either | 
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 152 { | 152 { | 
| 153     if (!document().frame()) | 153     if (!document().frame()) | 
| 154         return; | 154         return; | 
| 155 | 155 | 
| 156     if (!SubframeLoadingDisabler::canLoadFrame(this)) | 156     if (!SubframeLoadingDisabler::canLoadFrame(this)) | 
| 157         return; | 157         return; | 
| 158 | 158 | 
| 159     setNameAndOpenURL(); | 159     setNameAndOpenURL(); | 
| 160 } | 160 } | 
| 161 | 161 | 
| 162 void HTMLFrameElementBase::attach(const AttachContext& context) | 162 void HTMLFrameElementBase::createRenderTree(const AttachContext& context) | 
| 163 { | 163 { | 
| 164     HTMLFrameOwnerElement::attach(context); | 164     HTMLFrameOwnerElement::createRenderTree(context); | 
| 165 | 165 | 
| 166     if (RenderPart* part = renderPart()) { | 166     if (RenderPart* part = renderPart()) { | 
| 167         if (Frame* frame = contentFrame()) | 167         if (Frame* frame = contentFrame()) | 
| 168             part->setWidget(frame->view()); | 168             part->setWidget(frame->view()); | 
| 169     } | 169     } | 
| 170 } | 170 } | 
| 171 | 171 | 
| 172 KURL HTMLFrameElementBase::location() const | 172 KURL HTMLFrameElementBase::location() const | 
| 173 { | 173 { | 
| 174     if (fastHasAttribute(srcdocAttr)) | 174     if (fastHasAttribute(srcdocAttr)) | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 220 | 220 | 
| 221 int HTMLFrameElementBase::height() | 221 int HTMLFrameElementBase::height() | 
| 222 { | 222 { | 
| 223     document().updateLayoutIgnorePendingStylesheets(); | 223     document().updateLayoutIgnorePendingStylesheets(); | 
| 224     if (!renderBox()) | 224     if (!renderBox()) | 
| 225         return 0; | 225         return 0; | 
| 226     return renderBox()->height(); | 226     return renderBox()->height(); | 
| 227 } | 227 } | 
| 228 | 228 | 
| 229 } // namespace WebCore | 229 } // namespace WebCore | 
| OLD | NEW | 
|---|