| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 // Don't notify about updates if contentFrame() is null, for example when | 104 // Don't notify about updates if contentFrame() is null, for example when |
| 105 // the subframe hasn't been created yet. | 105 // the subframe hasn't been created yet. |
| 106 if (contentFrame()) | 106 if (contentFrame()) |
| 107 document().frame()->loader().client()->didChangeFrameOwnerProperties(thi
s); | 107 document().frame()->loader().client()->didChangeFrameOwnerProperties(thi
s); |
| 108 } | 108 } |
| 109 | 109 |
| 110 void HTMLFrameElementBase::parseAttribute(const QualifiedName& name, const Atomi
cString& value) | 110 void HTMLFrameElementBase::parseAttribute(const QualifiedName& name, const Atomi
cString& value) |
| 111 { | 111 { |
| 112 if (name == srcdocAttr) { | 112 if (name == srcdocAttr) { |
| 113 if (!value.isNull()) { | 113 if (!value.isNull()) { |
| 114 setLocation("about:srcdoc"); | 114 setLocation(srcdocURL().string()); |
| 115 } else { | 115 } else { |
| 116 const AtomicString& srcValue = fastGetAttribute(srcAttr); | 116 const AtomicString& srcValue = fastGetAttribute(srcAttr); |
| 117 if (!srcValue.isNull()) | 117 if (!srcValue.isNull()) |
| 118 setLocation(stripLeadingAndTrailingHTMLSpaces(srcValue)); | 118 setLocation(stripLeadingAndTrailingHTMLSpaces(srcValue)); |
| 119 } | 119 } |
| 120 } else if (name == srcAttr && !fastHasAttribute(srcdocAttr)) { | 120 } else if (name == srcAttr && !fastHasAttribute(srcdocAttr)) { |
| 121 setLocation(stripLeadingAndTrailingHTMLSpaces(value)); | 121 setLocation(stripLeadingAndTrailingHTMLSpaces(value)); |
| 122 } else if (name == idAttr) { | 122 } else if (name == idAttr) { |
| 123 // Important to call through to base for the id attribute so the hasID b
it gets set. | 123 // Important to call through to base for the id attribute so the hasID b
it gets set. |
| 124 HTMLFrameOwnerElement::parseAttribute(name, value); | 124 HTMLFrameOwnerElement::parseAttribute(name, value); |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 frameOwnerPropertiesChanged(); | 249 frameOwnerPropertiesChanged(); |
| 250 } | 250 } |
| 251 | 251 |
| 252 void HTMLFrameElementBase::setMarginHeight(int marginHeight) | 252 void HTMLFrameElementBase::setMarginHeight(int marginHeight) |
| 253 { | 253 { |
| 254 m_marginHeight = marginHeight; | 254 m_marginHeight = marginHeight; |
| 255 frameOwnerPropertiesChanged(); | 255 frameOwnerPropertiesChanged(); |
| 256 } | 256 } |
| 257 | 257 |
| 258 } // namespace blink | 258 } // namespace blink |
| OLD | NEW |