| 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 { | 162 { |
| 163 if (!document().frame()) | 163 if (!document().frame()) |
| 164 return; | 164 return; |
| 165 | 165 |
| 166 if (!SubframeLoadingDisabler::canLoadFrame(*this)) | 166 if (!SubframeLoadingDisabler::canLoadFrame(*this)) |
| 167 return; | 167 return; |
| 168 | 168 |
| 169 setNameAndOpenURL(); | 169 setNameAndOpenURL(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 void HTMLFrameElementBase::attach(const AttachContext& context) | 172 void HTMLFrameElementBase::attachLayoutTree(const AttachContext& context) |
| 173 { | 173 { |
| 174 HTMLFrameOwnerElement::attach(context); | 174 HTMLFrameOwnerElement::attachLayoutTree(context); |
| 175 | 175 |
| 176 if (layoutPart()) { | 176 if (layoutPart()) { |
| 177 if (Frame* frame = contentFrame()) { | 177 if (Frame* frame = contentFrame()) { |
| 178 if (frame->isLocalFrame()) | 178 if (frame->isLocalFrame()) |
| 179 setWidget(toLocalFrame(frame)->view()); | 179 setWidget(toLocalFrame(frame)->view()); |
| 180 else if (frame->isRemoteFrame()) | 180 else if (frame->isRemoteFrame()) |
| 181 setWidget(toRemoteFrame(frame)->view()); | 181 setWidget(toRemoteFrame(frame)->view()); |
| 182 } | 182 } |
| 183 } | 183 } |
| 184 } | 184 } |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 frameOwnerPropertiesChanged(); | 246 frameOwnerPropertiesChanged(); |
| 247 } | 247 } |
| 248 | 248 |
| 249 void HTMLFrameElementBase::setMarginHeight(int marginHeight) | 249 void HTMLFrameElementBase::setMarginHeight(int marginHeight) |
| 250 { | 250 { |
| 251 m_marginHeight = marginHeight; | 251 m_marginHeight = marginHeight; |
| 252 frameOwnerPropertiesChanged(); | 252 frameOwnerPropertiesChanged(); |
| 253 } | 253 } |
| 254 | 254 |
| 255 } // namespace blink | 255 } // namespace blink |
| OLD | NEW |