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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 else if (name == onbeforeunloadAttr) { | 130 else if (name == onbeforeunloadAttr) { |
131 // FIXME: should <frame> elements have beforeunload handlers? | 131 // FIXME: should <frame> elements have beforeunload handlers? |
132 setAttributeEventListener(EventTypeNames::beforeunload, createAttributeE
ventListener(this, name, value)); | 132 setAttributeEventListener(EventTypeNames::beforeunload, createAttributeE
ventListener(this, name, value)); |
133 } else | 133 } else |
134 HTMLFrameOwnerElement::parseAttribute(name, value); | 134 HTMLFrameOwnerElement::parseAttribute(name, value); |
135 } | 135 } |
136 | 136 |
137 void HTMLFrameElementBase::setNameAndOpenURL() | 137 void HTMLFrameElementBase::setNameAndOpenURL() |
138 { | 138 { |
139 m_frameName = getNameAttribute(); | 139 m_frameName = getNameAttribute(); |
140 if (m_frameName.isNull()) | |
141 m_frameName = getIdAttribute(); | |
142 openURL(); | 140 openURL(); |
143 } | 141 } |
144 | 142 |
145 Node::InsertionNotificationRequest HTMLFrameElementBase::insertedInto(ContainerN
ode* insertionPoint) | 143 Node::InsertionNotificationRequest HTMLFrameElementBase::insertedInto(ContainerN
ode* insertionPoint) |
146 { | 144 { |
147 HTMLFrameOwnerElement::insertedInto(insertionPoint); | 145 HTMLFrameOwnerElement::insertedInto(insertionPoint); |
148 return InsertionShouldCallDidNotifySubtreeInsertions; | 146 return InsertionShouldCallDidNotifySubtreeInsertions; |
149 } | 147 } |
150 | 148 |
151 void HTMLFrameElementBase::didNotifySubtreeInsertionsToDocument() | 149 void HTMLFrameElementBase::didNotifySubtreeInsertionsToDocument() |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 | 224 |
227 int HTMLFrameElementBase::height() | 225 int HTMLFrameElementBase::height() |
228 { | 226 { |
229 document().updateLayoutIgnorePendingStylesheets(); | 227 document().updateLayoutIgnorePendingStylesheets(); |
230 if (!renderBox()) | 228 if (!renderBox()) |
231 return 0; | 229 return 0; |
232 return renderBox()->height(); | 230 return renderBox()->height(); |
233 } | 231 } |
234 | 232 |
235 } // namespace WebCore | 233 } // namespace WebCore |
OLD | NEW |